diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/addon/addon.xml
index 31b6dd15f34..95d50fd999b 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/bindingName
- @text/bindingDescription
+ Amazon Dash Button Binding
+ This is the binding for the Amazon Dash Button.
local
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton.properties b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton.properties
index c82eec0f307..0d3f66d63bf 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton.properties
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton.properties
@@ -1,7 +1,7 @@
# add-on
-bindingName = Amazon Dash Button Binding
-bindingDescription = This is the binding for the Amazon Dash Button.
+addon.amazondashbutton.name = Amazon Dash Button Binding
+addon.amazondashbutton.description = This is the binding for the Amazon Dash Button.
# thing types
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/addon/addon.xml
index 9bcbed110a3..b6b82d116bf 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,9 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/binding_name
- @text/binding_desc
+ digitalSTROM-Binding
+ The digitalSTROM-Binding integrates the digitalSTROM-System and allows to control the included devices and
+ call scenes.
local
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom.properties b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom.properties
index d530ceb5f4c..eb2ef099bbc 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom.properties
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom.properties
@@ -1,6 +1,6 @@
# add-on
-binding_name = digitalSTROM-Binding
-binding_desc = The digitalSTROM-Binding integrates the digitalSTROM-System and allows to control the included devices and call scenes.
+addon.digitalstrom.name = digitalSTROM-Binding
+addon.digitalstrom.description = The digitalSTROM-Binding integrates the digitalSTROM-System and allows to control the included devices and call scenes.
#dss-bridge
dSS_label = digitalSTROM-Server
diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml
index 17cf18c6a82..dbfb3be5748 100644
--- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/addon/addon.xml
@@ -3,7 +3,8 @@
xmlns:addon="https://openhab.org/schemas/addon/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/icloud.addon.name
- @text/icloud.addon.description
+ iCloud Binding
+ The Apple iCloud is used to retrieve data such as the battery level or current location of one or multiple
+ Apple devices connected to an iCloud account. Updates are quick and accurate without significant battery time impact.
cloud
diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud.properties b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud.properties
index 0564170566a..ebac6596c4b 100644
--- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud.properties
+++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud.properties
@@ -1,6 +1,6 @@
# add-on
-icloud.addon.name=iCloud Binding
-icloud.addon.description=The Apple iCloud is used to retrieve data such as the battery level or current location of one or multiple Apple devices connected to an iCloud account. Updates are quick and accurate without significant battery time impact.
+addon.icloud.name=iCloud Binding
+addon.icloud.description=The Apple iCloud is used to retrieve data such as the battery level or current location of one or multiple Apple devices connected to an iCloud account. Updates are quick and accurate without significant battery time impact.
# Account Thing
icloud.account-thing.label=iCloud Account
diff --git a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/addon/addon.xml
index 5598ee90980..b4167d3f7d6 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/addon.jeelink.name
- @text/addon.jeelink.description
+ JeeLink Binding
+ This is the binding for JeeLink USB Receivers, LaCrosseGateways and connected sensors.
local
diff --git a/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/addon/addon.xml
index e7c56b7bb77..b25fce00061 100644
--- a/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/addon.mielecloud.name
- @text/addon.mielecloud.description
+ Miele@home Cloud Binding
+ This is the cloud-based Miele@home binding.
cloud
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/addon/addon.xml
index 2ca09f33901..c4f8ee752a7 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/addon.nanoleaf.name
- @text/addon.nanoleaf.description
+ Nanoleaf Binding
+ Integrates the Nanoleaf light panels
local
diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/addon/addon.xml
index d7c8464ac04..2bffdd1dd56 100644
--- a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/bindingName
- @text/bindingDescription
+ Niko Home Control Binding
+ This is the binding for the Niko Home Control system
local
diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties
index 793ab1f47a4..e3112621dea 100644
--- a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties
+++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol.properties
@@ -1,6 +1,6 @@
# add-on
-bindingName = Niko Home Control Binding
-bindingDescription = This is the binding for the Niko Home Control system
+addon.nikohomecontrol.name = Niko Home Control Binding
+addon.nikohomecontrol.description = This is the binding for the Niko Home Control system
# bridge types
bridgeLabel = Niko Home Control I Bridge
diff --git a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml
index 264d5f0d672..7daf2b85967 100644
--- a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/bindingName
- @text/bindingDescription
+ SagerCaster Binding
+ The Sager Weathercaster is a scientific instrument for accurate prediction of the weather.
local
diff --git a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster.properties b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster.properties
index aac611194df..4087529d939 100644
--- a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster.properties
+++ b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster.properties
@@ -1,7 +1,7 @@
# add-on
-bindingName = SagerCaster Binding
-bindingDescription = The Sager Weathercaster is a scientific instrument for accurate prediction of the weather.
+addon.sagercaster.name = SagerCaster Binding
+addon.sagercaster.description = The Sager Weathercaster is a scientific instrument for accurate prediction of the weather.
# thing
diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml
index 07f54b622eb..7ed452cbda9 100644
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/addon.shelly.name
- @text/addon.shelly.description
+ Shelly Binding
+ This binding integrates Shelly devices that can be controlled via WiFi.
local
diff --git a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml
index 0f38281b601..0faaac1d74c 100644
--- a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/bindingLabel
- @text/bindingDescription
+ Somfy URTSI II Binding
+ This is the binding for Somfy Universal RTS Interface II (URTSI II).
local
diff --git a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi.properties b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi.properties
index e0457e63452..277bda38bce 100644
--- a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi.properties
+++ b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi.properties
@@ -1,7 +1,7 @@
# add-on
-bindingDescription = This is the binding for Somfy Universal RTS Interface II (URTSI II).
-bindingLabel = Somfy URTSI II Binding
+addon.urtsi.name = Somfy URTSI II Binding
+addon.urtsi.description = This is the binding for Somfy Universal RTS Interface II (URTSI II).
# thing types
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/addon/addon.xml
index cff830ee019..f606355feb5 100644
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,10 @@
xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
binding
- @text/addon.velux.name
- @text/addon.velux.description
+ Velux Binding
+ A binding for the Velux KLF200 Bridge. The Velux Binding interacts via a Velux Bridge with the different
+ Velux devices like controlling window openers, shutters and others. For example a KLF200 can act as interface between
+ the HomeAutomation and the VELUX INTEGRA products with wireless connectivity based on the io-homecontrol standard.
local