diff --git a/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/resources/OH-INF/i18n/mqtt.properties b/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/resources/OH-INF/i18n/mqtt.properties
index 9736943568d..555b7126cb2 100644
--- a/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/resources/OH-INF/i18n/mqtt.properties
+++ b/bundles/org.openhab.binding.mqtt.espmilighthub/src/main/resources/OH-INF/i18n/mqtt.properties
@@ -1,3 +1,20 @@
+# thing types
+
+thing-type.mqtt.cct.label = Milight CCT
+thing-type.mqtt.cct.description = Led globe with both cool and warm white controls
+thing-type.mqtt.fut089.label = Milight FUT089
+thing-type.mqtt.fut089.description = Use this when your remote is the newer 8 group type called FUT089 and your globes are rgb_cct
+thing-type.mqtt.fut091.label = Milight FUT091
+thing-type.mqtt.fut091.description = Use this when your remote is the newer fut091 and your globes are cct
+thing-type.mqtt.rgb.label = Milight RGB
+thing-type.mqtt.rgb.description = RGB Globe with no white
+thing-type.mqtt.rgb_cct.label = Milight RGBCCT
+thing-type.mqtt.rgb_cct.description = Led globe with full Colour, and both cool and warm whites.
+thing-type.mqtt.rgbw.label = Milight RGBW
+thing-type.mqtt.rgbw.description = RGB Globe with a fixed white
+
+# thing types config
+
 thing-type.config.mqtt.cct.dimmedCT.label = Dimmed Colour Temp
 thing-type.config.mqtt.cct.dimmedCT.description = Traditional globes grow warmer the more they are dimmed. Set this to 370, or leave blank to disable.
 thing-type.config.mqtt.cct.oneTriggersNightMode.label = 1% Triggers Night Mode
@@ -30,3 +47,41 @@ thing-type.config.mqtt.rgbw.whiteSat.label = White Saturation
 thing-type.config.mqtt.rgbw.whiteSat.description = When both the whiteHue and whiteSat values are seen by the binding it will trigger the white LEDS.
 thing-type.config.mqtt.rgbw.whiteThreshold.label = White Threshold
 thing-type.config.mqtt.rgbw.whiteThreshold.description = Saturation values at or below this value on a RGBW color control will trigger the white mode. -1 will disable this feature.
+
+# channel types
+
+channel-type.mqtt.bulbMode.label = Bulb Mode
+channel-type.mqtt.bulbMode.description = Displays the mode the bulb is currently in.
+channel-type.mqtt.bulbMode.state.option.white = white
+channel-type.mqtt.bulbMode.state.option.color = color
+channel-type.mqtt.bulbMode.state.option.scene = scene
+channel-type.mqtt.bulbMode.state.option.night = night
+channel-type.mqtt.colour.label = Colour
+channel-type.mqtt.colour.description = Allows you to change the colour, brightness and saturation of the globe.
+channel-type.mqtt.colourTemperature.label = Colour Temperature
+channel-type.mqtt.colourTemperature.description = Change from cool to warm white with this control.
+channel-type.mqtt.command.label = Command
+channel-type.mqtt.command.description = Send a raw command to the globe/s.
+channel-type.mqtt.command.state.option.next_mode = Next Mode
+channel-type.mqtt.command.state.option.previous_mode = Previous Mode
+channel-type.mqtt.command.state.option.mode_speed_up = Mode Speed Up
+channel-type.mqtt.command.state.option.mode_speed_down = Mode Speed Down
+channel-type.mqtt.command.state.option.set_white = Set White
+channel-type.mqtt.command.state.option.level_down = Level Down
+channel-type.mqtt.command.state.option.level_up = Level Up
+channel-type.mqtt.command.state.option.temperature_down = Temperature Down
+channel-type.mqtt.command.state.option.temperature_up = Temperature Up
+channel-type.mqtt.command.state.option.night_mode = Night Mode
+channel-type.mqtt.discoMode.label = Disco Mode
+channel-type.mqtt.discoMode.description = Switch to a Disco mode directly.
+channel-type.mqtt.discoMode.state.option.0 = Disco 0
+channel-type.mqtt.discoMode.state.option.1 = Disco 1
+channel-type.mqtt.discoMode.state.option.2 = Disco 2
+channel-type.mqtt.discoMode.state.option.3 = Disco 3
+channel-type.mqtt.discoMode.state.option.4 = Disco 4
+channel-type.mqtt.discoMode.state.option.5 = Disco 5
+channel-type.mqtt.discoMode.state.option.6 = Disco 6
+channel-type.mqtt.discoMode.state.option.7 = Disco 7
+channel-type.mqtt.discoMode.state.option.8 = Disco 8
+channel-type.mqtt.level.label = Level
+channel-type.mqtt.level.description = Level changes the brightness of the globe.
diff --git a/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/i18n/mqtt.properties b/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/i18n/mqtt.properties
new file mode 100644
index 00000000000..e3e20d452cf
--- /dev/null
+++ b/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/i18n/mqtt.properties
@@ -0,0 +1,210 @@
+# thing types
+
+thing-type.mqtt.topic.label = Generic MQTT Thing
+thing-type.mqtt.topic.description = You need a configured Broker first. Dynamically add channels of various types to this Thing. Link different MQTT topics to each channel.
+
+# thing types config
+
+thing-type.config.mqtt.topic.availabilityTopic.label = Availability Topic
+thing-type.config.mqtt.topic.availabilityTopic.description = Topic of the LWT of the device
+thing-type.config.mqtt.topic.payloadAvailable.label = Device Available Payload
+thing-type.config.mqtt.topic.payloadAvailable.description = Payload of the 'Availability Topic', when the device is available. Default: 'ON'
+thing-type.config.mqtt.topic.payloadNotAvailable.label = Device Unavailable Payload
+thing-type.config.mqtt.topic.payloadNotAvailable.description = Payload of the 'Availability Topic', when the device is *not* available. Default: 'OFF'
+thing-type.config.mqtt.topic.transformationPattern.label = Availability Payload Transformations
+thing-type.config.mqtt.topic.transformationPattern.description = Applies transformations to the incoming availability payload. A transformation example for a received JSON would be "JSONPATH:$.status" for a json {status: "Online"}. You can chain transformations by separating them with the intersection character ∩.
+
+# channel types
+
+channel-type.mqtt.color.label = Color Value (HSB, RGB or CIE xyY)
+channel-type.mqtt.colorHSB.label = Color Value (Hue,Saturation,Brightness)
+channel-type.mqtt.colorRGB.label = Color Value (Red,Green,Blue)
+channel-type.mqtt.contact.label = Open/Close Contact
+channel-type.mqtt.datetime.label = Date/Time Value
+channel-type.mqtt.datetime.description = Current date and/or time
+channel-type.mqtt.dimmer.label = Dimmer
+channel-type.mqtt.image.label = Image
+channel-type.mqtt.image.description = An image to display. Send a binary bmp, jpg, png or any other supported format to this channel.
+channel-type.mqtt.location.label = Location
+channel-type.mqtt.location.description = GPS coordinates as Latitude,Longitude,Altitude
+channel-type.mqtt.number.label = Number Value
+channel-type.mqtt.rollershutter.label = Rollershutter
+channel-type.mqtt.string.label = Text Value
+channel-type.mqtt.switch.label = On/Off Switch
+channel-type.mqtt.trigger.label = Trigger
+
+# channel types config
+
+thing-type.config.mqtt.color_channel.colorMode.label = Color Mode
+thing-type.config.mqtt.color_channel.colorMode.description = Defines the color representation format of the payload. "HSB" by default.
+thing-type.config.mqtt.color_channel.colorMode.option.HSB = HSB (Hue, Saturation, Brightness)
+thing-type.config.mqtt.color_channel.colorMode.option.RGB = RGB (Red, Green, Blue)
+thing-type.config.mqtt.color_channel.colorMode.option.XYY = CIE xyY (x, y, Brightness)
+thing-type.config.mqtt.color_channel.commandTopic.label = MQTT Command Topic
+thing-type.config.mqtt.color_channel.commandTopic.description = An MQTT topic that this thing will send a command to. If not set, this will be a read-only switch.
+thing-type.config.mqtt.color_channel.formatBeforePublish.label = Outgoing Value Format
+thing-type.config.mqtt.color_channel.formatBeforePublish.description = Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". If you want to adjust the precision of a number to for example 4 digits, you would use "%.4f".
+thing-type.config.mqtt.color_channel.group.transformations.label = Transform Values
+thing-type.config.mqtt.color_channel.group.transformations.description = These configuration parameters allow you to alter a value before it is published to MQTT or before a received value is assigned to an item.
+thing-type.config.mqtt.color_channel.off.label = Off/Closed Value
+thing-type.config.mqtt.color_channel.off.description = A number (like 0, -10) or a string (like "disabled") that is recognised as off/closed state. You can use this parameter for a second keyword, next to OFF (CLOSED respectively on a Contact).
+thing-type.config.mqtt.color_channel.on.label = On/Open Value
+thing-type.config.mqtt.color_channel.on.description = A number (like 1, 10) or a string (like "enabled") that is recognised as on/open state. You can use this parameter for a second keyword, next to ON (OPEN respectively on a Contact).
+thing-type.config.mqtt.color_channel.onBrightness.label = Initial Brightness
+thing-type.config.mqtt.color_channel.onBrightness.description = If you connect this channel to a Switch item and turn it on, color and saturation are preserved from the last state, but the brightness will be set to this configured initial brightness percentage.
+thing-type.config.mqtt.color_channel.postCommand.label = Is Command
+thing-type.config.mqtt.color_channel.postCommand.description = If the received MQTT value should not only update the state of linked items, but command them, enable this option.
+thing-type.config.mqtt.color_channel.qos.label = QoS
+thing-type.config.mqtt.color_channel.qos.description = MQTT QoS of this channel (0, 1, 2). Default is QoS of the broker connection.
+thing-type.config.mqtt.color_channel.qos.option.0 = At most once (best effort delivery "fire and forget")
+thing-type.config.mqtt.color_channel.qos.option.1 = At least once (guaranteed that a message will be delivered at least once)
+thing-type.config.mqtt.color_channel.qos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart)
+thing-type.config.mqtt.color_channel.retained.label = Retained
+thing-type.config.mqtt.color_channel.retained.description = The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
+thing-type.config.mqtt.color_channel.stateTopic.label = MQTT State Topic
+thing-type.config.mqtt.color_channel.stateTopic.description = An MQTT topic that this thing will subscribe to, to receive the state. This can be left empty, the channel will be state-less command-only channel.
+thing-type.config.mqtt.color_channel.transformationPattern.label = Incoming Value Transformations
+thing-type.config.mqtt.color_channel.transformationPattern.description = Applies transformations to an incoming MQTT topic value. A transformation example for a received JSON would be "JSONPATH:$.device.status.temperature" for a json {device: {status: { temperature: 23.2 }}}. You can chain transformations by separating them with the intersection character ∩.
+thing-type.config.mqtt.color_channel.transformationPatternOut.label = Outgoing Value Transformation
+thing-type.config.mqtt.color_channel.transformationPatternOut.description = Applies a transformation before publishing a MQTT topic value. Transformations are specialised in extracting a value, but some transformations like the MAP one could be useful.
+thing-type.config.mqtt.dimmer_channel.commandTopic.label = MQTT Command Topic
+thing-type.config.mqtt.dimmer_channel.commandTopic.description = An MQTT topic that this thing will send a command to. If not set, this will be a read-only switch.
+thing-type.config.mqtt.dimmer_channel.formatBeforePublish.label = Outgoing Value Format
+thing-type.config.mqtt.dimmer_channel.formatBeforePublish.description = Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". If you want to adjust the precision of a number to for example 4 digits, you would use "%.4f".
+thing-type.config.mqtt.dimmer_channel.group.transformations.label = Transform Values
+thing-type.config.mqtt.dimmer_channel.group.transformations.description = These configuration parameters allow you to alter a value before it is published to MQTT or before a received value is assigned to an item.
+thing-type.config.mqtt.dimmer_channel.max.label = Absolute Maximum
+thing-type.config.mqtt.dimmer_channel.max.description = This configuration represents the maximum of the allowed range. For a percentage channel that equals one-hundred percent.
+thing-type.config.mqtt.dimmer_channel.min.label = Absolute Minimum
+thing-type.config.mqtt.dimmer_channel.min.description = This configuration represents the minimum of the allowed range. For a percentage channel that equals zero percent.
+thing-type.config.mqtt.dimmer_channel.off.label = Custom Off/Closed Value
+thing-type.config.mqtt.dimmer_channel.off.description = A number (like 0, -10) or a string (like "disabled") that is additionally recognised as off/closed state. You can use this parameter for a second keyword, next to OFF (CLOSED respectively on a Contact).
+thing-type.config.mqtt.dimmer_channel.on.label = Custom On/Open Value
+thing-type.config.mqtt.dimmer_channel.on.description = A number (like 1, 10) or a string (like "enabled") that is additionally recognised as on/open state. You can use this parameter for a second keyword, next to ON (OPEN respectively on a Contact).
+thing-type.config.mqtt.dimmer_channel.postCommand.label = Is Command
+thing-type.config.mqtt.dimmer_channel.postCommand.description = If the received MQTT value should not only update the state of linked items, but command them, enable this option.
+thing-type.config.mqtt.dimmer_channel.qos.label = QoS
+thing-type.config.mqtt.dimmer_channel.qos.description = MQTT QoS of this channel (0, 1, 2). Default is QoS of the broker connection.
+thing-type.config.mqtt.dimmer_channel.qos.option.0 = At most once (best effort delivery "fire and forget")
+thing-type.config.mqtt.dimmer_channel.qos.option.1 = At least once (guaranteed that a message will be delivered at least once)
+thing-type.config.mqtt.dimmer_channel.qos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart)
+thing-type.config.mqtt.dimmer_channel.retained.label = Retained
+thing-type.config.mqtt.dimmer_channel.retained.description = The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
+thing-type.config.mqtt.dimmer_channel.stateTopic.label = MQTT State Topic
+thing-type.config.mqtt.dimmer_channel.stateTopic.description = An MQTT topic that this thing will subscribe to, to receive the state. This can be left empty, the channel will be state-less command-only channel.
+thing-type.config.mqtt.dimmer_channel.step.label = Delta Value
+thing-type.config.mqtt.dimmer_channel.step.description = A number/dimmer channel can receive INCREASE/DECREASE commands and computes the target number by adding or subtracting this delta value.
+thing-type.config.mqtt.dimmer_channel.transformationPattern.label = Incoming Value Transformations
+thing-type.config.mqtt.dimmer_channel.transformationPattern.description = Applies transformations to an incoming MQTT topic value. A transformation example for a received JSON would be "JSONPATH:$.device.status.temperature" for a json {device: {status: { temperature: 23.2 }}}. You can chain transformations by separating them with the intersection character ∩.
+thing-type.config.mqtt.dimmer_channel.transformationPatternOut.label = Outgoing Value Transformation
+thing-type.config.mqtt.dimmer_channel.transformationPatternOut.description = Applies a transformation before publishing a MQTT topic value. Transformations are specialised in extracting a value, but some transformations like the MAP one could be useful.
+thing-type.config.mqtt.number_channel.commandTopic.label = MQTT Command Topic
+thing-type.config.mqtt.number_channel.commandTopic.description = An MQTT topic that this thing will send a command to. If not set, this will be a read-only switch.
+thing-type.config.mqtt.number_channel.formatBeforePublish.label = Outgoing Value Format
+thing-type.config.mqtt.number_channel.formatBeforePublish.description = Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". If you want to adjust the precision of a number to for example 4 digits, you would use "%.4f".
+thing-type.config.mqtt.number_channel.group.transformations.label = Transform Values
+thing-type.config.mqtt.number_channel.group.transformations.description = These configuration parameters allow you to alter a value before it is published to MQTT or before a received value is assigned to an item.
+thing-type.config.mqtt.number_channel.max.label = Absolute Maximum
+thing-type.config.mqtt.number_channel.max.description = This configuration represents the maximum of the allowed range. For a percentage channel that equals one-hundred percent.
+thing-type.config.mqtt.number_channel.min.label = Absolute Minimum
+thing-type.config.mqtt.number_channel.min.description = This configuration represents the minimum of the allowed range. For a percentage channel that equals zero percent.
+thing-type.config.mqtt.number_channel.postCommand.label = Is Command
+thing-type.config.mqtt.number_channel.postCommand.description = If the received MQTT value should not only update the state of linked items, but command them, enable this option.
+thing-type.config.mqtt.number_channel.qos.label = QoS
+thing-type.config.mqtt.number_channel.qos.description = MQTT QoS of this channel (0, 1, 2). Default is QoS of the broker connection.
+thing-type.config.mqtt.number_channel.qos.option.0 = At most once (best effort delivery "fire and forget")
+thing-type.config.mqtt.number_channel.qos.option.1 = At least once (guaranteed that a message will be delivered at least once)
+thing-type.config.mqtt.number_channel.qos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart)
+thing-type.config.mqtt.number_channel.retained.label = Retained
+thing-type.config.mqtt.number_channel.retained.description = The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
+thing-type.config.mqtt.number_channel.stateTopic.label = MQTT State Topic
+thing-type.config.mqtt.number_channel.stateTopic.description = An MQTT topic that this thing will subscribe to, to receive the state. This can be left empty, the channel will be state-less command-only channel.
+thing-type.config.mqtt.number_channel.step.label = Delta Value
+thing-type.config.mqtt.number_channel.step.description = A number/dimmer channel can receive INCREASE/DECREASE commands and computes the target number by adding or subtracting this delta value.
+thing-type.config.mqtt.number_channel.transformationPattern.label = Incoming Value Transformations
+thing-type.config.mqtt.number_channel.transformationPattern.description = Applies transformations to an incoming MQTT topic value. A transformation example for a received JSON would be "JSONPATH:$.device.status.temperature" for a json {device: {status: { temperature: 23.2 }}}. You can chain transformations by separating them with the intersection character ∩.
+thing-type.config.mqtt.number_channel.transformationPatternOut.label = Outgoing Value Transformation
+thing-type.config.mqtt.number_channel.transformationPatternOut.description = Applies a transformation before publishing a MQTT topic value. Transformations are specialised in extracting a value, but some transformations like the MAP one could be useful.
+thing-type.config.mqtt.number_channel.unit.label = Unit Of Measurement
+thing-type.config.mqtt.number_channel.unit.description = Unit of measurement (optional). The unit is used for representing the value in the GUI as well as for converting incoming values (like from '°F' to '°C'). Examples: "°C", "°F"
+thing-type.config.mqtt.rollershutter_channel.commandTopic.label = MQTT Command Topic
+thing-type.config.mqtt.rollershutter_channel.commandTopic.description = An MQTT topic that this thing will send a command to. If not set, this will be a read-only switch.
+thing-type.config.mqtt.rollershutter_channel.formatBeforePublish.label = Outgoing Value Format
+thing-type.config.mqtt.rollershutter_channel.formatBeforePublish.description = Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". If you want to adjust the precision of a number to for example 4 digits, you would use "%.4f".
+thing-type.config.mqtt.rollershutter_channel.group.transformations.label = Transform Values
+thing-type.config.mqtt.rollershutter_channel.group.transformations.description = These configuration parameters allow you to alter a value before it is published to MQTT or before a received value is assigned to an item.
+thing-type.config.mqtt.rollershutter_channel.off.label = Down Value
+thing-type.config.mqtt.rollershutter_channel.off.description = A string (like "CLOSE") that is recognised as DOWN state. You can use this parameter for a second keyword, next to DOWN.
+thing-type.config.mqtt.rollershutter_channel.on.label = Up Value
+thing-type.config.mqtt.rollershutter_channel.on.description = A string (like "OPEN") that is recognised as UP state. You can use this parameter for a second keyword, next to UP.
+thing-type.config.mqtt.rollershutter_channel.postCommand.label = Is Command
+thing-type.config.mqtt.rollershutter_channel.postCommand.description = If the received MQTT value should not only update the state of linked items, but command them, enable this option.
+thing-type.config.mqtt.rollershutter_channel.qos.label = QoS
+thing-type.config.mqtt.rollershutter_channel.qos.description = MQTT QoS of this channel (0, 1, 2). Default is QoS of the broker connection.
+thing-type.config.mqtt.rollershutter_channel.qos.option.0 = At most once (best effort delivery "fire and forget")
+thing-type.config.mqtt.rollershutter_channel.qos.option.1 = At least once (guaranteed that a message will be delivered at least once)
+thing-type.config.mqtt.rollershutter_channel.qos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart)
+thing-type.config.mqtt.rollershutter_channel.retained.label = Retained
+thing-type.config.mqtt.rollershutter_channel.retained.description = The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
+thing-type.config.mqtt.rollershutter_channel.stateTopic.label = MQTT State Topic
+thing-type.config.mqtt.rollershutter_channel.stateTopic.description = An MQTT topic that this thing will subscribe to, to receive the state. This can be left empty, the channel will be state-less command-only channel.
+thing-type.config.mqtt.rollershutter_channel.stop.label = Stop Value
+thing-type.config.mqtt.rollershutter_channel.stop.description = A string (like "STOP") that is recognised as stop state. Will set the rollershutter state to undefined, because the current position is unknown at that point.
+thing-type.config.mqtt.rollershutter_channel.transformationPattern.label = Incoming Value Transformations
+thing-type.config.mqtt.rollershutter_channel.transformationPattern.description = Applies transformations to an incoming MQTT topic value. A transformation example for a received JSON would be "JSONPATH:$.device.status.temperature" for a json {device: {status: { temperature: 23.2 }}}. You can chain transformations by separating them with the intersection character ∩.
+thing-type.config.mqtt.rollershutter_channel.transformationPatternOut.label = Outgoing Value Transformation
+thing-type.config.mqtt.rollershutter_channel.transformationPatternOut.description = Applies a transformation before publishing a MQTT topic value. Transformations are specialised in extracting a value, but some transformations like the MAP one could be useful.
+thing-type.config.mqtt.string_channel.allowedStates.label = Allowed States
+thing-type.config.mqtt.string_channel.allowedStates.description = If your MQTT topic is limited to a set of one or more specific commands or specific states, define those states here. Separate multiple states with commas. An example for a light bulb state set: ON,DIMMED,OFF
+thing-type.config.mqtt.string_channel.commandTopic.label = MQTT Command Topic
+thing-type.config.mqtt.string_channel.commandTopic.description = An MQTT topic that this thing will send a command to. If not set, this will be a read-only switch.
+thing-type.config.mqtt.string_channel.formatBeforePublish.label = Outgoing Value Format
+thing-type.config.mqtt.string_channel.formatBeforePublish.description = Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". If you want to adjust the precision of a number to for example 4 digits, you would use "%.4f".
+thing-type.config.mqtt.string_channel.group.transformations.label = Transform Values
+thing-type.config.mqtt.string_channel.group.transformations.description = These configuration parameters allow you to alter a value before it is published to MQTT or before a received value is assigned to an item.
+thing-type.config.mqtt.string_channel.postCommand.label = Is Command
+thing-type.config.mqtt.string_channel.postCommand.description = If the received MQTT value should not only update the state of linked items, but command them, enable this option.
+thing-type.config.mqtt.string_channel.qos.label = QoS
+thing-type.config.mqtt.string_channel.qos.description = MQTT QoS of this channel (0, 1, 2). Default is QoS of the broker connection.
+thing-type.config.mqtt.string_channel.qos.option.0 = At most once (best effort delivery "fire and forget")
+thing-type.config.mqtt.string_channel.qos.option.1 = At least once (guaranteed that a message will be delivered at least once)
+thing-type.config.mqtt.string_channel.qos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart)
+thing-type.config.mqtt.string_channel.retained.label = Retained
+thing-type.config.mqtt.string_channel.retained.description = The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
+thing-type.config.mqtt.string_channel.stateTopic.label = MQTT State Topic
+thing-type.config.mqtt.string_channel.stateTopic.description = An MQTT topic that this thing will subscribe to, to receive the state. This can be left empty, the channel will be state-less command-only channel.
+thing-type.config.mqtt.string_channel.transformationPattern.label = Incoming Value Transformations
+thing-type.config.mqtt.string_channel.transformationPattern.description = Applies transformations to an incoming MQTT topic value. A transformation example for a received JSON would be "JSONPATH:$.device.status.temperature" for a json {device: {status: { temperature: 23.2 }}}. You can chain transformations by separating them with the intersection character ∩.
+thing-type.config.mqtt.string_channel.transformationPatternOut.label = Outgoing Value Transformation
+thing-type.config.mqtt.string_channel.transformationPatternOut.description = Applies a transformation before publishing a MQTT topic value. Transformations are specialised in extracting a value, but some transformations like the MAP one could be useful.
+thing-type.config.mqtt.switch_channel.commandTopic.label = MQTT Command Topic
+thing-type.config.mqtt.switch_channel.commandTopic.description = An MQTT topic that this thing will send a command to. If not set, this will be a read-only switch.
+thing-type.config.mqtt.switch_channel.formatBeforePublish.label = Outgoing Value Format
+thing-type.config.mqtt.switch_channel.formatBeforePublish.description = Format a value before it is published to the MQTT broker. The default is to just pass the channel/item state. If you want to apply a prefix, say "MYCOLOR,", you would use "MYCOLOR,%s". If you want to adjust the precision of a number to for example 4 digits, you would use "%.4f".
+thing-type.config.mqtt.switch_channel.group.transformations.label = Transform Values
+thing-type.config.mqtt.switch_channel.group.transformations.description = These configuration parameters allow you to alter a value before it is published to MQTT or before a received value is assigned to an item.
+thing-type.config.mqtt.switch_channel.off.label = Custom Off/Closed Value
+thing-type.config.mqtt.switch_channel.off.description = A number (like 0, -10) or a string (like "disabled") that is additionally recognised as off/closed state. You can use this parameter for a second keyword, next to OFF (CLOSED respectively on a Contact).
+thing-type.config.mqtt.switch_channel.on.label = Custom On/Open Value
+thing-type.config.mqtt.switch_channel.on.description = A number (like 1, 10) or a string (like "enabled") that is additionally recognised as on/open state. You can use this parameter for a second keyword, next to ON (OPEN respectively on a Contact).
+thing-type.config.mqtt.switch_channel.postCommand.label = Is Command
+thing-type.config.mqtt.switch_channel.postCommand.description = If the received MQTT value should not only update the state of linked items, but command them, enable this option.
+thing-type.config.mqtt.switch_channel.qos.label = QoS
+thing-type.config.mqtt.switch_channel.qos.description = MQTT QoS of this channel (0, 1, 2). Default is QoS of the broker connection.
+thing-type.config.mqtt.switch_channel.qos.option.0 = At most once (best effort delivery "fire and forget")
+thing-type.config.mqtt.switch_channel.qos.option.1 = At least once (guaranteed that a message will be delivered at least once)
+thing-type.config.mqtt.switch_channel.qos.option.2 = Exactly once (guarantees that each message is received only once by the counterpart)
+thing-type.config.mqtt.switch_channel.retained.label = Retained
+thing-type.config.mqtt.switch_channel.retained.description = The value will be published to the command topic as retained message. A retained value stays on the broker and can even be seen by MQTT clients that are subscribing at a later point in time.
+thing-type.config.mqtt.switch_channel.stateTopic.label = MQTT State Topic
+thing-type.config.mqtt.switch_channel.stateTopic.description = An MQTT topic that this thing will subscribe to, to receive the state. This can be left empty, the channel will be state-less command-only channel.
+thing-type.config.mqtt.switch_channel.transformationPattern.label = Incoming Value Transformations
+thing-type.config.mqtt.switch_channel.transformationPattern.description = Applies transformations to an incoming MQTT topic value. A transformation example for a received JSON would be "JSONPATH:$.device.status.temperature" for a json {device: {status: { temperature: 23.2 }}}. You can chain transformations by separating them with the intersection character ∩.
+thing-type.config.mqtt.switch_channel.transformationPatternOut.label = Outgoing Value Transformation
+thing-type.config.mqtt.switch_channel.transformationPatternOut.description = Applies a transformation before publishing a MQTT topic value. Transformations are specialised in extracting a value, but some transformations like the MAP one could be useful.
+thing-type.config.mqtt.trigger_channel.group.transformations.label = Transform Values
+thing-type.config.mqtt.trigger_channel.group.transformations.description = These configuration parameters allow you to alter before a received value is used in the trigger.
+thing-type.config.mqtt.trigger_channel.stateTopic.label = MQTT Trigger Topic
+thing-type.config.mqtt.trigger_channel.stateTopic.description = An MQTT topic that this thing will subscribe to, to receive the trigger
+thing-type.config.mqtt.trigger_channel.transformationPattern.label = Incoming Value Transformations
+thing-type.config.mqtt.trigger_channel.transformationPattern.description = Applies transformations to an incoming MQTT topic value. This can be used to map the events sent by the device to common values for all devices using, e.g. the MAP transformation. You can chain transformations by separating them with the intersection character ∩.
diff --git a/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/i18n/mqttbroker_de.properties b/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/i18n/mqttbroker_de.properties
deleted file mode 100644
index 70d7c9dca79..00000000000
--- a/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/i18n/mqttbroker_de.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-binding.mqttgeneric.name = Allgemeines MQTT Binding
-binding.mqttgeneric.description = Verknüpfung von MQTT Topics mit Things
diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/i18n/mqtt.properties b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/i18n/mqtt.properties
index 7ab2c165ecc..2095eecad3b 100644
--- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/i18n/mqtt.properties
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/resources/OH-INF/i18n/mqtt.properties
@@ -1,3 +1,17 @@
+# thing types
+
+thing-type.mqtt.homeassistant.label = HomeAssistant MQTT Component
+thing-type.mqtt.homeassistant.description = You need a configured Broker first. This Thing represents a device, that follows the "HomeAssistant MQTT Component" specification.
+
+# thing types config
+
+thing-type.config.mqtt.homeassistant.basetopic.label = MQTT Base Prefix
+thing-type.config.mqtt.homeassistant.basetopic.description = MQTT base prefix
+thing-type.config.mqtt.homeassistant.topics.label = MQTT Config Topic
+thing-type.config.mqtt.homeassistant.topics.description = List of HomeAssistant configuration topics (e.g. /homeassistant/switch/4711/config)
+
+# channel types config
+
 channel-type.config.mqtt.ha-channel.component.label = Component
 channel-type.config.mqtt.ha-channel.component.description = HomeAssistant component type (e.g. binary_sensor, switch, light)
 channel-type.config.mqtt.ha-channel.config.label = Json Configuration
diff --git a/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/i18n/mqtt.properties b/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/i18n/mqtt.properties
index 295e5a9f466..2d554c6efaf 100644
--- a/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/i18n/mqtt.properties
+++ b/bundles/org.openhab.binding.mqtt.homie/src/main/resources/OH-INF/i18n/mqtt.properties
@@ -1,3 +1,19 @@
+# thing types
+
+thing-type.mqtt.homie300.label = Homie MQTT Device
+thing-type.mqtt.homie300.description = You need a configured Broker first. This thing represents a device, that follows the "MQTT Homie Convention" (Version 3.x).
+
+# thing types config
+
+thing-type.config.mqtt.homie300.basetopic.label = MQTT Base Prefix
+thing-type.config.mqtt.homie300.basetopic.description = MQTT base prefix
+thing-type.config.mqtt.homie300.deviceid.label = Device ID
+thing-type.config.mqtt.homie300.deviceid.description = Homie Device ID. This is part of the MQTT topic, e.g. "homie/deviceid/$homie".
+thing-type.config.mqtt.homie300.removetopics.label = Remove Retained Topics
+thing-type.config.mqtt.homie300.removetopics.description = Remove retained topics when thing is deleted
+
+# channel types config
+
 channel-type.config.mqtt.homie-channel.datatype.label = Data Type
 channel-type.config.mqtt.homie-channel.datatype.description = The data type of this channel.
 channel-type.config.mqtt.homie-channel.datatype.option.integer_ = Integer
diff --git a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt.properties b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt.properties
index 3c131e9f1b6..029ae60fa8f 100644
--- a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt.properties
+++ b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt.properties
@@ -78,6 +78,8 @@ channel-type.config.mqtt.publishTrigger.separator.description = The trigger chan
 channel-type.config.mqtt.publishTrigger.stateTopic.label = MQTT Topic
 channel-type.config.mqtt.publishTrigger.stateTopic.description = This channel will trigger on this MQTT topic. This topic can contain wildcards like + and # for example "all/in/#" or "sensors/+/config".
 
+# thing actions
+
 actionInputTopicLabel = MQTT Topic
 actionInputTopicDesc = The topic to publish a value to.
 actionInputValueLabel = Value
@@ -86,5 +88,8 @@ actionInputRetainLabel = Retain
 actionInputRetainDesc = Retain message
 actionLabel = publish an MQTT message
 actionDesc = Publishes a value to the given MQTT topic.
+
+# thing status
+
 offline.notextualconfig = The system connection with the name {0} doesn't exist anymore.
 offline.sharedremoved = Another binding unexpectedly removed the internal broker connection.