diff --git a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne.properties b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne.properties
index 72becbe10..ca1599c48 100644
--- a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne.properties
+++ b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.adorne.name = Adorne Binding
-binding.adorne.description = The Adorne Binding controls Legrand's Adorne Wi-Fi ready switches and outlets.
+addon.adorne.name = Adorne Binding
+addon.adorne.description = The Adorne Binding controls Legrand's Adorne Wi-Fi ready switches and outlets.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_de.properties b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_de.properties
index 0abbb0f36..df258a390 100644
--- a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_de.properties
+++ b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.adorne.name = Adorne Binding
-binding.adorne.description = Das Adorne Binding steuert Legrand's Adorne Wi-Fi Schalter und Steckdosen.
+addon.adorne.name = Adorne Binding
+addon.adorne.description = Das Adorne Binding steuert Legrand's Adorne Wi-Fi Schalter und Steckdosen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_it.properties b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_it.properties
index 1a29ce709..41b0a5682 100644
--- a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_it.properties
+++ b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/i18n/adorne_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.adorne.name = Gestore Adorne
-binding.adorne.description = Il gestore Adorne controlla gli interruttori e le prese Wi-Fi Adorne di Legrand.
+addon.adorne.name = Gestore Adorne
+addon.adorne.description = Il gestore Adorne controlla gli interruttori e le prese Wi-Fi Adorne di Legrand.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection.properties b/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection.properties
index f737917fd..9dbbde91d 100644
--- a/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection.properties
+++ b/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ahawastecollection.name = aha WasteCollection Binding
-binding.ahawastecollection.description = This binding provides information about the upcoming waste collection dates for places, that are served by aha, the waste collection company of the region Hannover. The values are retrieved from the online aha waste collection schedule available at: https://www.aha-region.de/abholtermine/abfuhrkalender.
+addon.ahawastecollection.name = aha WasteCollection Binding
+addon.ahawastecollection.description = This binding provides information about the upcoming waste collection dates for places, that are served by aha, the waste collection company of the region Hannover. The values are retrieved from the online aha waste collection schedule available at: https://www.aha-region.de/abholtermine/abfuhrkalender.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection_de.properties b/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection_de.properties
index 303bfa764..42a8b1e31 100644
--- a/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection_de.properties
+++ b/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/i18n/ahawastecollection_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ahawastecollection.name = aha Müllabführ
-binding.ahawastecollection.description = Stellt die Abfuhrtermine des aha Zweckverband Abfallwirtschaft Region Hannover zur Verfügung. 
+addon.ahawastecollection.name = aha Müllabführ
+addon.ahawastecollection.description = Stellt die Abfuhrtermine des aha Zweckverband Abfallwirtschaft Region Hannover zur Verfügung. 
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq.properties b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq.properties
index ab4577908..4061cddd0 100644
--- a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq.properties
+++ b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.airq.name = air-Q Binding
-binding.airq.description = This is the binding for air-Q devices. The air-Q device contains several sensors measuring gases in the air and other ambiance parameters like noise or temperature. With this binding you can integrate those values into your openHAB system and change parametrs of the air-Q device.
+addon.airq.name = air-Q Binding
+addon.airq.description = This is the binding for air-Q devices. The air-Q device contains several sensors measuring gases in the air and other ambiance parameters like noise or temperature. With this binding you can integrate those values into your openHAB system and change parametrs of the air-Q device.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_de.properties b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_de.properties
index 3c274e2c9..a05ffb86e 100644
--- a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_de.properties
+++ b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.airq.name = air-Q
-binding.airq.description = Binding für air-Q-Gerät
+# add-on
+addon.airq.name = air-Q
+addon.airq.description = Binding für air-Q-Gerät
 
 # thing types
 thing-type.airq.airq.label = air-Q
diff --git a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_it.properties b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_it.properties
index 9cf135b80..21b97f70d 100644
--- a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_it.properties
+++ b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/i18n/airq_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.airq.name = Gestore air-Q
-binding.airq.description = Questo è il gestore per i dispositivi air-Q. Il dispositivo air-Q contiene diversi sensori che misurano i gas presenti nell'aria e altri parametri atmosferici come il rumore o la temperatura. Con questa associazione puoi integrare questi valori nel tuo sistema openHAB e cambiare i parametri del dispositivo air-Q.
+addon.airq.name = Gestore air-Q
+addon.airq.description = Questo è il gestore per i dispositivi air-Q. Il dispositivo air-Q contiene diversi sensori che misurano i gas presenti nell'aria e altri parametri atmosferici come il rumore o la temperatura. Con questa associazione puoi integrare questi valori nel tuo sistema openHAB e cambiare i parametri del dispositivo air-Q.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality.properties b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality.properties
index 776d42461..3ff325f9a 100644
--- a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality.properties
+++ b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality.properties
@@ -1,6 +1,6 @@
-# binding
-binding.airquality.name = Air Quality Binding
-binding.airquality.description = Measure Air Quality Index and details about pollution particles for a given location.
+# add-on
+addon.airquality.name = Air Quality Binding
+addon.airquality.description = Measure Air Quality Index and details about pollution particles for a given location.
 
 # thing types
 thing-type.airquality.api.label = Air Quality API
diff --git a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_de.properties b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_de.properties
index a276a8b44..ebe61561d 100644
--- a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_de.properties
+++ b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.airquality.name = Luftqualitäts Bindung
-binding.airquality.description = Messen Sie den Luftqualitätsindex und Details zu den Verschmutzungspartikeln an einem bestimmten Ort.
+# add-on
+addon.airquality.name = Luftqualitäts Bindung
+addon.airquality.description = Messen Sie den Luftqualitätsindex und Details zu den Verschmutzungspartikeln an einem bestimmten Ort.
 
 # thing types
 thing-type.airquality.api.label = Air Quality API
diff --git a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_fr.properties b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_fr.properties
index 6463c5436..74487b9e4 100644
--- a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_fr.properties
+++ b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_fr.properties
@@ -1,6 +1,6 @@
-# binding
-binding.airquality.name = Extension Air Quality
-binding.airquality.description = Cette extension permet de récupérer l'indice de qualité de l'air et des informations sur la pollution aux particules pour un emplacement donné.
+# add-on
+addon.airquality.name = Extension Air Quality
+addon.airquality.description = Cette extension permet de récupérer l'indice de qualité de l'air et des informations sur la pollution aux particules pour un emplacement donné.
 
 # thing types
 thing-type.airquality.api.label = API Air Quality
diff --git a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_it.properties b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_it.properties
index bafba8a8d..6bc93837b 100644
--- a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_it.properties
+++ b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/i18n/airquality_it.properties
@@ -1,6 +1,6 @@
-# binding
-binding.airquality.name = Gestore "AQI Air Quality Index"
-binding.airquality.description = Misura l'indice di qualità dell'aria e i dettagli sulle particelle d'inquinamento per una data località in base ai dati forniti dal sito aquicn.org.
+# add-on
+addon.airquality.name = Gestore "AQI Air Quality Index"
+addon.airquality.description = Misura l'indice di qualità dell'aria e i dettagli sulle particelle d'inquinamento per una data località in base ai dati forniti dal sito aquicn.org.
 
 # thing types
 thing-type.airquality.api.label = API AQI
diff --git a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode.properties b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode.properties
index 0852a23ae..f9dce2c38 100644
--- a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode.properties
+++ b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.airvisualnode.name = AirVisual Node Binding
-binding.airvisualnode.description = Binding for AirVisual Node air quality monitor
+addon.airvisualnode.name = AirVisual Node Binding
+addon.airvisualnode.description = Binding for AirVisual Node air quality monitor
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_de.properties b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_de.properties
index d5b1fa6c7..ee04c580a 100644
--- a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_de.properties
+++ b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.airvisualnode.name = AirVisual Node Binding
-binding.airvisualnode.description = Bindung für AirVisual Node Luftqualitätsmonitor
+addon.airvisualnode.name = AirVisual Node Binding
+addon.airvisualnode.description = Bindung für AirVisual Node Luftqualitätsmonitor
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_it.properties b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_it.properties
index 6b5cb1457..f018fbdd1 100644
--- a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_it.properties
+++ b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/i18n/airvisualnode_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.airvisualnode.name = Gestore nodo AirVisual
-binding.airvisualnode.description = Gestione del monitor della qualità dell'aria AirVisual
+addon.airvisualnode.name = Gestore nodo AirVisual
+addon.airvisualnode.description = Gestione del monitor della qualità dell'aria AirVisual
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/i18n/alarmdecoder.properties b/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/i18n/alarmdecoder.properties
index c7af2197f..361d8b90b 100644
--- a/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/i18n/alarmdecoder.properties
+++ b/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/i18n/alarmdecoder.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.alarmdecoder.name = Alarm Decoder Binding
-binding.alarmdecoder.description = This binding is for the Nu Tech Alarm Decoder, used for interfacing with Ademco/Honeywell and DSC alarm systems.
+addon.alarmdecoder.name = Alarm Decoder Binding
+addon.alarmdecoder.description = This binding is for the Nu Tech Alarm Decoder, used for interfacing with Ademco/Honeywell and DSC alarm systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay.properties b/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay.properties
index a2dc5bce0..8115635c1 100644
--- a/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay.properties
+++ b/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay.properties
@@ -1,18 +1,18 @@
-# binding
+# add-on
 
-binding.allplay.name = AllPlay Binding
-binding.allplay.description = The AllPlay binding integrates devices compatible with Qualcomm AllPlay.
+addon.allplay.name = AllPlay Binding
+addon.allplay.description = The AllPlay binding integrates devices compatible with Qualcomm AllPlay.
 
-# binding config
+# add-on config
 
-binding.config.allplay.callbackUrl.label = Callback URL
-binding.config.allplay.callbackUrl.description = URL to use for playing audio streams, e.g. http://192.168.0.2:8080
-binding.config.allplay.fastForwardSkipTimeInSec.label = Fast Forward Skip Time
-binding.config.allplay.fastForwardSkipTimeInSec.description = Seconds to jump forward if the fastforward command is executed
-binding.config.allplay.rewindSkipTimeInSec.label = Rewind Skip Time
-binding.config.allplay.rewindSkipTimeInSec.description = Seconds to jump backwards if the rewind command is executed
-binding.config.allplay.zoneMemberSeparator.label = Zone Member Separator
-binding.config.allplay.zoneMemberSeparator.description = Separator which is used when sending multiple zone members to channel 'zonemembers'
+addon.config.allplay.callbackUrl.label = Callback URL
+addon.config.allplay.callbackUrl.description = URL to use for playing audio streams, e.g. http://192.168.0.2:8080
+addon.config.allplay.fastForwardSkipTimeInSec.label = Fast Forward Skip Time
+addon.config.allplay.fastForwardSkipTimeInSec.description = Seconds to jump forward if the fastforward command is executed
+addon.config.allplay.rewindSkipTimeInSec.label = Rewind Skip Time
+addon.config.allplay.rewindSkipTimeInSec.description = Seconds to jump backwards if the rewind command is executed
+addon.config.allplay.zoneMemberSeparator.label = Zone Member Separator
+addon.config.allplay.zoneMemberSeparator.description = Separator which is used when sending multiple zone members to channel 'zonemembers'
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay_it.properties b/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay_it.properties
index 81cecead6..100754154 100644
--- a/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay_it.properties
+++ b/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/i18n/allplay_it.properties
@@ -1,18 +1,18 @@
-# binding
+# add-on
 
-binding.allplay.name = Gestore AllPlay
-binding.allplay.description = Il Gestore AllPlay integra dispositivi compatibili con Qualcomm AllPlay.
+addon.allplay.name = Gestore AllPlay
+addon.allplay.description = Il Gestore AllPlay integra dispositivi compatibili con Qualcomm AllPlay.
 
-# binding config
+# add-on config
 
-binding.config.allplay.callbackUrl.label = URL di callback
-binding.config.allplay.callbackUrl.description = URL da usare per riprodurre il flusso audio, ad esempio http\://192.168.0.2\:8080
-binding.config.allplay.fastForwardSkipTimeInSec.label = Tempo di salto per Avanti-veloce
-binding.config.allplay.fastForwardSkipTimeInSec.description = Secondi da saltare in avanti se viene eseguito il comano Avanti-veloce
-binding.config.allplay.rewindSkipTimeInSec.label = Tempo di salto per Riavvolgi
-binding.config.allplay.rewindSkipTimeInSec.description = Secondi da saltare indietro se viene eseguito il comano Riavvolgi
-binding.config.allplay.zoneMemberSeparator.label = Separatore membri della zona
-binding.config.allplay.zoneMemberSeparator.description = Separatore utilizzato per inviare più membri di una zona al canale 'zonemembers'
+addon.config.allplay.callbackUrl.label = URL di callback
+addon.config.allplay.callbackUrl.description = URL da usare per riprodurre il flusso audio, ad esempio http\://192.168.0.2\:8080
+addon.config.allplay.fastForwardSkipTimeInSec.label = Tempo di salto per Avanti-veloce
+addon.config.allplay.fastForwardSkipTimeInSec.description = Secondi da saltare in avanti se viene eseguito il comano Avanti-veloce
+addon.config.allplay.rewindSkipTimeInSec.label = Tempo di salto per Riavvolgi
+addon.config.allplay.rewindSkipTimeInSec.description = Secondi da saltare indietro se viene eseguito il comano Riavvolgi
+addon.config.allplay.zoneMemberSeparator.label = Separatore membri della zona
+addon.config.allplay.zoneMemberSeparator.description = Separatore utilizzato per inviare più membri di una zona al canale 'zonemembers'
 
 # thing types
 
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 1c3cd61b4..c82eec0f3 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,4 +1,4 @@
-# binding
+# add-on
 
 bindingName = Amazon Dash Button Binding
 bindingDescription = This is the binding for the Amazon Dash Button.
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_de.properties b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_de.properties
index 4c414c247..ba78334c9 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_de.properties
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_de.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 bindingDescription = Dies ist das Binding für den Amazon Dash Button.
 
 # thing types
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_fr.properties b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_fr.properties
index c9c15c0cb..2fec618bf 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_fr.properties
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_fr.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 
 bindingName = Extension Dash Button Amazon
 bindingDescription = Ceci est l'extension pour le Dash Button Amazon.
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_hu.properties b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_hu.properties
index c9adfab73..04072757f 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_hu.properties
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_hu.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 bindingDescription = Ez az Amazon Dash Gomb kötése.
 
 # thing types
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_it.properties b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_it.properties
index 133b057a0..36eea7009 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_it.properties
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_it.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 
 bindingName = Binding Pulsante Amazon Dash
 bindingDescription = Questo è il binding per il pulsante Amazon Dash.
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_uk.properties b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_uk.properties
index dfe2d708f..3897eb4c6 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_uk.properties
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/i18n/amazondashbutton_uk.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 bindingDescription = Це під’єднання для кнопки Amazon Dash.
 
 # thing types
diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol.properties b/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol.properties
index dba47615f..c0914db53 100644
--- a/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol.properties
+++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.amazonechocontrol.name = Amazon Echo Control Binding
-binding.amazonechocontrol.description = Binding to control Amazon Echo devices (Alexa). This binding enables openHAB to control the volume, playing state, bluetooth connection of your amazon echo devices or allow to use it as TTS device.
+addon.amazonechocontrol.name = Amazon Echo Control Binding
+addon.amazonechocontrol.description = Binding to control Amazon Echo devices (Alexa). This binding enables openHAB to control the volume, playing state, bluetooth connection of your amazon echo devices or allow to use it as TTS device.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_de.properties b/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_de.properties
index 1a50b4b08..8504c0ac8 100644
--- a/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_de.properties
+++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.amazonechocontrol.name = Amazon Echo Steuerung Binding
-binding.amazonechocontrol.description = Binding zum Steuern von Amazon Echo (Alexa). Dieses Binding ermöglicht openHAB die Lautstärke, den Wiedergabe Status und die Bluetooth-Verbindung des Amazon Echo Gerätes zu steuern oder als TTS Gerät zu benutzen.
+addon.amazonechocontrol.name = Amazon Echo Steuerung Binding
+addon.amazonechocontrol.description = Binding zum Steuern von Amazon Echo (Alexa). Dieses Binding ermöglicht openHAB die Lautstärke, den Wiedergabe Status und die Bluetooth-Verbindung des Amazon Echo Gerätes zu steuern oder als TTS Gerät zu benutzen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_it.properties b/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_it.properties
index fb186d987..711276b6f 100644
--- a/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_it.properties
+++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/resources/OH-INF/i18n/amazonechocontrol_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.amazonechocontrol.name = Binding Controllo Amazon Echo
-binding.amazonechocontrol.description = Permette di gestire i dispositivi Amazon Echo (Alexa). Questo binding consente a openHAB di controllare il volume, lo stato di riproduzione, la connessione bluetooth dei dispositivi di echo Amazon o consentire di utilizzarlo come dispositivo TTS.
+addon.amazonechocontrol.name = Binding Controllo Amazon Echo
+addon.amazonechocontrol.description = Permette di gestire i dispositivi Amazon Echo (Alexa). Questo binding consente a openHAB di controllare il volume, lo stato di riproduzione, la connessione bluetooth dei dispositivi di echo Amazon o consentire di utilizzarlo come dispositivo TTS.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather.properties b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather.properties
index 6d60090af..b5db7ee7e 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather.properties
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ambientweather.name = AmbientWeather Binding
-binding.ambientweather.description = This binding supports weather stations from Ambient Weather
+addon.ambientweather.name = AmbientWeather Binding
+addon.ambientweather.description = This binding supports weather stations from Ambient Weather
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_fr.properties b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_fr.properties
index 4d6af0538..c6bd23eb9 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_fr.properties
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_fr.properties
@@ -1,6 +1,6 @@
-# binding
-binding.ambientweather.name = Extension Ambient Weather
-binding.ambientweather.description = Extension prenant en charge les stations météo Ambient Weather
+# add-on
+addon.ambientweather.name = Extension Ambient Weather
+addon.ambientweather.description = Extension prenant en charge les stations météo Ambient Weather
 
 # thing types
 thing-type.ambientweather.bridge.label = Pont Ambient Weather
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_hu.properties b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_hu.properties
index 1fbdf7f4d..8164eef35 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_hu.properties
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_hu.properties
@@ -1,6 +1,6 @@
-# binding
-binding.ambientweather.name = Ambient Weather kötés
-binding.ambientweather.description = Ambient Weather időjárás állomásokat támogató kötés
+# add-on
+addon.ambientweather.name = Ambient Weather kötés
+addon.ambientweather.description = Ambient Weather időjárás állomásokat támogató kötés
 
 # thing types
 thing-type.ambientweather.bridge.label = Ambient Weather híd
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_it.properties b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_it.properties
index f76c9c64f..40bf6e4f9 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_it.properties
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ambientweather.name = Binding AmbientWeather
-binding.ambientweather.description = Questo binding supporta le stazioni meteo Ambient Weather
+addon.ambientweather.name = Binding AmbientWeather
+addon.ambientweather.description = Questo binding supporta le stazioni meteo Ambient Weather
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_uk.properties b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_uk.properties
index 4fc8f8e43..d03aefdc4 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_uk.properties
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/i18n/ambientweather_uk.properties
@@ -1,6 +1,6 @@
-# binding
-binding.ambientweather.name = Під’єднання для Ambient Weather
-binding.ambientweather.description = Під’єднання яке підтримує погодні станціі виробництва Ambient Weather
+# add-on
+addon.ambientweather.name = Під’єднання для Ambient Weather
+addon.ambientweather.description = Під’єднання яке підтримує погодні станціі виробництва Ambient Weather
 
 # thing types
 thing-type.ambientweather.bridge.label = Міст з Ambient Weather
diff --git a/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi.properties b/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi.properties
index b7fce2d05..dd81899b5 100644
--- a/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi.properties
+++ b/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.amplipi.name = AmpliPi Binding
-binding.amplipi.description = This is the binding for the AmpliPi Home Audio System from MicroNova.
+addon.amplipi.name = AmpliPi Binding
+addon.amplipi.description = This is the binding for the AmpliPi Home Audio System from MicroNova.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi_it.properties b/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi_it.properties
index 107799d3a..e6184e64d 100644
--- a/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi_it.properties
+++ b/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/i18n/amplipi_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.amplipi.name = Gestore AmpliPi
-binding.amplipi.description = Questo è il Gestore per il sistema audio per la casa AmpliPi di MicroNova.
+addon.amplipi.name = Gestore AmpliPi
+addon.amplipi.description = Questo è il Gestore per il sistema audio per la casa AmpliPi di MicroNova.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge.properties b/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge.properties
index dda2d597d..4d5386d08 100644
--- a/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge.properties
+++ b/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge.properties
@@ -1,18 +1,18 @@
-# binding
+# add-on
 
-binding.androiddebugbridge.name = Android Debug Bridge Binding
-binding.androiddebugbridge.description = This is the binding for connect to Android devices using the Android Debug Bridge protocol.
+addon.androiddebugbridge.name = Android Debug Bridge Binding
+addon.androiddebugbridge.description = This is the binding for connect to Android devices using the Android Debug Bridge protocol.
 
-# binding config
+# add-on config
 
-binding.config.androiddebugbridge.discoveryIpRangeMax.label = Discovery Range IP Max
-binding.config.androiddebugbridge.discoveryIpRangeMax.description = Used to limit the numbers of ips checked while discovering.
-binding.config.androiddebugbridge.discoveryIpRangeMin.label = Discovery Range IP Min
-binding.config.androiddebugbridge.discoveryIpRangeMin.description = Used to limit the numbers of ips checked while discovering.
-binding.config.androiddebugbridge.discoveryPort.label = Discovery Port
-binding.config.androiddebugbridge.discoveryPort.description = Port used on discovery to connect to the device through adb.
-binding.config.androiddebugbridge.discoveryReachableMs.label = Discovery Reachable
-binding.config.androiddebugbridge.discoveryReachableMs.description = Milliseconds to wait while discovering to determine if the ip is reachable.
+addon.config.androiddebugbridge.discoveryIpRangeMax.label = Discovery Range IP Max
+addon.config.androiddebugbridge.discoveryIpRangeMax.description = Used to limit the numbers of ips checked while discovering.
+addon.config.androiddebugbridge.discoveryIpRangeMin.label = Discovery Range IP Min
+addon.config.androiddebugbridge.discoveryIpRangeMin.description = Used to limit the numbers of ips checked while discovering.
+addon.config.androiddebugbridge.discoveryPort.label = Discovery Port
+addon.config.androiddebugbridge.discoveryPort.description = Port used on discovery to connect to the device through adb.
+addon.config.androiddebugbridge.discoveryReachableMs.label = Discovery Reachable
+addon.config.androiddebugbridge.discoveryReachableMs.description = Milliseconds to wait while discovering to determine if the ip is reachable.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge_it.properties b/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge_it.properties
index e88d3e0a5..950b124aa 100644
--- a/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge_it.properties
+++ b/bundles/org.openhab.binding.androiddebugbridge/src/main/resources/OH-INF/i18n/androiddebugbridge_it.properties
@@ -1,18 +1,18 @@
-# binding
+# add-on
 
-binding.androiddebugbridge.name = Binding Debug Android Bridge
-binding.androiddebugbridge.description = Questa è il Binding per connettersi ai dispositivi Android utilizzando il protocollo Android Debug Bridge.
+addon.androiddebugbridge.name = Binding Debug Android Bridge
+addon.androiddebugbridge.description = Questa è il Binding per connettersi ai dispositivi Android utilizzando il protocollo Android Debug Bridge.
 
-# binding config
+# add-on config
 
-binding.config.androiddebugbridge.discoveryIpRangeMax.label = Max Range IP Per Scansione
-binding.config.androiddebugbridge.discoveryIpRangeMax.description = Usato per limitare i numeri di IP controllati durante la scansione.
-binding.config.androiddebugbridge.discoveryIpRangeMin.label = Min Range IP per Scansione
-binding.config.androiddebugbridge.discoveryIpRangeMin.description = Usato per limitare i numeri di IP controllati durante la scansione.
-binding.config.androiddebugbridge.discoveryPort.label = Porta di ricerca
-binding.config.androiddebugbridge.discoveryPort.description = Porta utilizzata alla scansione per connettersi al dispositivo tramite adb.
-binding.config.androiddebugbridge.discoveryReachableMs.label = Raggiungibile alla Scansione
-binding.config.androiddebugbridge.discoveryReachableMs.description = Millisecondi da attendere durante la scansione per determinare se l'IP è raggiungibile.
+addon.config.androiddebugbridge.discoveryIpRangeMax.label = Max Range IP Per Scansione
+addon.config.androiddebugbridge.discoveryIpRangeMax.description = Usato per limitare i numeri di IP controllati durante la scansione.
+addon.config.androiddebugbridge.discoveryIpRangeMin.label = Min Range IP per Scansione
+addon.config.androiddebugbridge.discoveryIpRangeMin.description = Usato per limitare i numeri di IP controllati durante la scansione.
+addon.config.androiddebugbridge.discoveryPort.label = Porta di ricerca
+addon.config.androiddebugbridge.discoveryPort.description = Porta utilizzata alla scansione per connettersi al dispositivo tramite adb.
+addon.config.androiddebugbridge.discoveryReachableMs.label = Raggiungibile alla Scansione
+addon.config.androiddebugbridge.discoveryReachableMs.description = Millisecondi da attendere durante la scansione per determinare se l'IP è raggiungibile.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel.properties b/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel.properties
index 022b05c3e..b759db14e 100644
--- a/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel.properties
+++ b/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.anel.name = Anel NET-PwrCtrl Binding
-binding.anel.description = This is the binding for Anel NET-PwrCtrl devices.
+addon.anel.name = Anel NET-PwrCtrl Binding
+addon.anel.description = This is the binding for Anel NET-PwrCtrl devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel_it.properties b/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel_it.properties
index f3f80a921..c36f04a70 100644
--- a/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel_it.properties
+++ b/bundles/org.openhab.binding.anel/src/main/resources/OH-INF/i18n/anel_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.anel.name = Gestore Anel NET-PwrCtrl
-binding.anel.description = Questo è il Gestore per i dispositivi Anel NET-PwrCtrl.
+addon.anel.name = Gestore Anel NET-PwrCtrl
+addon.anel.description = Questo è il Gestore per i dispositivi Anel NET-PwrCtrl.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro.properties b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro.properties
index 1e39922bd..bb619a600 100644
--- a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro.properties
+++ b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.astro.name = Astro Binding
-binding.astro.description = The Astro binding calculates astronomical data from sun and moon.
+addon.astro.name = Astro Binding
+addon.astro.description = The Astro binding calculates astronomical data from sun and moon.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_de.properties b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_de.properties
index f1f340c32..5bed7c9b2 100644
--- a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_de.properties
+++ b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.astro.name = Astro Binding
-binding.astro.description = Das Astro Binding berechnet astronomische Daten von Sonne und Mond.
+addon.astro.name = Astro Binding
+addon.astro.description = Das Astro Binding berechnet astronomische Daten von Sonne und Mond.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fi.properties b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fi.properties
index 7fa344bf2..441fc10c9 100644
--- a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fi.properties
+++ b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.astro.name = Taivaankappaleet-lisäosa
-binding.astro.description = Taivaankappaleet-lisäosa laskee tähtitieteellisiä tietoja auringosta ja kuusta.
+addon.astro.name = Taivaankappaleet-lisäosa
+addon.astro.description = Taivaankappaleet-lisäosa laskee tähtitieteellisiä tietoja auringosta ja kuusta.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fr.properties b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fr.properties
index a7247f46a..3e70d350d 100644
--- a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fr.properties
+++ b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.astro.name = Extension Astro
-binding.astro.description = L'extension Astro calcule les données astronomiques du soleil et de la lune.
+addon.astro.name = Extension Astro
+addon.astro.description = L'extension Astro calcule les données astronomiques du soleil et de la lune.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_hu.properties b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_hu.properties
index 153effbdb..2587ebf86 100644
--- a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_hu.properties
+++ b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.astro.name = Astro kötés
-binding.astro.description = Az Astro kötés csillagászati adatokat számol a hold és nap állásából.
+addon.astro.name = Astro kötés
+addon.astro.description = Az Astro kötés csillagászati adatokat számol a hold és nap állásából.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_it.properties b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_it.properties
index 5138073ed..0f0d8f727 100644
--- a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_it.properties
+++ b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.astro.name = Binding Astro
-binding.astro.description = Il binding Astro calcola i dati astronomici dal sole e dalla luna.
+addon.astro.name = Binding Astro
+addon.astro.description = Il binding Astro calcola i dati astronomici dal sole e dalla luna.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_tr.properties b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_tr.properties
index 1abf0f178..fa91511bf 100644
--- a/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_tr.properties
+++ b/bundles/org.openhab.binding.astro/src/main/resources/OH-INF/i18n/astro_tr.properties
@@ -1,6 +1,6 @@
-# binding
-binding.astro.name = Astro bağlantısı
-binding.astro.description = Astro bağlantısı ay ve güneş bilgilerini hesaplamaya yarar.
+# add-on
+addon.astro.name = Astro bağlantısı
+addon.astro.description = Astro bağlantısı ay ve güneş bilgilerini hesaplamaya yarar.
 
 # thing types
 thing-type.astro.sun.label = Astronomik güneş verileri
diff --git a/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona.properties b/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona.properties
index 5d4276117..bda60b68f 100644
--- a/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona.properties
+++ b/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.atlona.name = Atlona Binding
-binding.atlona.description = Binding for Atlona PRO3 HDBaseT Matrix switches.
+addon.atlona.name = Atlona Binding
+addon.atlona.description = Binding for Atlona PRO3 HDBaseT Matrix switches.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona_it.properties b/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona_it.properties
index 0b3a40d63..32fabbe1a 100644
--- a/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona_it.properties
+++ b/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/i18n/atlona_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.atlona.name = Binding Atlona
-binding.atlona.description = Binding per Atlona PRO3 HDBaseT Matrix switches.
+addon.atlona.name = Binding Atlona
+addon.atlona.description = Binding per Atlona PRO3 HDBaseT Matrix switches.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/i18n/autelis.properties b/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/i18n/autelis.properties
index 6e916e6ff..c84102798 100644
--- a/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/i18n/autelis.properties
+++ b/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/i18n/autelis.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.autelis.name = Autelis Pool Control Binding
-binding.autelis.description = This is the binding for an Autelis pool controller.
+addon.autelis.name = Autelis Pool Control Binding
+addon.autelis.description = This is the binding for an Autelis pool controller.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower.properties b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower.properties
index a531cb864..982b3cf54 100644
--- a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower.properties
+++ b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.automower.name = Automower Binding
-binding.automower.description = Binding to interact with Husquvarna Automower robots.
+addon.automower.name = Automower Binding
+addon.automower.description = Binding to interact with Husquvarna Automower robots.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_de.properties b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_de.properties
index ec9f63f91..e05403124 100644
--- a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_de.properties
+++ b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_de.properties
@@ -1,5 +1,5 @@
-binding.automower.name = Automower Binding
-binding.automower.description = Das Automower Binding erlaubt die Interaktion mit Husqvarna Automower Mährobotern mit Automower Connect Unterstützung.
+addon.automower.name = Automower Binding
+addon.automower.description = Das Automower Binding erlaubt die Interaktion mit Husqvarna Automower Mährobotern mit Automower Connect Unterstützung.
 
 thing-type.automower.bridge.label = Automower Connect Bridge
 thing-type.automower.bridge.description = Erlaubt die Kommunikation mit der Husqvarna Automower Connect API
diff --git a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_fr.properties b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_fr.properties
index 9966d5212..7e4abbb33 100644
--- a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_fr.properties
+++ b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_fr.properties
@@ -1,6 +1,6 @@
-# binding
-binding.automower.name = Robot tondeuse
-binding.automower.description = Cette extension permet d'interagir avec les robots tondeuses Husqvarna
+# add-on
+addon.automower.name = Robot tondeuse
+addon.automower.description = Cette extension permet d'interagir avec les robots tondeuses Husqvarna
 
 
 # automower parameters    
diff --git a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_hu.properties b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_hu.properties
index 372c14b61..d9d6ea1d1 100644
--- a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_hu.properties
+++ b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/i18n/automower_hu.properties
@@ -1,6 +1,6 @@
-# binding
-binding.automower.name = Robotfűnyíró
-binding.automower.description = Ez a kötés a Husqvarna robotfűnyírók kezelését teszi lehetővé
+# add-on
+addon.automower.name = Robotfűnyíró
+addon.automower.description = Ez a kötés a Husqvarna robotfűnyírók kezelését teszi lehetővé
 
 
 # automower parameters    
diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
index 6f9ef4909..e019b0873 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.avmfritz.name = AVM FRITZ! Binding
-binding.avmfritz.description = This is the binding for AVM FRITZ! devices.
+addon.avmfritz.name = AVM FRITZ! Binding
+addon.avmfritz.description = This is the binding for AVM FRITZ! devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties
index 3448a566b..67b17d7e3 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/i18n/avmfritz_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.avmfritz.name = AVM FRITZ\! Binding
-binding.avmfritz.description = Dieses Binding integriert AVM FRITZ\! Geräte (z.B. DECT 100/200/210/300/301, Comet DECT, Powerline 546E).
+addon.avmfritz.name = AVM FRITZ\! Binding
+addon.avmfritz.description = Dieses Binding integriert AVM FRITZ\! Geräte (z.B. DECT 100/200/210/300/301, Comet DECT, Powerline 546E).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar.properties b/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar.properties
index dd98b7352..3fc96bad7 100644
--- a/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar.properties
+++ b/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar.properties
@@ -1,5 +1,5 @@
-binding.awattar.name = aWATTar Binding
-binding.awattar.description = Hourly market electricity prices for Germany and Austria
+addon.awattar.name = aWATTar Binding
+addon.awattar.description = Hourly market electricity prices for Germany and Austria
 
 bridge-type.awattar.bridge.label = aWATTar Bridge
 bridge-type.awattar.bridge.description = Provides price data from the aWATTar API.
diff --git a/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar_de.properties b/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar_de.properties
index bbb613d2a..8eab2b633 100644
--- a/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar_de.properties
+++ b/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/i18n/awattar_de.properties
@@ -1,5 +1,5 @@
-binding.awattar.name = aWATTar Binding
-binding.awattar.description = Stündlich wechselnde Strompreise für Deutschland und Österreich
+addon.awattar.name = aWATTar Binding
+addon.awattar.description = Stündlich wechselnde Strompreise für Deutschland und Österreich
 
 bridge-type.awattar.bridge.label = aWATTar Bridge
 bridge-type.awattar.bridge.description = Ermittelt Strompreise von der aWATTar API.
diff --git a/bundles/org.openhab.binding.benqprojector/src/main/resources/OH-INF/i18n/benqprojector.properties b/bundles/org.openhab.binding.benqprojector/src/main/resources/OH-INF/i18n/benqprojector.properties
index 37b6fbbc1..9644f6c22 100644
--- a/bundles/org.openhab.binding.benqprojector/src/main/resources/OH-INF/i18n/benqprojector.properties
+++ b/bundles/org.openhab.binding.benqprojector/src/main/resources/OH-INF/i18n/benqprojector.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.benqprojector.name = BenQ Projector Binding
-binding.benqprojector.description = This binding is compatible with BenQ projectors
+addon.benqprojector.name = BenQ Projector Binding
+addon.benqprojector.description = This binding is compatible with BenQ projectors
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/i18n/bigassfan.properties b/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/i18n/bigassfan.properties
index 593800857..b6f91510f 100644
--- a/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/i18n/bigassfan.properties
+++ b/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/i18n/bigassfan.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bigassfan.name = BigAssFan Binding
-binding.bigassfan.description = This is the binding for BigAssFan.
+addon.bigassfan.name = BigAssFan Binding
+addon.bigassfan.description = This is the binding for BigAssFan.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth.properties b/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth.properties
index 5db11c8d1..11b2da7da 100644
--- a/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth.properties
+++ b/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bluetooth.name = Bluetooth Binding
-binding.bluetooth.description = This binding supports the Bluetooth protocol.
+addon.bluetooth.name = Bluetooth Binding
+addon.bluetooth.description = This binding supports the Bluetooth protocol.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_de.properties b/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_de.properties
index 88612f3ca..a6a873482 100644
--- a/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_de.properties
+++ b/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bluetooth.name = Bluetooth Bindung
-binding.bluetooth.description = Diese Bindung unterstützt das Bluetooth-Protokoll.
+addon.bluetooth.name = Bluetooth Bindung
+addon.bluetooth.description = Diese Bindung unterstützt das Bluetooth-Protokoll.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_it.properties b/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_it.properties
index 90a0e7f33..269c86305 100644
--- a/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_it.properties
+++ b/bundles/org.openhab.binding.bluetooth/src/main/resources/OH-INF/i18n/bluetooth_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bluetooth.name = Binding Bluetooth
-binding.bluetooth.description = Questo binding supporta il protocollo Bluetooth.
+addon.bluetooth.name = Binding Bluetooth
+addon.bluetooth.description = Questo binding supporta il protocollo Bluetooth.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/i18n/bondhome.properties b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/i18n/bondhome.properties
index 8fffa5074..088bdb13e 100644
--- a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/i18n/bondhome.properties
+++ b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/i18n/bondhome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bondhome.name = Bond Home Binding
-binding.bondhome.description = This is the binding for the Bond Bridge for Ceiling Fans and other RF devices.
+addon.bondhome.name = Bond Home Binding
+addon.bondhome.description = This is the binding for the Bond Bridge for Ceiling Fans and other RF devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego.properties b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego.properties
index 264197d84..e1c267763 100644
--- a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego.properties
+++ b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.boschindego.name = BoschIndego Binding
-binding.boschindego.description = This is the binding for Bosch Indego Connect lawn mowers.
+addon.boschindego.name = BoschIndego Binding
+addon.boschindego.description = This is the binding for Bosch Indego Connect lawn mowers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_da.properties b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_da.properties
index 79947ae4c..1629f7ed2 100644
--- a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_da.properties
+++ b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_da.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.boschindego.name = BoschIndego Binding
-binding.boschindego.description = Dette er bindingen til Bosch Indego-robotplæneklippere.
+addon.boschindego.name = BoschIndego Binding
+addon.boschindego.description = Dette er bindingen til Bosch Indego-robotplæneklippere.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_de.properties b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_de.properties
index 6616b3520..f5acb73df 100644
--- a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_de.properties
+++ b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/i18n/boschindego_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.boschindego.name = BoschIndego Binding
-binding.boschindego.description = Dies ist die Bindung für die Rasenmäher von Bosch Indego Connect.
+addon.boschindego.name = BoschIndego Binding
+addon.boschindego.description = Dies ist die Bindung für die Rasenmäher von Bosch Indego Connect.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
index b6d037df3..ff6b73646 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.boschshc.name = Bosch Smart Home Binding
-binding.boschshc.description = This is the binding for Bosch Smart Home.
+addon.boschshc.name = Bosch Smart Home Binding
+addon.boschshc.description = This is the binding for Bosch Smart Home.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_de.properties b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_de.properties
index d844aaa61..6c642be1d 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_de.properties
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.boschshc.name = Bosch Smart Home Binding
-binding.boschshc.description = Dieses Binding integriert das Bosch Smart Home System. Durch diese können die Bosch Smart Home Geräte verwendet werden.
+addon.boschshc.name = Bosch Smart Home Binding
+addon.boschshc.description = Dieses Binding integriert das Bosch Smart Home System. Durch diese können die Bosch Smart Home Geräte verwendet werden.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties
index 1187a738e..309cb4220 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.boschshc.name = Binding Bosh Smart Home
-binding.boschshc.description = Questo è il binding per Bosch Smart Home.
+addon.boschshc.name = Binding Bosh Smart Home
+addon.boschshc.description = Questo è il binding per Bosch Smart Home.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch.properties b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch.properties
index a2c0455b3..f4021fe99 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch.properties
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bosesoundtouch.name = Bose SoundTouch Binding
-binding.bosesoundtouch.description = This is the binding for Bose SoundTouch devices.
+addon.bosesoundtouch.name = Bose SoundTouch Binding
+addon.bosesoundtouch.description = This is the binding for Bose SoundTouch devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch_de.properties b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch_de.properties
index 30d3e039e..590d6f019 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch_de.properties
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/i18n/bosesoundtouch_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bosesoundtouch.name = Bose SoundTouch Binding
-binding.bosesoundtouch.description = Dieses Binding integriert Bose SoundTouch Geräte.
+addon.bosesoundtouch.name = Bose SoundTouch Binding
+addon.bosesoundtouch.description = Dieses Binding integriert Bose SoundTouch Geräte.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/i18n/broadlinkthermostat.properties b/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/i18n/broadlinkthermostat.properties
index 2f1def913..4d6543809 100644
--- a/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/i18n/broadlinkthermostat.properties
+++ b/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/i18n/broadlinkthermostat.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.broadlinkthermostat.name = Broadlink Binding
-binding.broadlinkthermostat.description = This is the binding for Broadlink devices.
+addon.broadlinkthermostat.name = Broadlink Binding
+addon.broadlinkthermostat.description = This is the binding for Broadlink devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/i18n/bsblan.properties b/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/i18n/bsblan.properties
index 4528e6b0e..336cc4b71 100644
--- a/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/i18n/bsblan.properties
+++ b/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/i18n/bsblan.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bsblan.name = BSB-LAN Binding
-binding.bsblan.description = Binding for BSB-LAN Gateway.
+addon.bsblan.name = BSB-LAN Binding
+addon.bsblan.description = Binding for BSB-LAN Gateway.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/i18n/bticinosmarther.properties b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/i18n/bticinosmarther.properties
index d2886b83c..b9a2b4361 100644
--- a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/i18n/bticinosmarther.properties
+++ b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/i18n/bticinosmarther.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.bticinosmarther.name = BTicino Smarther Binding
-binding.bticinosmarther.description = This is the binding for BTicino Smarther chronothermostat units
+addon.bticinosmarther.name = BTicino Smarther Binding
+addon.bticinosmarther.description = This is the binding for BTicino Smarther chronothermostat units
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/i18n/buienradar.properties b/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/i18n/buienradar.properties
index 6d9a2a892..f2c3b8be5 100644
--- a/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/i18n/buienradar.properties
+++ b/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/i18n/buienradar.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.buienradar.name = Buienradar Binding
-binding.buienradar.description = The Buienradar Binding periodically (5 minutes) retrieves results from the Buienradar API. For personal use only.
+addon.buienradar.name = Buienradar Binding
+addon.buienradar.description = The Buienradar Binding periodically (5 minutes) retrieves results from the Buienradar API. For personal use only.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/i18n/caddx.properties b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/i18n/caddx.properties
index 4c23f62ec..ac8b51abe 100644
--- a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/i18n/caddx.properties
+++ b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/i18n/caddx.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.caddx.name = Caddx Security Binding
-binding.caddx.description = Binding for Caddx security system with RS232 serial interface.
+addon.caddx.name = Caddx Security Binding
+addon.caddx.description = Binding for Caddx security system with RS232 serial interface.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/i18n/cbus.properties b/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/i18n/cbus.properties
index 5c88a4f71..0c39a7bc2 100644
--- a/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/i18n/cbus.properties
+++ b/bundles/org.openhab.binding.cbus/src/main/resources/OH-INF/i18n/cbus.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.cbus.name = C-Bus Binding
-binding.cbus.description = Clipsal C-Bus Binding
+addon.cbus.name = C-Bus Binding
+addon.cbus.description = Clipsal C-Bus Binding
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast.properties b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast.properties
index 70ad719bc..459eee545 100644
--- a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast.properties
+++ b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.chromecast.name = Chromecast Binding
-binding.chromecast.description = This is the binding for Google Chromecast devices.
+addon.chromecast.name = Chromecast Binding
+addon.chromecast.description = This is the binding for Google Chromecast devices.
 
-# binding config
+# add-on config
 
-binding.config.chromecast.callbackUrl.label = Callback URL
-binding.config.chromecast.callbackUrl.description = url to use for playing notification sounds, e.g. http://192.168.0.2:8080
+addon.config.chromecast.callbackUrl.label = Callback URL
+addon.config.chromecast.callbackUrl.description = url to use for playing notification sounds, e.g. http://192.168.0.2:8080
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_de.properties b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_de.properties
index 6955cbe26..620da9cde 100644
--- a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_de.properties
+++ b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_de.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.chromecast.name = Chromecast Binding
-binding.chromecast.description = Dieses Binding integriert Chromecast Geräte (z.B. Chromecast, Chromecast Audio oder Chromecast Ultra).
+addon.chromecast.name = Chromecast Binding
+addon.chromecast.description = Dieses Binding integriert Chromecast Geräte (z.B. Chromecast, Chromecast Audio oder Chromecast Ultra).
 
-# binding config
+# add-on config
 
-binding.config.chromecast.callbackUrl.label = Callback URL
-binding.config.chromecast.callbackUrl.description = URL zum Abspielen von Benachrichtigungen (z.B. http\://192.168.0.2\:8080).
+addon.config.chromecast.callbackUrl.label = Callback URL
+addon.config.chromecast.callbackUrl.description = URL zum Abspielen von Benachrichtigungen (z.B. http\://192.168.0.2\:8080).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_hu.properties b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_hu.properties
index 7d01004d5..c015df95c 100644
--- a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_hu.properties
+++ b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_hu.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.chromecast.name = Chromecast kötés
-binding.chromecast.description = Ez a kötés a Google Chromecast eszközöket kezeli.
+addon.chromecast.name = Chromecast kötés
+addon.chromecast.description = Ez a kötés a Google Chromecast eszközöket kezeli.
 
-# binding config
+# add-on config
 
-binding.config.chromecast.callbackUrl.label = Visszacsatolási URL
-binding.config.chromecast.callbackUrl.description = url a lejátszott értesítési hangokhoz, pl.\: http\://192.168.0.2\:8080
+addon.config.chromecast.callbackUrl.label = Visszacsatolási URL
+addon.config.chromecast.callbackUrl.description = url a lejátszott értesítési hangokhoz, pl.\: http\://192.168.0.2\:8080
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_it.properties b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_it.properties
index cf7f7e087..021573714 100644
--- a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_it.properties
+++ b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/i18n/chromecast_it.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.chromecast.name = Binding Chromecast
-binding.chromecast.description = Questo è il binding per i dispositivi Google Chromecast.
+addon.chromecast.name = Binding Chromecast
+addon.chromecast.description = Questo è il binding per i dispositivi Google Chromecast.
 
-# binding config
+# add-on config
 
-binding.config.chromecast.callbackUrl.label = URL di Callback
-binding.config.chromecast.callbackUrl.description = URL da usare per riprodurre suoni di notifica, ad esempio http\://192.168.0.2\:8080
+addon.config.chromecast.callbackUrl.label = URL di Callback
+addon.config.chromecast.callbackUrl.description = URL da usare per riprodurre suoni di notifica, ad esempio http\://192.168.0.2\:8080
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/i18n/cm11a.properties b/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/i18n/cm11a.properties
index a3f643197..c0ddb28e7 100644
--- a/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/i18n/cm11a.properties
+++ b/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/i18n/cm11a.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.cm11a.name = CM11A Binding
-binding.cm11a.description = This is the binding for the X10 Cm11a interface
+addon.cm11a.name = CM11A Binding
+addon.cm11a.description = This is the binding for the X10 Cm11a interface
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair.properties b/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair.properties
index 247c282a5..bdd739193 100644
--- a/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair.properties
+++ b/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.comfoair.name = ComfoAir Binding
-binding.comfoair.description = This is the binding for ComfoAir.
+addon.comfoair.name = ComfoAir Binding
+addon.comfoair.description = This is the binding for ComfoAir.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair_de.properties b/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair_de.properties
index 16b1c7598..f8c79d6f2 100644
--- a/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair_de.properties
+++ b/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/i18n/comfoair_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.comfoair.name = ComfoAir Binding
-binding.comfoair.description = Binding für ComfoAir Lüftungssysteme.
+addon.comfoair.name = ComfoAir Binding
+addon.comfoair.description = Binding für ComfoAir Lüftungssysteme.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/i18n/coolmasternet.properties b/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/i18n/coolmasternet.properties
index 2a41ad678..3ad68822a 100644
--- a/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/i18n/coolmasternet.properties
+++ b/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/i18n/coolmasternet.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.coolmasternet.name = CoolMasterNet Binding
-binding.coolmasternet.description = Binding for Cool Automation CoolMasterNet HVAC controllers.
+addon.coolmasternet.name = CoolMasterNet Binding
+addon.coolmasternet.description = Binding for Cool Automation CoolMasterNet HVAC controllers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats.properties b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats.properties
index 30d7bfeda..ace085288 100644
--- a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats.properties
+++ b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.coronastats.name = CoronaStats Binding
-binding.coronastats.description = This is a binding for accessing data from https://corona-stats.online/ website.
+addon.coronastats.name = CoronaStats Binding
+addon.coronastats.description = This is a binding for accessing data from https://corona-stats.online/ website.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats_hu.properties b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats_hu.properties
index 41015a93c..505f02413 100644
--- a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats_hu.properties
+++ b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/i18n/coronastats_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.coronastats.name = Coronavírus statisztika kötés
-binding.coronastats.description = Ez a kötés a https\://corona-stats.online/ weboldal adatait jeleníti meg.
+addon.coronastats.name = Coronavírus statisztika kötés
+addon.coronastats.description = Ez a kötés a https\://corona-stats.online/ weboldal adatait jeleníti meg.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/i18n/daikin.properties b/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/i18n/daikin.properties
index cab464409..368bda9c5 100644
--- a/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/i18n/daikin.properties
+++ b/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/i18n/daikin.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.daikin.name = Daikin Binding
-binding.daikin.description = This is the binding for Daikin A/C units.
+addon.daikin.name = Daikin Binding
+addon.daikin.description = This is the binding for Daikin A/C units.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/i18n/dali.properties b/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/i18n/dali.properties
index 99ce34dbc..4d39a9edf 100644
--- a/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/i18n/dali.properties
+++ b/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/i18n/dali.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dali.name = DALI Binding
-binding.dali.description = This is the binding for controlling lights using the Digital Addressable Lighting Interface (DALI).
+addon.dali.name = DALI Binding
+addon.dali.description = This is the binding for controlling lights using the Digital Addressable Lighting Interface (DALI).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit.properties b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit.properties
index 708caf99c..73a0e755c 100644
--- a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit.properties
+++ b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.danfossairunit.name = DanfossAirUnit Binding
-binding.danfossairunit.description = This is the binding for DanfossAirUnit.
+addon.danfossairunit.name = DanfossAirUnit Binding
+addon.danfossairunit.description = This is the binding for DanfossAirUnit.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit_da.properties b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit_da.properties
index c96eff3da..0050bd643 100644
--- a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit_da.properties
+++ b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/i18n/danfossairunit_da.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.danfossairunit.name = DanfossAirUnit Binding
-binding.danfossairunit.description = Dette er bindingen til DanfossAirUnit.
+addon.danfossairunit.name = DanfossAirUnit Binding
+addon.danfossairunit.description = Dette er bindingen til DanfossAirUnit.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dbquery/src/main/resources/OH-INF/i18n/dbquery.properties b/bundles/org.openhab.binding.dbquery/src/main/resources/OH-INF/i18n/dbquery.properties
index e87ec4d4b..a242491ea 100644
--- a/bundles/org.openhab.binding.dbquery/src/main/resources/OH-INF/i18n/dbquery.properties
+++ b/bundles/org.openhab.binding.dbquery/src/main/resources/OH-INF/i18n/dbquery.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dbquery.name = DBQuery Binding
-binding.dbquery.description = This is the binding for DBQuery that allows to execute native database queries and bind their results to items.
+addon.dbquery.name = DBQuery Binding
+addon.dbquery.description = This is the binding for DBQuery that allows to execute native database queries and bind their results to items.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties
index 8f9e71c2d..c2e8345ec 100644
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.deconz.name = deCONZ Binding
-binding.deconz.description = Allows to use the real-time channel of the deCONZ software for Zigbee sensors and switches. deCONZ is the accompanying software for the Raspbee and ConBee Zigbee dongles from Dresden Elektronik. Is meant to be used together with the HUE binding which makes the lights and plugs available.
+addon.deconz.name = deCONZ Binding
+addon.deconz.description = Allows to use the real-time channel of the deCONZ software for Zigbee sensors and switches. deCONZ is the accompanying software for the Raspbee and ConBee Zigbee dongles from Dresden Elektronik. Is meant to be used together with the HUE binding which makes the lights and plugs available.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties
index 3f1b31ee3..94cf1cfb6 100644
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.deconz.name = Dresden Elektronik deCONZ Binding
-binding.deconz.description = Unterstützt die Raspbee und Conbee Zigbee Dongles via deCONZ.
+addon.deconz.name = Dresden Elektronik deCONZ Binding
+addon.deconz.description = Unterstützt die Raspbee und Conbee Zigbee Dongles via deCONZ.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_it.properties b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_it.properties
index 20448fc22..a16826664 100644
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_it.properties
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.deconz.name = Binding deCONZ
-binding.deconz.description = Permette di utilizzare il canale in tempo reale del software deCONZ per sensori e interruttori Zigbee. deCONZ è il software di accompagnamento per le dongles Raspbee e ConBee Zigbee di Dresden Elektronik. È destinato ad essere utilizzato insieme al Binding HUE che rende disponibili le luci e le spine.
+addon.deconz.name = Binding deCONZ
+addon.deconz.description = Permette di utilizzare il canale in tempo reale del software deCONZ per sensori e interruttori Zigbee. deCONZ è il software di accompagnamento per le dongles Raspbee e ConBee Zigbee di Dresden Elektronik. È destinato ad essere utilizzato insieme al Binding HUE che rende disponibili le luci e le spine.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz.properties b/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz.properties
index 39a3a6642..9e68bf5f7 100644
--- a/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz.properties
+++ b/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.denonmarantz.name = DenonMarantz Binding
-binding.denonmarantz.description = Binding for controlling network enabled Denon and Marantz receivers.
+addon.denonmarantz.name = DenonMarantz Binding
+addon.denonmarantz.description = Binding for controlling network enabled Denon and Marantz receivers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz_de.properties b/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz_de.properties
index 97be4a7a4..295a492a6 100644
--- a/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz_de.properties
+++ b/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/i18n/denonmarantz_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.denonmarantz.name = DenonMarantz Bindung
-binding.denonmarantz.description = Binding für die Steuerung von Denon und Marantz Receivern mit Netzwerkunterstützung.
+addon.denonmarantz.name = DenonMarantz Bindung
+addon.denonmarantz.description = Binding für die Steuerung von Denon und Marantz Receivern mit Netzwerkunterstützung.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn.properties b/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn.properties
index b59ed0707..fc556bdde 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn.properties
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.deutschebahn.name = Deutsche Bahn Binding
-binding.deutschebahn.description = This binding provides timetable information for train stations of Deutsche Bahn.
+addon.deutschebahn.name = Deutsche Bahn Binding
+addon.deutschebahn.description = This binding provides timetable information for train stations of Deutsche Bahn.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn_de.properties b/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn_de.properties
index 1b6ad2a03..08691b8f2 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn_de.properties
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/i18n/deutschebahn_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.deutschebahn.name = DeutscheBahn
-binding.deutschebahn.description = Anbindung an die OpenData Schnittstelle der DeutschenBahn für den Abruf von Fahrplaninformationen.
+addon.deutschebahn.name = DeutscheBahn
+addon.deutschebahn.description = Anbindung an die OpenData Schnittstelle der DeutschenBahn für den Abruf von Fahrplaninformationen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/i18n/digiplex.properties b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/i18n/digiplex.properties
index ae9ea114e..d97ba4600 100644
--- a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/i18n/digiplex.properties
+++ b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/i18n/digiplex.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.digiplex.name = Digiplex/EVO Binding
-binding.digiplex.description = Binding for Digiplex/EVO alarm systems (utilizing PRT3 module)
+addon.digiplex.name = Digiplex/EVO Binding
+addon.digiplex.description = Binding for Digiplex/EVO alarm systems (utilizing PRT3 module)
 
 # thing types
 
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 84aa7c974..d530ceb5f 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,4 +1,4 @@
-# binding
+# 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.
 
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom_de.properties b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom_de.properties
index 7420d16ad..75ca45606 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom_de.properties
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/i18n/digitalstrom_de.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 binding_name = digitalSTROM Binding
 binding_desc = Das digitalSTROM Binding integriert das digitalSTROM-System und erlaubt angeschlossene Geräte zu steuern und Szenen aufzurufen.
 
diff --git a/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/i18n/dlinksmarthome.properties b/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/i18n/dlinksmarthome.properties
index 73e26f6c2..ca706f56c 100644
--- a/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/i18n/dlinksmarthome.properties
+++ b/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/i18n/dlinksmarthome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dlinksmarthome.name = D-Link Smart Home Binding
-binding.dlinksmarthome.description = This is the binding for D-Link Smart Home devices
+addon.dlinksmarthome.name = D-Link Smart Home Binding
+addon.dlinksmarthome.description = This is the binding for D-Link Smart Home devices
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/i18n/dmx.properties b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/i18n/dmx.properties
index 5ac05cd55..e373931cb 100644
--- a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/i18n/dmx.properties
+++ b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/i18n/dmx.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dmx.name = DMX Binding
-binding.dmx.description = This is the binding for DMX.
+addon.dmx.name = DMX Binding
+addon.dmx.description = This is the binding for DMX.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss.properties b/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss.properties
index 88572ea34..739b73bf4 100644
--- a/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss.properties
+++ b/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dominoswiss.name = Dominoswiss Binding
-binding.dominoswiss.description = The Dominoswiss Binding interacts with the Dominoswiss eGate G1 Gateway to control blinds
+addon.dominoswiss.name = Dominoswiss Binding
+addon.dominoswiss.description = The Dominoswiss Binding interacts with the Dominoswiss eGate G1 Gateway to control blinds
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss_de_DE.properties b/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss_de_DE.properties
index 73b2a40d9..3f01d4f9f 100644
--- a/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss_de_DE.properties
+++ b/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/i18n/dominoswiss_de_DE.properties
@@ -1,3 +1,3 @@
-# binding
-binding.dominoswiss.name = Dominoswiss
-binding.dominoswiss.description = Dominoswiss Binding zur Kontrolle der Jalousien  
+# add-on
+addon.dominoswiss.name = Dominoswiss
+addon.dominoswiss.description = Dominoswiss Binding zur Kontrolle der Jalousien  
diff --git a/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/i18n/doorbird.properties b/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/i18n/doorbird.properties
index 9645be95d..cbeb4adda 100644
--- a/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/i18n/doorbird.properties
+++ b/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/i18n/doorbird.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.doorbird.name = Doorbird Binding
-binding.doorbird.description = This is the binding for Doorbird video doorbells.
+addon.doorbird.name = Doorbird Binding
+addon.doorbird.description = This is the binding for Doorbird video doorbells.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties
index 7b513230c..ed033a398 100644
--- a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties
+++ b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.draytonwiser.name = DraytonWiser Binding
-binding.draytonwiser.description = This is the binding for Drayton Wiser smart heating system.
+addon.draytonwiser.name = DraytonWiser Binding
+addon.draytonwiser.description = This is the binding for Drayton Wiser smart heating system.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/i18n/dscalarm.properties b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/i18n/dscalarm.properties
index f86f69f75..e7b014bee 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/i18n/dscalarm.properties
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/i18n/dscalarm.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dscalarm.name = DSCAlarm Binding
-binding.dscalarm.description = The DSCAlarm binding interfaces with a DSC PowerSeries Alarm System through the EyezOn Envisalink 3/2DS interface or the DSC IT-100 RS-232 interface.
+addon.dscalarm.name = DSCAlarm Binding
+addon.dscalarm.description = The DSCAlarm binding interfaces with a DSC PowerSeries Alarm System through the EyezOn Envisalink 3/2DS interface or the DSC IT-100 RS-232 interface.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr.properties b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr.properties
index 927f0b336..56d4c4da5 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr.properties
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dsmr.name = DSMR Binding
-binding.dsmr.description = This binding integrates Dutch, Belgium, Luxembourg and Austrian Smart Meters
+addon.dsmr.name = DSMR Binding
+addon.dsmr.description = This binding integrates Dutch, Belgium, Luxembourg and Austrian Smart Meters
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr_nl.properties b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr_nl.properties
index fa6f6c8ef..ea6ed41a7 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr_nl.properties
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/i18n/dsmr_nl.properties
@@ -1,6 +1,6 @@
-# binding
-binding.dsmr.name = Slimme Meter Binding
-binding.dsmr.description = Dit is de binding voor de Nederlandse Slimme Meter (DSMR).
+# add-on
+addon.dsmr.name = Slimme Meter Binding
+addon.dsmr.description = Dit is de binding voor de Nederlandse Slimme Meter (DSMR).
 
 # meter kind names
 meterKind.invalid.label = Onbekende Meter
diff --git a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug.properties b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug.properties
index f4e41c85f..70c2771f7 100644
--- a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug.properties
+++ b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dwdpollenflug.name = DWD Pollenflug Binding
-binding.dwdpollenflug.description = This is the binding for DWD Pollenflug.
+addon.dwdpollenflug.name = DWD Pollenflug Binding
+addon.dwdpollenflug.description = This is the binding for DWD Pollenflug.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug_de.properties b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug_de.properties
index e942fab96..3feee3946 100644
--- a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug_de.properties
+++ b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/i18n/dwdpollenflug_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dwdpollenflug.name = DWD Pollenflugindex
-binding.dwdpollenflug.description = Binding um den Pollenflugindex des deutschen Wetterdienstes anzuzeigen
+addon.dwdpollenflug.name = DWD Pollenflugindex
+addon.dwdpollenflug.description = Binding um den Pollenflugindex des deutschen Wetterdienstes anzuzeigen
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter.properties b/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter.properties
index 955db3e14..1b1c129a4 100644
--- a/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter.properties
+++ b/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dwdunwetter.name = DWD Unwetter Binding
-binding.dwdunwetter.description = This is the binding for DWD Unwetter.
+addon.dwdunwetter.name = DWD Unwetter Binding
+addon.dwdunwetter.description = This is the binding for DWD Unwetter.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter_de.properties b/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter_de.properties
index bde0f6507..48e91fb73 100644
--- a/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter_de.properties
+++ b/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/i18n/dwdunwetter_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.dwdunwetter.name = DWD Unwetter Binding
-binding.dwdunwetter.description = Das DWD Unwetter Binding ermöglicht es über die API des DWD aktuelle Unwetterwarnungen abzurufen.
+addon.dwdunwetter.name = DWD Unwetter Binding
+addon.dwdunwetter.description = Das DWD Unwetter Binding ermöglicht es über die API des DWD aktuelle Unwetterwarnungen abzurufen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/i18n/easee.properties b/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/i18n/easee.properties
index 198cefd28..4e4b7305f 100644
--- a/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/i18n/easee.properties
+++ b/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/i18n/easee.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.easee.name = Easee Binding
-binding.easee.description = This is the binding for Easee Wallboxes.
+addon.easee.name = Easee Binding
+addon.easee.description = This is the binding for Easee Wallboxes.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.echonetlite/src/main/resources/OH-INF/i18n/echonetlite.properties b/bundles/org.openhab.binding.echonetlite/src/main/resources/OH-INF/i18n/echonetlite.properties
index c1f4762b7..c8f74e468 100644
--- a/bundles/org.openhab.binding.echonetlite/src/main/resources/OH-INF/i18n/echonetlite.properties
+++ b/bundles/org.openhab.binding.echonetlite/src/main/resources/OH-INF/i18n/echonetlite.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.echonetlite.name = EchonetLite Binding
-binding.echonetlite.description = This is the binding for EchonetLite.
+addon.echonetlite.name = EchonetLite Binding
+addon.echonetlite.description = This is the binding for EchonetLite.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/i18n/ecobee.properties b/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/i18n/ecobee.properties
index 8e311d977..a3d8a2d78 100644
--- a/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/i18n/ecobee.properties
+++ b/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/i18n/ecobee.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ecobee.name = Ecobee Binding
-binding.ecobee.description = This is the binding for Ecobee smart thermostats.
+addon.ecobee.name = Ecobee Binding
+addon.ecobee.description = This is the binding for Ecobee smart thermostats.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties
index 24d3c3b96..1e4f2286e 100644
--- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties
+++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ecotouch.name = EcoTouch Binding
-binding.ecotouch.description = This is the binding for a Waterkotte EcoTouch heat pump.
+addon.ecotouch.name = EcoTouch Binding
+addon.ecotouch.description = This is the binding for a Waterkotte EcoTouch heat pump.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch_de.properties b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch_de.properties
index 83394ceff..6e262e0c4 100644
--- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch_de.properties
+++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ecotouch.name = EcoTouch Binding
-binding.ecotouch.description = Überwachung und Steuerung von Waterkotte EcoTouch Wärmepumpen
+addon.ecotouch.name = EcoTouch Binding
+addon.ecotouch.description = Überwachung und Steuerung von Waterkotte EcoTouch Wärmepumpen
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties
index 1fd5645d2..690a28601 100644
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ecowatt.name = Ecowatt Binding
-binding.ecowatt.description = This binding uses the Ecowatt API to expose clear signals to adopt the right gestures and to ensure a good supply of electricity for all in Frances.
+addon.ecowatt.name = Ecowatt Binding
+addon.ecowatt.description = This binding uses the Ecowatt API to expose clear signals to adopt the right gestures and to ensure a good supply of electricity for all in Frances.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties
index d0a454c95..53919262c 100644
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ecowatt.name = Extension Écowatt
-binding.ecowatt.description = Cette extension utilise l'API Ecowatt pour afficher des signaux clairs afin d'adopter les bons gestes et assurer un bon approvisionnement en électricité pour tous en France.
+addon.ecowatt.name = Extension Écowatt
+addon.ecowatt.description = Cette extension utilise l'API Ecowatt pour afficher des signaux clairs afin d'adopter les bons gestes et assurer un bon approvisionnement en électricité pour tous en France.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_it.properties b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_it.properties
index e60503050..ddad68093 100644
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_it.properties
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ecowatt.name = Binding Ecowatt
-binding.ecowatt.description = Questo gestore utilizza le API Ecowatt per rivelare dei segnali chiari in modo da poter adottare dei comportamenti corretti e garantire una buona fornitura di elettricità per tutti in Francia.
+addon.ecowatt.name = Binding Ecowatt
+addon.ecowatt.description = Questo gestore utilizza le API Ecowatt per rivelare dei segnali chiari in modo da poter adottare dei comportamenti corretti e garantire una buona fornitura di elettricità per tutti in Francia.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey.properties b/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey.properties
index ee012eb4e..6e042dfc3 100644
--- a/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey.properties
+++ b/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey.properties
@@ -1,6 +1,6 @@
-# binding
-binding.ekey.name = Ekey Binding
-binding.ekey.description = This Binding integrates Ekey CV-LAN UDP adapters
+# add-on
+addon.ekey.name = Ekey Binding
+addon.ekey.description = This Binding integrates Ekey CV-LAN UDP adapters
 
 # thing types
 thing-type.ekey.label = CV-LAN
diff --git a/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey_de.properties b/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey_de.properties
index 0e3c029c1..588dc015b 100644
--- a/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey_de.properties
+++ b/bundles/org.openhab.binding.ekey/src/main/resources/OH-INF/i18n/ekey_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.ekey.name = Ekey Binding
-binding.ekey.description = Dieses Binding integriert die ekey CV-LAN converter UDP.
+# add-on
+addon.ekey.name = Ekey Binding
+addon.ekey.description = Dieses Binding integriert die ekey CV-LAN converter UDP.
 
 # thing types
 thing-type.ekey.label = CV-LAN
diff --git a/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair.properties b/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair.properties
index fca3e6642..0286bee26 100644
--- a/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair.properties
+++ b/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.electroluxair.name = ElectroluxAir Binding
-binding.electroluxair.description = This is the binding for Electrolux Pure A9 Air Purifier.
+addon.electroluxair.name = ElectroluxAir Binding
+addon.electroluxair.description = This is the binding for Electrolux Pure A9 Air Purifier.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_fr.properties b/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_fr.properties
index d21294139..0746e8e2e 100644
--- a/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_fr.properties
+++ b/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.electroluxair.name = Extension ElectroluxAir
-binding.electroluxair.description = Il s'agit de l'extension pour le purificateur d'air Electrolux Pure A9.
+addon.electroluxair.name = Extension ElectroluxAir
+addon.electroluxair.description = Il s'agit de l'extension pour le purificateur d'air Electrolux Pure A9.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_it.properties b/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_it.properties
index d769eb2e5..ef524611b 100644
--- a/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_it.properties
+++ b/bundles/org.openhab.binding.electroluxair/src/main/resources/OH-INF/i18n/electroluxair_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.electroluxair.name = Binding ElectroluxAir
-binding.electroluxair.description = Questo è il binding per il Purificatore Electrolux Pure A9 Air.
+addon.electroluxair.name = Binding ElectroluxAir
+addon.electroluxair.description = Questo è il binding per il Purificatore Electrolux Pure A9 Air.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.elerotransmitterstick/src/main/resources/OH-INF/i18n/elerotransmitterstick.properties b/bundles/org.openhab.binding.elerotransmitterstick/src/main/resources/OH-INF/i18n/elerotransmitterstick.properties
index a7b338cb7..282f87ae9 100644
--- a/bundles/org.openhab.binding.elerotransmitterstick/src/main/resources/OH-INF/i18n/elerotransmitterstick.properties
+++ b/bundles/org.openhab.binding.elerotransmitterstick/src/main/resources/OH-INF/i18n/elerotransmitterstick.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.elerotransmitterstick.name = Elero Transmitter Stick Binding
-binding.elerotransmitterstick.description = This is the binding for Elero Transmitter Sticks.
+addon.elerotransmitterstick.name = Elero Transmitter Stick Binding
+addon.elerotransmitterstick.description = This is the binding for Elero Transmitter Sticks.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects.properties b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects.properties
index 56de5165b..8b47e3245 100644
--- a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects.properties
+++ b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.elroconnects.name = ELRO Connects Binding
-binding.elroconnects.description = This is the binding for the ELRO Connects smart home system
+addon.elroconnects.name = ELRO Connects Binding
+addon.elroconnects.description = This is the binding for the ELRO Connects smart home system
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_fr.properties b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_fr.properties
index f173bba19..52e850947 100644
--- a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_fr.properties
+++ b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.elroconnects.name = Extension ELRO Connects
-binding.elroconnects.description = Il s'agit de l'extension pour le système domotique ELRO Connects
+addon.elroconnects.name = Extension ELRO Connects
+addon.elroconnects.description = Il s'agit de l'extension pour le système domotique ELRO Connects
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_nl.properties b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_nl.properties
index 3bf2ad635..856d3ef0a 100644
--- a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_nl.properties
+++ b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/i18n/elroconnects_nl.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.elroconnects.name = ELRO Connects Binding
-binding.elroconnects.description = Dit is de binding voor het ELRO Connects smart home systeem
+addon.elroconnects.name = ELRO Connects Binding
+addon.elroconnects.description = Dit is de binding voor het ELRO Connects smart home systeem
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/i18n/energenie.properties b/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/i18n/energenie.properties
index 38fd46859..f2806c74c 100644
--- a/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/i18n/energenie.properties
+++ b/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/i18n/energenie.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.energenie.name = Energenie Binding
-binding.energenie.description = This is the binding for Energenie.
+addon.energenie.name = Energenie Binding
+addon.energenie.description = This is the binding for Energenie.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2.properties b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2.properties
index 4dc6c51c6..6eca3e526 100644
--- a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2.properties
+++ b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2.properties
@@ -1,6 +1,6 @@
-# binding
-binding.enigma2.name = Enigma2 Binding
-binding.enigma2.description = This is the binding for Enigma2
+# add-on
+addon.enigma2.name = Enigma2 Binding
+addon.enigma2.description = This is the binding for Enigma2
 
 # thing types
 thing-type.enigma2.device.label = Enigma2
diff --git a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_hu.properties b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_hu.properties
index d699d31b4..83b9b3f6c 100644
--- a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_hu.properties
+++ b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_hu.properties
@@ -1,6 +1,6 @@
-# binding
-binding.enigma2.name = Enigma2 kötés
-binding.enigma2.description = Ez a kötés az Enigma2-höz való
+# add-on
+addon.enigma2.name = Enigma2 kötés
+addon.enigma2.description = Ez a kötés az Enigma2-höz való
 
 # thing types
 thing-type.enigma2.device.label = Enigma2
diff --git a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_no.properties b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_no.properties
index 98a361725..7f6fb2acc 100644
--- a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_no.properties
+++ b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/i18n/enigma2_no.properties
@@ -1,6 +1,6 @@
-# binding
-binding.enigma2.name = Enigma2 Binding
-binding.enigma2.description = Dette er bindingen for Enigma2
+# add-on
+addon.enigma2.name = Enigma2 Binding
+addon.enigma2.description = Dette er bindingen for Enigma2
 
 # thing types
 thing-type.enigma2.device.label = Enigma2
diff --git a/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector.properties b/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector.properties
index e91d91557..9a4001feb 100644
--- a/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector.properties
+++ b/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.epsonprojector.name = Epson Projector Binding
-binding.epsonprojector.description = This binding is compatible with Epson projectors which support the ESC/VP21 protocol
+addon.epsonprojector.name = Epson Projector Binding
+addon.epsonprojector.description = This binding is compatible with Epson projectors which support the ESC/VP21 protocol
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector_de.properties b/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector_de.properties
index 90a1e21ec..ac2b15226 100644
--- a/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector_de.properties
+++ b/bundles/org.openhab.binding.epsonprojector/src/main/resources/OH-INF/i18n/epsonprojector_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.epsonprojector.name = Epson Projektor Binding
-binding.epsonprojector.description = Dieses Bindung ist kompatibel mit Epson Projektoren, die das ESC/VP21 Protokoll unterstützen
+addon.epsonprojector.name = Epson Projektor Binding
+addon.epsonprojector.description = Dieses Bindung ist kompatibel mit Epson Projektoren, die das ESC/VP21 Protokoll unterstützen
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/i18n/etherrain.properties b/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/i18n/etherrain.properties
index 28bc6612e..6e389784e 100644
--- a/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/i18n/etherrain.properties
+++ b/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/i18n/etherrain.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.etherrain.name = EtherRain Binding
-binding.etherrain.description = This is the binding for EtherRain
+addon.etherrain.name = EtherRain Binding
+addon.etherrain.description = This is the binding for EtherRain
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc.properties b/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc.properties
index e63da7c32..9a48b05a8 100644
--- a/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc.properties
+++ b/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.evcc.name = evcc Binding
-binding.evcc.description = This is the binding for evcc (electric vehicle charging control) - soak up the sun.
+addon.evcc.name = evcc Binding
+addon.evcc.description = This is the binding for evcc (electric vehicle charging control) - soak up the sun.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc_de.properties b/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc_de.properties
index 7a264145a..7623eb992 100644
--- a/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc_de.properties
+++ b/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/i18n/evcc_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.evcc.name = evcc Binding
-binding.evcc.description = Dies ist das Binding für evcc (electric vehicle charging control) - Sonne tanken.
+addon.evcc.name = evcc Binding
+addon.evcc.description = Dies ist das Binding für evcc (electric vehicle charging control) - Sonne tanken.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome.properties b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome.properties
index 5146ccc6c..82eb183a3 100644
--- a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome.properties
+++ b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.evohome.name = evohome Binding
-binding.evohome.description = The evohome binding controls the Honeywell evohome system.
+addon.evohome.name = evohome Binding
+addon.evohome.description = The evohome binding controls the Honeywell evohome system.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_hu.properties b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_hu.properties
index 1f9627e5e..c21dcff4f 100644
--- a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_hu.properties
+++ b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.evohome.name = evohome kötés
-binding.evohome.description = Az evohome kötés vezérli a HoneyWell evohome rendszert.
+addon.evohome.name = evohome kötés
+addon.evohome.description = Az evohome kötés vezérli a HoneyWell evohome rendszert.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_nl.properties b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_nl.properties
index 261e1ec9a..0c2d73d39 100644
--- a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_nl.properties
+++ b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/i18n/evohome_nl.properties
@@ -1,6 +1,6 @@
-# binding
-binding.evohome.name = Evohome binding
-binding.evohome.description = De evohome binding maakt het mogelijk om het Honeywell evohome systeem te besturen.
+# add-on
+addon.evohome.name = Evohome binding
+addon.evohome.description = De evohome binding maakt het mogelijk om het Honeywell evohome systeem te besturen.
 
 # thing types
 thing-type.evohome.display.label = Scherm
diff --git a/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec.properties b/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec.properties
index a9d54a120..052d3a374 100644
--- a/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec.properties
+++ b/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.exec.name = Exec Binding
-binding.exec.description = This is the binding to execute arbitrary shell commands
+addon.exec.name = Exec Binding
+addon.exec.description = This is the binding to execute arbitrary shell commands
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_de.properties b/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_de.properties
index 7f6441326..cf874e249 100644
--- a/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_de.properties
+++ b/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.exec.name = Exec Binding
-binding.exec.description = Binding zur Ausführung von Befehlen und zur Verarbeitung des Rückgabewerts
+addon.exec.name = Exec Binding
+addon.exec.description = Binding zur Ausführung von Befehlen und zur Verarbeitung des Rückgabewerts
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_fr.properties b/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_fr.properties
index 76ca0250e..d74f1cbe3 100644
--- a/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_fr.properties
+++ b/bundles/org.openhab.binding.exec/src/main/resources/OH-INF/i18n/exec_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.exec.name = Extension Exec
-binding.exec.description = Extension permettant d'exécuter des commandes shell.
+addon.exec.name = Extension Exec
+addon.exec.description = Extension permettant d'exécuter des commandes shell.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed.properties b/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed.properties
index b8cfef11b..9c42ab5f9 100644
--- a/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed.properties
+++ b/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.feed.name = Feed Binding
-binding.feed.description = The Feed Binding downloads Feed data from URL, displays information about the feed (number of Entries, last published date, author, feed title and description, last entry) and tracks for changes in the Feed at intervals.
+addon.feed.name = Feed Binding
+addon.feed.description = The Feed Binding downloads Feed data from URL, displays information about the feed (number of Entries, last published date, author, feed title and description, last entry) and tracks for changes in the Feed at intervals.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed_de.properties b/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed_de.properties
index a5881ed7b..85a177cec 100644
--- a/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed_de.properties
+++ b/bundles/org.openhab.binding.feed/src/main/resources/OH-INF/i18n/feed_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.feed.name = Feed Binding
-binding.feed.description = Das Feed Binding ermöglicht es einen RSS-Feed einer Webseite zu abonnieren. Durch ein solches Abonnement wird man automatisch informiert, wenn die Inhalte dieser Webseite aktualisiert werden.
+addon.feed.name = Feed Binding
+addon.feed.description = Das Feed Binding ermöglicht es einen RSS-Feed einer Webseite zu abonnieren. Durch ein solches Abonnement wird man automatisch informiert, wenn die Inhalte dieser Webseite aktualisiert werden.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/i18n/feican.properties b/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/i18n/feican.properties
index de966a329..feb438064 100644
--- a/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/i18n/feican.properties
+++ b/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/i18n/feican.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.feican.name = Feican Binding
-binding.feican.description = This is the binding for Feican light bulbs.
+addon.feican.name = Feican Binding
+addon.feican.description = This is the binding for Feican light bulbs.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation.properties b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation.properties
index 9ec4c045b..63424679a 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation.properties
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.fineoffsetweatherstation.name = Fine Offset Weather Station
-binding.fineoffsetweatherstation.description = A binding for the Weather Stations Manufactured by Fine Offset
+addon.fineoffsetweatherstation.name = Fine Offset Weather Station
+addon.fineoffsetweatherstation.description = A binding for the Weather Stations Manufactured by Fine Offset
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_de.properties b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_de.properties
index 528fddbf6..f8fa69efc 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_de.properties
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.fineoffsetweatherstation.name = Fine Offset Wetterstation
-binding.fineoffsetweatherstation.description = Eine Anbindung für die von Fine Offset hergestellten Wetterstationen
+addon.fineoffsetweatherstation.name = Fine Offset Wetterstation
+addon.fineoffsetweatherstation.description = Eine Anbindung für die von Fine Offset hergestellten Wetterstationen
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_it.properties b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_it.properties
index ed0bd0fef..9dd71cae7 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_it.properties
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/i18n/fineoffsetweatherstation_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.fineoffsetweatherstation.name = Stazione Meteo Fine Offset
-binding.fineoffsetweatherstation.description = Un Binding per le stazioni meteo prodotte da Fine Offset
+addon.fineoffsetweatherstation.name = Stazione Meteo Fine Offset
+addon.fineoffsetweatherstation.description = Un Binding per le stazioni meteo prodotte da Fine Offset
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton.properties b/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton.properties
index d88d188f7..71d1681ef 100644
--- a/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton.properties
+++ b/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.flicbutton.name = FlicButton Binding
-binding.flicbutton.description = This is the binding for Flic buttons by Shortcut Labs.
+addon.flicbutton.name = FlicButton Binding
+addon.flicbutton.description = This is the binding for Flic buttons by Shortcut Labs.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton_it.properties b/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton_it.properties
index f88352ab2..f7e003f91 100644
--- a/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton_it.properties
+++ b/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/i18n/flicbutton_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.flicbutton.name = Binding FlicButton
-binding.flicbutton.description = Questo è il binding per i pulsanti Flic di Shortcut Labs.
+addon.flicbutton.name = Binding FlicButton
+addon.flicbutton.description = Questo è il binding per i pulsanti Flic di Shortcut Labs.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/i18n/fmiweather.properties b/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/i18n/fmiweather.properties
index 84564200b..bcc28a52c 100644
--- a/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/i18n/fmiweather.properties
+++ b/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/i18n/fmiweather.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.fmiweather.name = FMI Weather Binding
-binding.fmiweather.description = This is the binding for Finnish Meteorological Institute (FMI) Weather
+addon.fmiweather.name = FMI Weather Binding
+addon.fmiweather.description = This is the binding for Finnish Meteorological Institute (FMI) Weather
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.folderwatcher/src/main/resources/OH-INF/i18n/folderwatcher.properties b/bundles/org.openhab.binding.folderwatcher/src/main/resources/OH-INF/i18n/folderwatcher.properties
index 68501d5ec..5bcc4a0f4 100644
--- a/bundles/org.openhab.binding.folderwatcher/src/main/resources/OH-INF/i18n/folderwatcher.properties
+++ b/bundles/org.openhab.binding.folderwatcher/src/main/resources/OH-INF/i18n/folderwatcher.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.folderwatcher.name = FolderWatcher Binding
-binding.folderwatcher.description = This binding will monitor specified location for new files and trigger event channel with new file names.
+addon.folderwatcher.name = FolderWatcher Binding
+addon.folderwatcher.description = This binding will monitor specified location for new files and trigger event channel with new file names.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/i18n/folding.properties b/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/i18n/folding.properties
index 8152b75e0..138f6bfcd 100644
--- a/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/i18n/folding.properties
+++ b/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/i18n/folding.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.folding.name = Folding@home
-binding.folding.description = Control Folding@home clients on computers.
+addon.folding.name = Folding@home
+addon.folding.description = Control Folding@home clients on computers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/i18n/foobot.properties b/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/i18n/foobot.properties
index 23bf752fc..44c6091bc 100644
--- a/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/i18n/foobot.properties
+++ b/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/i18n/foobot.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.foobot.name = Foobot
-binding.foobot.description = Foobot binding allow users to connect to their foobots in home or office and get real-time updates on the Air Quality.
+addon.foobot.name = Foobot
+addon.foobot.description = Foobot binding allow users to connect to their foobots in home or office and get real-time updates on the Air Quality.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/i18n/freebox.properties b/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/i18n/freebox.properties
index 257d17d13..3b8332d8c 100644
--- a/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/i18n/freebox.properties
+++ b/bundles/org.openhab.binding.freebox/src/main/resources/OH-INF/i18n/freebox.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.freebox.name = Freebox Binding
-binding.freebox.description = The Freebox binding requests your Freebox Server for various operational informations.
+addon.freebox.name = Freebox Binding
+addon.freebox.description = The Freebox binding requests your Freebox Server for various operational informations.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/i18n/fronius.properties b/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/i18n/fronius.properties
index efa2d1dec..30f6ae966 100644
--- a/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/i18n/fronius.properties
+++ b/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/i18n/fronius.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.fronius.name = Fronius Binding
-binding.fronius.description = Binding for Fronius inverters.
+addon.fronius.name = Fronius Binding
+addon.fronius.description = Binding for Fronius inverters.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio.properties b/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio.properties
index 3a3a64e93..1edf93feb 100644
--- a/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio.properties
+++ b/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.fsinternetradio.name = FSInternetRadio Binding
-binding.fsinternetradio.description = This is the binding for internet radios based on the Frontier Silicon chipset.
+addon.fsinternetradio.name = FSInternetRadio Binding
+addon.fsinternetradio.description = This is the binding for internet radios based on the Frontier Silicon chipset.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio_de.properties b/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio_de.properties
index 90ff01c4a..eeb7ef7a3 100644
--- a/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio_de.properties
+++ b/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/i18n/fsinternetradio_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.fsinternetradio.name = FSInternetRadio Binding
-binding.fsinternetradio.description = Dieses Binding unterstützt Internet-Radios mit Frontier Silicon Chipsatz.
+addon.fsinternetradio.name = FSInternetRadio Binding
+addon.fsinternetradio.description = Dieses Binding unterstützt Internet-Radios mit Frontier Silicon Chipsatz.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ftpupload/src/main/resources/OH-INF/i18n/ftpupload.properties b/bundles/org.openhab.binding.ftpupload/src/main/resources/OH-INF/i18n/ftpupload.properties
index 2544d19ea..52c8078f6 100644
--- a/bundles/org.openhab.binding.ftpupload/src/main/resources/OH-INF/i18n/ftpupload.properties
+++ b/bundles/org.openhab.binding.ftpupload/src/main/resources/OH-INF/i18n/ftpupload.properties
@@ -1,16 +1,16 @@
-# binding
+# add-on
 
-binding.ftpupload.name = FTP Upload Binding
-binding.ftpupload.description = This binding is for receiving files via FTP.
+addon.ftpupload.name = FTP Upload Binding
+addon.ftpupload.description = This binding is for receiving files via FTP.
 
-# binding config
+# add-on config
 
-binding.config.ftpupload.idleTimeout.label = Idle Timeout
-binding.config.ftpupload.idleTimeout.description = The number of seconds before an inactive client is disconnected. If this value is set to 0, the idle time is disabled.
-binding.config.ftpupload.passivePorts.label = Passive Port Range
-binding.config.ftpupload.passivePorts.description = A string of passive ports, can contain a single port (as an integer), multiple ports seperated by commas (e.g. 123,124,125) or ranges of ports, including open ended ranges (e.g. 123-125, 30000-, -1023). Combinations for single ports and ranges is also supported. Empty (default) allows all ports as passive ports.
-binding.config.ftpupload.port.label = TCP Port
-binding.config.ftpupload.port.description = TCP port of the FTP server
+addon.config.ftpupload.idleTimeout.label = Idle Timeout
+addon.config.ftpupload.idleTimeout.description = The number of seconds before an inactive client is disconnected. If this value is set to 0, the idle time is disabled.
+addon.config.ftpupload.passivePorts.label = Passive Port Range
+addon.config.ftpupload.passivePorts.description = A string of passive ports, can contain a single port (as an integer), multiple ports seperated by commas (e.g. 123,124,125) or ranges of ports, including open ended ranges (e.g. 123-125, 30000-, -1023). Combinations for single ports and ranges is also supported. Empty (default) allows all ports as passive ports.
+addon.config.ftpupload.port.label = TCP Port
+addon.config.ftpupload.port.description = TCP port of the FTP server
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena.properties b/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena.properties
index 2d9505086..8a8929713 100644
--- a/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena.properties
+++ b/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gardena.name = Gardena Smart System Binding
-binding.gardena.description = This is the binding for Gardena smart system.
+addon.gardena.name = Gardena Smart System Binding
+addon.gardena.description = This is the binding for Gardena smart system.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena_de.properties b/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena_de.properties
index c29bd03f6..eba33111b 100644
--- a/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena_de.properties
+++ b/bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gardena.name = Gardena Smart System Bindung
-binding.gardena.description = Das ist das Binding für Gardena Smart System.
+addon.gardena.name = Gardena Smart System Bindung
+addon.gardena.description = Das ist das Binding für Gardena Smart System.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce.properties b/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce.properties
index 72cfb2085..134810d1a 100644
--- a/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce.properties
+++ b/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gce.name = GCE Electronics Binding
-binding.gce.description = Provides access to IPX800 PLC build by GCE.
+addon.gce.name = GCE Electronics Binding
+addon.gce.description = Provides access to IPX800 PLC build by GCE.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce_fr.properties b/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce_fr.properties
index 42645d762..164b07ab0 100644
--- a/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce_fr.properties
+++ b/bundles/org.openhab.binding.gce/src/main/resources/OH-INF/i18n/gce_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gce.name = Extension GCE Electronics
-binding.gce.description = Cette extension permet de communiquer avec l'IPX800 produite par GCE.
+addon.gce.name = Extension GCE Electronics
+addon.gce.description = Cette extension permet de communiquer avec l'IPX800 produite par GCE.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.generacmobilelink/src/main/resources/OH-INF/i18n/generacmobilelink.properties b/bundles/org.openhab.binding.generacmobilelink/src/main/resources/OH-INF/i18n/generacmobilelink.properties
index 8bb93ed20..8544f3557 100644
--- a/bundles/org.openhab.binding.generacmobilelink/src/main/resources/OH-INF/i18n/generacmobilelink.properties
+++ b/bundles/org.openhab.binding.generacmobilelink/src/main/resources/OH-INF/i18n/generacmobilelink.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.generacmobilelink.name = GeneracMobileLink Binding
-binding.generacmobilelink.description = This binding monitors Generac manufactured generators through the MobileLink cloud service.
+addon.generacmobilelink.name = GeneracMobileLink Binding
+addon.generacmobilelink.description = This binding monitors Generac manufactured generators through the MobileLink cloud service.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.globalcache/src/main/resources/OH-INF/i18n/globalcache.properties b/bundles/org.openhab.binding.globalcache/src/main/resources/OH-INF/i18n/globalcache.properties
index 3f31c3956..30fd2d63e 100644
--- a/bundles/org.openhab.binding.globalcache/src/main/resources/OH-INF/i18n/globalcache.properties
+++ b/bundles/org.openhab.binding.globalcache/src/main/resources/OH-INF/i18n/globalcache.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.globalcache.name = GlobalCache Binding
-binding.globalcache.description = Binding for GlobalCache iTach and GC-100 devices supporting infrared, serial, and contact closure interfaces.
+addon.globalcache.name = GlobalCache Binding
+addon.globalcache.description = Binding for GlobalCache iTach and GC-100 devices supporting infrared, serial, and contact closure interfaces.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties
index ff6ce0f53..992fcfe4e 100644
--- a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties
+++ b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.goecharger.name = Go-eCharger Binding
-binding.goecharger.description = This is the binding for Go-eCharger.
+addon.goecharger.name = Go-eCharger Binding
+addon.goecharger.description = This is the binding for Go-eCharger.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger_it.properties b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger_it.properties
index 2c62fba9f..5b9322b4e 100644
--- a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger_it.properties
+++ b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.goecharger.name = Binding Go-eCharger
-binding.goecharger.description = Questo è il binding per Go-eCharger.
+addon.goecharger.name = Binding Go-eCharger
+addon.goecharger.description = Questo è il binding per Go-eCharger.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio.properties b/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio.properties
index 6d8dc3ceb..564f6dc4f 100644
--- a/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio.properties
+++ b/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gpio.name = GPIO Binding
-binding.gpio.description = Adds GPIO support to openHAB.
+addon.gpio.name = GPIO Binding
+addon.gpio.description = Adds GPIO support to openHAB.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio_de.properties b/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio_de.properties
index 67edd8047..40302929b 100644
--- a/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio_de.properties
+++ b/bundles/org.openhab.binding.gpio/src/main/resources/OH-INF/i18n/gpio_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gpio.name = GPIO Binding
-binding.gpio.description = Fügt GPIO Unterstützung zu openHAB hinzu.
+addon.gpio.name = GPIO Binding
+addon.gpio.description = Fügt GPIO Unterstützung zu openHAB hinzu.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker.properties b/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker.properties
index 4ece0eb41..74323dc15 100644
--- a/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker.properties
+++ b/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gpstracker.name = GPSTracker Binding
-binding.gpstracker.description = GPS tracking with OwnTracks and GPSLogger support over HTTP
+addon.gpstracker.name = GPSTracker Binding
+addon.gpstracker.description = GPS tracking with OwnTracks and GPSLogger support over HTTP
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker_de.properties b/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker_de.properties
index e5a225847..1d9a197ec 100644
--- a/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker_de.properties
+++ b/bundles/org.openhab.binding.gpstracker/src/main/resources/OH-INF/i18n/gpstracker_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.gpstracker.name = GPSTracker Bindung
-binding.gpstracker.description = GPS Tracks mit OwnTracks und GPSLogger Unterstützung über HTTP
+addon.gpstracker.name = GPSTracker Bindung
+addon.gpstracker.description = GPS Tracks mit OwnTracks und GPSLogger Unterstützung über HTTP
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree.properties b/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree.properties
index 613f86a7f..f10e2a266 100644
--- a/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree.properties
+++ b/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree.properties
@@ -1,7 +1,7 @@
 # GREE Binding
-binding.gree.name = GREE Binding
-binding.gree.label = GREE Air Conditioner
-binding.gree.description = This binding integrates the GREE series of air conditioners
+addon.gree.name = GREE Binding
+addon.gree.label = GREE Air Conditioner
+addon.gree.description = This binding integrates the GREE series of air conditioners
 
 # thing types
 thing-type.gree.airconditioner.label = Air Conditioner
diff --git a/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_de.properties b/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_de.properties
index ce6d4bcda..cd9f0adf2 100644
--- a/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_de.properties
+++ b/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_de.properties
@@ -1,7 +1,7 @@
 # GREE Binding
-binding.gree.name = GREE Binding
-binding.gree.label = GREE Air Conditioner
-binding.gree.description = Dieses Binding integriert Klimaanlagen der Marke GREE
+addon.gree.name = GREE Binding
+addon.gree.label = GREE Air Conditioner
+addon.gree.description = Dieses Binding integriert Klimaanlagen der Marke GREE
 
 # thing types
 thing-type.gree.airconditioner.label = GREE Klimaanlage
diff --git a/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_hu.properties b/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_hu.properties
index 4d288cc25..7f69728db 100644
--- a/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_hu.properties
+++ b/bundles/org.openhab.binding.gree/src/main/resources/OH-INF/i18n/gree_hu.properties
@@ -1,7 +1,7 @@
 # GREE Binding
-binding.gree.name = GREE kötés
-binding.gree.label = GREE légkondicionáló
-binding.gree.description = Ez a kötés kezeli a GREE gyártmányú légkondicionálókat
+addon.gree.name = GREE kötés
+addon.gree.label = GREE légkondicionáló
+addon.gree.description = Ez a kötés kezeli a GREE gyártmányú légkondicionálókat
 
 # thing types
 thing-type.gree.airconditioner.label = Légkondicionáló
diff --git a/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus.properties b/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus.properties
index f6bcb75d8..edfba6547 100644
--- a/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus.properties
+++ b/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus.properties
@@ -1,6 +1,6 @@
-# binding
-binding.groheondus.name=GROHE ONDUS Binding
-binding.groheondus.description=Provides an integration for GROHE Appliances in openHAB
+# add-on
+addon.groheondus.name=GROHE ONDUS Binding
+addon.groheondus.description=Provides an integration for GROHE Appliances in openHAB
 # thing types
 thing-type.groheondus.account.label=GROHE ONDUS Account
 thing-type.groheondus.account.description=This is an interface to the GROHE ONDUS Account as it is used by the app. If username and password are not set, you can configure to use a `refreshToken` to login. Read the README to get more info.
diff --git a/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus_de.properties b/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus_de.properties
index fdbef4cac..1d2bdf4e3 100644
--- a/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus_de.properties
+++ b/bundles/org.openhab.binding.groheondus/src/main/resources/OH-INF/i18n/groheondus_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.groheondus.name = GROHE ONDUS
-binding.groheondus.description = Stellt eine Integration mit Geräten von GROHE in openHAB zur Verfügung.
+# add-on
+addon.groheondus.name = GROHE ONDUS
+addon.groheondus.description = Stellt eine Integration mit Geräten von GROHE in openHAB zur Verfügung.
 
 # thing types
 thing-type.groheondus.senseguard.label = GROHE SENSE Guard Gerät
diff --git a/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa.properties b/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa.properties
index 6e7027529..94322e5ae 100644
--- a/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa.properties
+++ b/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.groupepsa.name = Groupe PSA Binding
-binding.groupepsa.description = Provides information and (limited) control of cars from the Groupe PSA (Peugeot, Citroen, Opel, etc.).
+addon.groupepsa.name = Groupe PSA Binding
+addon.groupepsa.description = Provides information and (limited) control of cars from the Groupe PSA (Peugeot, Citroen, Opel, etc.).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa_it.properties b/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa_it.properties
index 4a5401b99..473671ca4 100644
--- a/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa_it.properties
+++ b/bundles/org.openhab.binding.groupepsa/src/main/resources/OH-INF/i18n/groupepsa_it.properties
@@ -1,6 +1,6 @@
-# binding
-binding.groupepsa.name = Binding Gruppo PSA
-binding.groupepsa.description = Fornisce informazioni e (limitato) controllo delle auto del gruppo PSA (Peugeot, Citroen, Opel, ecc.).
+# add-on
+addon.groupepsa.name = Binding Gruppo PSA
+addon.groupepsa.description = Fornisce informazioni e (limitato) controllo delle auto del gruppo PSA (Peugeot, Citroen, Opel, ecc.).
 
 #configuration errors
 conf-error-no-vendor = Impossibile connettersi al bridge del Grouppo PSA in quanto nessun fornitore è disponibile nella configurazione
diff --git a/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic.properties b/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic.properties
index 844919ee5..e7ea9ea91 100644
--- a/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic.properties
+++ b/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.guntamatic.name = Guntamatic Binding
-binding.guntamatic.description = Binding for Guntamatic Heating Systems.
+addon.guntamatic.name = Guntamatic Binding
+addon.guntamatic.description = Binding for Guntamatic Heating Systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic_it.properties b/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic_it.properties
index 5f2b748a8..cfc400413 100644
--- a/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic_it.properties
+++ b/bundles/org.openhab.binding.guntamatic/src/main/resources/OH-INF/i18n/guntamatic_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.guntamatic.name = Binding Guntamatic
-binding.guntamatic.description = Binding per sistemi di riscaldamento Guntamatic.
+addon.guntamatic.name = Binding Guntamatic
+addon.guntamatic.description = Binding per sistemi di riscaldamento Guntamatic.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.haassohnpelletstove/src/main/resources/OH-INF/i18n/haassohnpelletstove.properties b/bundles/org.openhab.binding.haassohnpelletstove/src/main/resources/OH-INF/i18n/haassohnpelletstove.properties
index a3aad9881..933282455 100644
--- a/bundles/org.openhab.binding.haassohnpelletstove/src/main/resources/OH-INF/i18n/haassohnpelletstove.properties
+++ b/bundles/org.openhab.binding.haassohnpelletstove/src/main/resources/OH-INF/i18n/haassohnpelletstove.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.haassohnpelletstove.name = Haas and Sohn Pelletstove Binding
-binding.haassohnpelletstove.description = This binding communicates with Haas and Sohn Pelletstoves through the optional WIFI module. It allows to power the stove on and off and receives different operation information.
+addon.haassohnpelletstove.name = Haas and Sohn Pelletstove Binding
+addon.haassohnpelletstove.description = This binding communicates with Haas and Sohn Pelletstoves through the optional WIFI module. It allows to power the stove on and off and receives different operation information.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub.properties b/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub.properties
index 7e8c8dbc2..eede1c3d1 100644
--- a/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub.properties
+++ b/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.harmonyhub.name = HarmonyHub Binding
-binding.harmonyhub.description = The HarmonyHub Binding integrates Logitech Harmony hubs and remotes.
+addon.harmonyhub.name = HarmonyHub Binding
+addon.harmonyhub.description = The HarmonyHub Binding integrates Logitech Harmony hubs and remotes.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub_da.properties b/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub_da.properties
index c49839f2f..8f41c15b1 100644
--- a/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub_da.properties
+++ b/bundles/org.openhab.binding.harmonyhub/src/main/resources/OH-INF/i18n/harmonyhub_da.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.harmonyhub.name = HarmonyHub Binding
-binding.harmonyhub.description = HarmonyHub-bindingen integrerer Logitech Harmony hub'er og fjernbetjeninger.
+addon.harmonyhub.name = HarmonyHub Binding
+addon.harmonyhub.description = HarmonyHub-bindingen integrerer Logitech Harmony hub'er og fjernbetjeninger.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/i18n/haywardomnilogic.properties b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/i18n/haywardomnilogic.properties
index d4e90ad89..8a0046ee7 100644
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/i18n/haywardomnilogic.properties
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/i18n/haywardomnilogic.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.haywardomnilogic.name = Hayward OmniLogix Binding
-binding.haywardomnilogic.description = Binding for the Hayward OmniLogix swimming pool automation controller.
+addon.haywardomnilogic.name = Hayward OmniLogix Binding
+addon.haywardomnilogic.description = Binding for the Hayward OmniLogix swimming pool automation controller.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hccrubbishcollection/src/main/resources/OH-INF/i18n/hccrubbishcollection.properties b/bundles/org.openhab.binding.hccrubbishcollection/src/main/resources/OH-INF/i18n/hccrubbishcollection.properties
index 8320d33ac..54f6ee8ce 100644
--- a/bundles/org.openhab.binding.hccrubbishcollection/src/main/resources/OH-INF/i18n/hccrubbishcollection.properties
+++ b/bundles/org.openhab.binding.hccrubbishcollection/src/main/resources/OH-INF/i18n/hccrubbishcollection.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hccrubbishcollection.name = HCC Rubbish Collection Binding
-binding.hccrubbishcollection.description = Get the rubbish collection dates for Hamilton City Council (New Zealand).
+addon.hccrubbishcollection.name = HCC Rubbish Collection Binding
+addon.hccrubbishcollection.description = Get the rubbish collection dates for Hamilton City Council (New Zealand).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hdanywhere/src/main/resources/OH-INF/i18n/hdanywhere.properties b/bundles/org.openhab.binding.hdanywhere/src/main/resources/OH-INF/i18n/hdanywhere.properties
index fea59bb17..cf6458c50 100644
--- a/bundles/org.openhab.binding.hdanywhere/src/main/resources/OH-INF/i18n/hdanywhere.properties
+++ b/bundles/org.openhab.binding.hdanywhere/src/main/resources/OH-INF/i18n/hdanywhere.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hdanywhere.name = openHAB HDanywhere Binding
-binding.hdanywhere.description = This is the binding for HDanywhere HDMI Matrices
+addon.hdanywhere.name = openHAB HDanywhere Binding
+addon.hdanywhere.description = This is the binding for HDanywhere HDMI Matrices
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties
index b351827fb..85f56465b 100644
--- a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hdpowerview.name = Hunter Douglas PowerView Binding
-binding.hdpowerview.description = The Hunter Douglas PowerView binding provides access to the Hunter Douglas line of PowerView shades.
+addon.hdpowerview.name = Hunter Douglas PowerView Binding
+addon.hdpowerview.description = The Hunter Douglas PowerView binding provides access to the Hunter Douglas line of PowerView shades.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview_da.properties b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview_da.properties
index f21f3a010..6a9594947 100644
--- a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview_da.properties
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview_da.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hdpowerview.name = Luxaflex PowerView Binding
-binding.hdpowerview.description = Luxaflex PowerView-bindingen giver adgang til Luxaflex-sortimentet af PowerView-gardiner.
+addon.hdpowerview.name = Luxaflex PowerView Binding
+addon.hdpowerview.description = Luxaflex PowerView-bindingen giver adgang til Luxaflex-sortimentet af PowerView-gardiner.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.helios/src/main/resources/OH-INF/i18n/helios.properties b/bundles/org.openhab.binding.helios/src/main/resources/OH-INF/i18n/helios.properties
index d3f5803b3..9bfa9e46f 100644
--- a/bundles/org.openhab.binding.helios/src/main/resources/OH-INF/i18n/helios.properties
+++ b/bundles/org.openhab.binding.helios/src/main/resources/OH-INF/i18n/helios.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.helios.name = Helios Binding
-binding.helios.description = This is the binding for Helios IP (Vario/...) class of intercom/(video)doorstations.
+addon.helios.name = Helios Binding
+addon.helios.description = This is the binding for Helios IP (Vario/...) class of intercom/(video)doorstations.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation.properties b/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation.properties
index f08d990bc..86d8e2226 100644
--- a/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation.properties
+++ b/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.heliosventilation.name = HeliosVentilation Binding
-binding.heliosventilation.description = This is the binding for Helios Ventilation Systems KWL EC 200/300/500 Pro. It requires a connection to the RS485 bus used by the original remote controls KWL-FB (9417).
+addon.heliosventilation.name = HeliosVentilation Binding
+addon.heliosventilation.description = This is the binding for Helios Ventilation Systems KWL EC 200/300/500 Pro. It requires a connection to the RS485 bus used by the original remote controls KWL-FB (9417).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation_de.properties b/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation_de.properties
index 7873795e6..3ead99ebf 100644
--- a/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation_de.properties
+++ b/bundles/org.openhab.binding.heliosventilation/src/main/resources/OH-INF/i18n/heliosventilation_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.heliosventilation.name = Helios KWL Binding
-binding.heliosventilation.description = Dies ist das Binding für Helios KWL Systeme KWL EC 200/300/500 Pro. Es benötigt eine Verbindung zum RS485 Bus für die Fernbedienung KWL-FB (9417).
+addon.heliosventilation.name = Helios KWL Binding
+addon.heliosventilation.description = Dies ist das Binding für Helios KWL Systeme KWL EC 200/300/500 Pro. Es benötigt eine Verbindung zum RS485 Bus für die Fernbedienung KWL-FB (9417).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.heos/src/main/resources/OH-INF/i18n/heos.properties b/bundles/org.openhab.binding.heos/src/main/resources/OH-INF/i18n/heos.properties
index 01665d79b..a554c6c26 100644
--- a/bundles/org.openhab.binding.heos/src/main/resources/OH-INF/i18n/heos.properties
+++ b/bundles/org.openhab.binding.heos/src/main/resources/OH-INF/i18n/heos.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.heos.name = HEOS Binding
-binding.heos.description = Binding for the Denon HEOS system.
+addon.heos.name = HEOS Binding
+addon.heos.description = Binding for the Denon HEOS system.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg.properties b/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg.properties
index faa7af971..3d83f46d9 100644
--- a/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg.properties
+++ b/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.herzborg.name = Herzborg Binding
-binding.herzborg.description = This is the binding for Herzborg smart curtain motors.
+addon.herzborg.name = Herzborg Binding
+addon.herzborg.description = This is the binding for Herzborg smart curtain motors.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg_it.properties b/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg_it.properties
index b729f91c1..6264410ea 100644
--- a/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg_it.properties
+++ b/bundles/org.openhab.binding.herzborg/src/main/resources/OH-INF/i18n/herzborg_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.herzborg.name = Binding Herzborg
-binding.herzborg.description = Questo è il binding per i motori tenda intelligenti Herzborg.
+addon.herzborg.name = Binding Herzborg
+addon.herzborg.description = Questo è il binding per i motori tenda intelligenti Herzborg.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect.properties b/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect.properties
index 8028880db..c7316554d 100644
--- a/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect.properties
+++ b/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.homeconnect.name = Home Connect Binding
-binding.homeconnect.description = The binding integrates the Home Connect (https://www.home-connect.com/) system into openHAB. It connects to household devices from brands like Bosch and Siemens.
+addon.homeconnect.name = Home Connect Binding
+addon.homeconnect.description = The binding integrates the Home Connect (https://www.home-connect.com/) system into openHAB. It connects to household devices from brands like Bosch and Siemens.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect_de.properties b/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect_de.properties
index 365321519..9a75c9de9 100644
--- a/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect_de.properties
+++ b/bundles/org.openhab.binding.homeconnect/src/main/resources/OH-INF/i18n/homeconnect_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.homeconnect.name = Home Connect Binding
-binding.homeconnect.description = Das Binding integriert das Home Connect (https\://www.home-connect.com/) System in openHAB und verbindet mit Haushaltsgeräten von Marken wie Bosch und Siemens.
+addon.homeconnect.name = Home Connect Binding
+addon.homeconnect.description = Das Binding integriert das Home Connect (https\://www.home-connect.com/) System in openHAB und verbindet mit Haushaltsgeräten von Marken wie Bosch und Siemens.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic.properties b/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic.properties
index 4a1d9f081..207b8dbd7 100644
--- a/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic.properties
+++ b/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.homematic.name = Homematic Binding
-binding.homematic.description = This is the binding for Homematic gateways
+addon.homematic.name = Homematic Binding
+addon.homematic.description = This is the binding for Homematic gateways
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic_de.properties b/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic_de.properties
index 1db1b2f5a..e58ccb785 100644
--- a/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic_de.properties
+++ b/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.homematic.name = Homematic Binding
-binding.homematic.description = Dies ist das Binding für Homematic Gateways
+addon.homematic.name = Homematic Binding
+addon.homematic.description = Dies ist das Binding für Homematic Gateways
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.homewizard/src/main/resources/OH-INF/i18n/homewizard.properties b/bundles/org.openhab.binding.homewizard/src/main/resources/OH-INF/i18n/homewizard.properties
index 446dedfeb..baa912cf5 100644
--- a/bundles/org.openhab.binding.homewizard/src/main/resources/OH-INF/i18n/homewizard.properties
+++ b/bundles/org.openhab.binding.homewizard/src/main/resources/OH-INF/i18n/homewizard.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.homewizard.name = HomeWizard Binding
-binding.homewizard.description = This binding provides access to the data provided by the HomeWizard Wi-Fi P1 meter on it's local HTTP interface.
+addon.homewizard.name = HomeWizard Binding
+addon.homewizard.description = This binding provides access to the data provided by the HomeWizard Wi-Fi P1 meter on it's local HTTP interface.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter.properties b/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter.properties
index 1ebf0fa13..beb911655 100644
--- a/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter.properties
+++ b/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hpprinter.name = HP Printer Binding
-binding.hpprinter.description = Binding for HP Printers with Embedded Web Servers
+addon.hpprinter.name = HP Printer Binding
+addon.hpprinter.description = Binding for HP Printers with Embedded Web Servers
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter_de.properties b/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter_de.properties
index e0d7eef23..490b5ed08 100644
--- a/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter_de.properties
+++ b/bundles/org.openhab.binding.hpprinter/src/main/resources/OH-INF/i18n/hpprinter_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hpprinter.name = HP Drucker Bindung
-binding.hpprinter.description = Bindung für HP Drucker mit integrierten Web-Servern
+addon.hpprinter.name = HP Drucker Bindung
+addon.hpprinter.description = Bindung für HP Drucker mit integrierten Web-Servern
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http.properties b/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http.properties
index cb5d8815b..e73fe079f 100644
--- a/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http.properties
+++ b/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.http.name = HTTP Binding
-binding.http.description = This is the binding for retrieving and processing HTTP resources.
+addon.http.name = HTTP Binding
+addon.http.description = This is the binding for retrieving and processing HTTP resources.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_de.properties b/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_de.properties
index 74371aa46..c939086aa 100644
--- a/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_de.properties
+++ b/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.http.name = HTTP Binding
-binding.http.description = Dies ist die Bindung zum Abrufen und Verarbeiten von HTTP-Ressourcen.
+addon.http.name = HTTP Binding
+addon.http.description = Dies ist die Bindung zum Abrufen und Verarbeiten von HTTP-Ressourcen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_it.properties b/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_it.properties
index f5a20c9d2..3ed4ee1e1 100644
--- a/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_it.properties
+++ b/bundles/org.openhab.binding.http/src/main/resources/OH-INF/i18n/http_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.http.name = Binding HTTP
-binding.http.description = Questo è il binding per il recupero e l'elaborazione di risorse HTTP.
+addon.http.name = Binding HTTP
+addon.http.description = Questo è il binding per il recupero e l'elaborazione di risorse HTTP.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
index 9f376076c..0467acfac 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hue.name = Hue Binding
-binding.hue.description = The Hue Binding integrates the Philips Hue system. It allows to control Hue bulbs.
+addon.hue.name = Hue Binding
+addon.hue.description = The Hue Binding integrates the Philips Hue system. It allows to control Hue bulbs.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties
index da6c8a2ae..bd3585a45 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hue.name = Hue Binding
-binding.hue.description = Dieses Binding integriert das Philips Hue System. Durch diese können die Hue Lampen und Leuchten gesteuert werden. 
+addon.hue.name = Hue Binding
+addon.hue.description = Dieses Binding integriert das Philips Hue System. Durch diese können die Hue Lampen und Leuchten gesteuert werden. 
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties
index 26108a51e..e1ce45855 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hue.name = Extension hue
-binding.hue.description = L'extension hue intègre le système Philips hue et permet de contrôler des ampoules hue.
+addon.hue.name = Extension hue
+addon.hue.description = L'extension hue intègre le système Philips hue et permet de contrôler des ampoules hue.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_it.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_it.properties
index 872b919b4..7e7b527a6 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_it.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hue.name = Gestore Hue
-binding.hue.description = Il Gestore Hue integra il sistema Philips Hue. Permette di controllare le lampadine Hue.
+addon.hue.name = Gestore Hue
+addon.hue.description = Il Gestore Hue integra il sistema Philips Hue. Permette di controllare le lampadine Hue.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hydrawise/src/main/resources/OH-INF/i18n/hydrawise.properties b/bundles/org.openhab.binding.hydrawise/src/main/resources/OH-INF/i18n/hydrawise.properties
index 3b7f23409..39b73aaa8 100644
--- a/bundles/org.openhab.binding.hydrawise/src/main/resources/OH-INF/i18n/hydrawise.properties
+++ b/bundles/org.openhab.binding.hydrawise/src/main/resources/OH-INF/i18n/hydrawise.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hydrawise.name = Hydrawise Binding
-binding.hydrawise.description = This is the binding for Hydrawise irrigation systems.
+addon.hydrawise.name = Hydrawise Binding
+addon.hydrawise.description = This is the binding for Hydrawise irrigation systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.hyperion/src/main/resources/OH-INF/i18n/hyperion.properties b/bundles/org.openhab.binding.hyperion/src/main/resources/OH-INF/i18n/hyperion.properties
index 56c524a75..941455abb 100644
--- a/bundles/org.openhab.binding.hyperion/src/main/resources/OH-INF/i18n/hyperion.properties
+++ b/bundles/org.openhab.binding.hyperion/src/main/resources/OH-INF/i18n/hyperion.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.hyperion.name = Hyperion Binding
-binding.hyperion.description = This binding integrates openHAB with the Hyperion ambient lighting software.
+addon.hyperion.name = Hyperion Binding
+addon.hyperion.description = This binding integrates openHAB with the Hyperion ambient lighting software.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.iammeter/src/main/resources/OH-INF/i18n/iammeter.properties b/bundles/org.openhab.binding.iammeter/src/main/resources/OH-INF/i18n/iammeter.properties
index 604004723..5d7ebd375 100644
--- a/bundles/org.openhab.binding.iammeter/src/main/resources/OH-INF/i18n/iammeter.properties
+++ b/bundles/org.openhab.binding.iammeter/src/main/resources/OH-INF/i18n/iammeter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.iammeter.name = Iammeter Binding
-binding.iammeter.description = The Iammeter binding pull your Iammeter power meter data from LAN.
+addon.iammeter.name = Iammeter Binding
+addon.iammeter.description = The Iammeter binding pull your Iammeter power meter data from LAN.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.iaqualink/src/main/resources/OH-INF/i18n/iaqualink.properties b/bundles/org.openhab.binding.iaqualink/src/main/resources/OH-INF/i18n/iaqualink.properties
index 40ab57a1a..d3dd4cade 100644
--- a/bundles/org.openhab.binding.iaqualink/src/main/resources/OH-INF/i18n/iaqualink.properties
+++ b/bundles/org.openhab.binding.iaqualink/src/main/resources/OH-INF/i18n/iaqualink.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.iaqualink.name = iAquaLink Binding
-binding.iaqualink.description = This is the binding for an iAquaLink pool controller.
+addon.iaqualink.name = iAquaLink Binding
+addon.iaqualink.description = This is the binding for an iAquaLink pool controller.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties
index d78ed14e9..f0013970c 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties
+++ b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.icalendar.name = iCalendar Binding
-binding.icalendar.description = Binding for using iCal calendars
+addon.icalendar.name = iCalendar Binding
+addon.icalendar.description = Binding for using iCal calendars
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_de.properties b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_de.properties
index fe562435f..0c93a25fa 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_de.properties
+++ b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.icalendar.name = iCalendar Binding
-binding.icalendar.description = Binding zur Nutzung von iCal-Kalendern (z.B. als Präsenz-Schalter oder zum Abruf von Terminen).
+addon.icalendar.name = iCalendar Binding
+addon.icalendar.description = Binding zur Nutzung von iCal-Kalendern (z.B. als Präsenz-Schalter oder zum Abruf von Terminen).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_fr.properties b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_fr.properties
index 563716305..f5269f035 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_fr.properties
+++ b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.icalendar.name = Extension iCalendar
-binding.icalendar.description = Extension destinée à l'utilisation des calendriers iCal
+addon.icalendar.name = Extension iCalendar
+addon.icalendar.description = Extension destinée à l'utilisation des calendriers iCal
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_it.properties b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_it.properties
index 2a70e0d8d..4673675b7 100644
--- a/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_it.properties
+++ b/bundles/org.openhab.binding.icalendar/src/main/resources/OH-INF/i18n/icalendar_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.icalendar.name = Binding iCalendar
-binding.icalendar.description = Binding per usare calendari iCal
+addon.icalendar.name = Binding iCalendar
+addon.icalendar.description = Binding per usare calendari iCal
 
 # thing types
 
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 8ce78be76..056417056 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 @@
-# Binding
-icloud.binding.name=iCloud Binding
-icloud.binding.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.
+# 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.
 
 # Account Thing
 icloud.account-thing.label=iCloud Account
diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_de.properties b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_de.properties
index dd012bad3..61067f2d6 100644
--- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_de.properties
+++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_de.properties
@@ -1,6 +1,6 @@
-# Binding
-icloud.binding.name=iCloud Binding
-icloud.binding.description=Die Apple iCloud wird genutzt, um Daten wie den Ladezustand oder den Standort von einem oder mehreren Apple Geräten zu erhalten, die mit einem iCloud Account verknüpft sind.
+# add-on
+icloud.addon.name=iCloud Binding
+icloud.addon.description=Die Apple iCloud wird genutzt, um Daten wie den Ladezustand oder den Standort von einem oder mehreren Apple Geräten zu erhalten, die mit einem iCloud Account verknüpft sind.
 
 # Account Thing
 icloud.account-thing.label=iCloud-Account
diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fi.properties b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fi.properties
index 66377e612..d70a75f4c 100644
--- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fi.properties
+++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fi.properties
@@ -1,6 +1,6 @@
-# Binding
-icloud.binding.name=iCloud-lisäosa
-icloud.binding.description=Apple iCloudia käytetään yhden tai useamman iCloud-tiliin yhdistetyn Apple-laitteen tietojen, kuten akun tai nykyisen sijainnin, hakemiseen. Päivitykset ovat nopeita ja tarkkoja ilman merkittävää akun kulutusta.
+# add-on
+icloud.addon.name=iCloud-lisäosa
+icloud.addon.description=Apple iCloudia käytetään yhden tai useamman iCloud-tiliin yhdistetyn Apple-laitteen tietojen, kuten akun tai nykyisen sijainnin, hakemiseen. Päivitykset ovat nopeita ja tarkkoja ilman merkittävää akun kulutusta.
 
 # Account Thing
 icloud.account-thing.label=iCloud tili
diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fr.properties b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fr.properties
index a48800120..0e9bc48ba 100644
--- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fr.properties
+++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_fr.properties
@@ -1,6 +1,6 @@
-# Binding
-icloud.binding.name=Extension iCloud
-icloud.binding.description=Apple iCloud est utilisé pour obtenir des données telles que le niveau de la batterie ou la localisation d'un ou plusieurs appareils Apple connectés à un compte iCloud. Les mises à jour sont rapides et précises sans impact notable sur la batterie.
+# add-on
+icloud.addon.name=Extension iCloud
+icloud.addon.description=Apple iCloud est utilisé pour obtenir des données telles que le niveau de la batterie ou la localisation d'un ou plusieurs appareils Apple connectés à un compte iCloud. Les mises à jour sont rapides et précises sans impact notable sur la batterie.
 
 # Account Thing
 icloud.account-thing.label=Compte iCloud
diff --git a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_hu.properties b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_hu.properties
index 57539c9fc..16876bc3c 100644
--- a/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_hu.properties
+++ b/bundles/org.openhab.binding.icloud/src/main/resources/OH-INF/i18n/iCloud_hu.properties
@@ -1,6 +1,6 @@
-# Binding
-icloud.binding.name=iCloud kötés
-icloud.binding.description=Az Apple iCloud szolgál egy vagy több iCloudhoz csatlakoztatott Apple eszköz adatainak - például akkumulátor vagy pozíció - lekérdezésére. A frissítés gyors és pontos, lényeges akkumulátor használt nélkül.
+# add-on
+icloud.addon.name=iCloud kötés
+icloud.addon.description=Az Apple iCloud szolgál egy vagy több iCloudhoz csatlakoztatott Apple eszköz adatainak - például akkumulátor vagy pozíció - lekérdezésére. A frissítés gyors és pontos, lényeges akkumulátor használt nélkül.
 
 # Account Thing
 icloud.account-thing.label=iCloud fiók
diff --git a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/i18n/ihc.properties b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/i18n/ihc.properties
index 2aaf86f5d..a5dad79ee 100644
--- a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/i18n/ihc.properties
+++ b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/i18n/ihc.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ihc.name = IHC / ELKO Binding
-binding.ihc.description = Binding to communicate IHC / ELKO controller
+addon.ihc.name = IHC / ELKO Binding
+addon.ihc.description = Binding to communicate IHC / ELKO controller
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome.properties b/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome.properties
index 1f5a197da..5e9e5a8f5 100644
--- a/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome.properties
+++ b/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.innogysmarthome.name = innogy SmartHome Binding
-binding.innogysmarthome.description = The innogy SmartHome binding integrates your innogy SmartHome system.
+addon.innogysmarthome.name = innogy SmartHome Binding
+addon.innogysmarthome.description = The innogy SmartHome binding integrates your innogy SmartHome system.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome_de.properties b/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome_de.properties
index ec4e5c5a8..77a7365ba 100644
--- a/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome_de.properties
+++ b/bundles/org.openhab.binding.innogysmarthome/src/main/resources/OH-INF/i18n/innogysmarthome_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.innogysmarthome.name = innogy SmartHome Binding
-binding.innogysmarthome.description = Das innogy SmartHome Binding verbindet Dein innogy SmartHome System mit openHAB.
+# add-on
+addon.innogysmarthome.name = innogy SmartHome Binding
+addon.innogysmarthome.description = Das innogy SmartHome Binding verbindet Dein innogy SmartHome System mit openHAB.
 
 # thing types
 thing-type.innogysmarthome.bridge.label = innogy SmartHome Zentrale
diff --git a/bundles/org.openhab.binding.insteon/src/main/resources/OH-INF/i18n/insteon.properties b/bundles/org.openhab.binding.insteon/src/main/resources/OH-INF/i18n/insteon.properties
index bfb72cc11..2e7dd0f6d 100644
--- a/bundles/org.openhab.binding.insteon/src/main/resources/OH-INF/i18n/insteon.properties
+++ b/bundles/org.openhab.binding.insteon/src/main/resources/OH-INF/i18n/insteon.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.insteon.name = Insteon Binding
-binding.insteon.description = This is the binding for Insteon.
+addon.insteon.name = Insteon Binding
+addon.insteon.description = This is the binding for Insteon.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis.properties b/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis.properties
index 2a04e56a0..ac1f243cd 100644
--- a/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis.properties
+++ b/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis.properties
@@ -1,6 +1,6 @@
-# binding
-binding.intesis.name = Intesis Binding
-binding.intesis.description = This binding integrates Intesis WiFi devices to control various air conditioners
+# add-on
+addon.intesis.name = Intesis Binding
+addon.intesis.description = This binding integrates Intesis WiFi devices to control various air conditioners
 
 # thing types
 thing-type.intesis.intesisHome.label = IntesisHome
diff --git a/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_de.properties b/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_de.properties
index 301643fb6..7d34bcfe0 100644
--- a/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_de.properties
+++ b/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.intesis.name = Intesis Binding
-binding.intesis.description = Das Intesis Binding integriert die Intesis WiFi Adapter, welche in diversen Klimageräten verwendet werden.
+# add-on
+addon.intesis.name = Intesis Binding
+addon.intesis.description = Das Intesis Binding integriert die Intesis WiFi Adapter, welche in diversen Klimageräten verwendet werden.
 
 # thing types
 thing-type.intesis.intesisHome.label = IntesisHome
diff --git a/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_hu.properties b/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_hu.properties
index 2f80e86e7..6eb4a6a84 100644
--- a/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_hu.properties
+++ b/bundles/org.openhab.binding.intesis/src/main/resources/OH-INF/i18n/intesis_hu.properties
@@ -1,6 +1,6 @@
-# binding
-binding.intesis.name = Intesis kötés
-binding.intesis.description = Ez a kötés kezeli a különböző Intesis Wifivel ellátott légkondicionáló eszközöket
+# add-on
+addon.intesis.name = Intesis kötés
+addon.intesis.description = Ez a kötés kezeli a különböző Intesis Wifivel ellátott légkondicionáló eszközöket
 
 # thing types
 thing-type.intesis.intesisHome.label = Intesis otthon
diff --git a/bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF/i18n/ipcamera.properties b/bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF/i18n/ipcamera.properties
index 27edc0a73..a7b9ae3a5 100644
--- a/bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF/i18n/ipcamera.properties
+++ b/bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF/i18n/ipcamera.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ipcamera.name = IpCamera Binding
-binding.ipcamera.description = This binding interfaces IP cameras of various vendors via open protocols.
+addon.ipcamera.name = IpCamera Binding
+addon.ipcamera.description = This binding interfaces IP cameras of various vendors via open protocols.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ipobserver/src/main/resources/OH-INF/i18n/ipobserver.properties b/bundles/org.openhab.binding.ipobserver/src/main/resources/OH-INF/i18n/ipobserver.properties
index 6e9dd69bb..50099f3dd 100644
--- a/bundles/org.openhab.binding.ipobserver/src/main/resources/OH-INF/i18n/ipobserver.properties
+++ b/bundles/org.openhab.binding.ipobserver/src/main/resources/OH-INF/i18n/ipobserver.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ipobserver.name = IpObserver Binding
-binding.ipobserver.description = This is the binding for weather stations marketed under many brands that come with or have an IpObserver station connected.
+addon.ipobserver.name = IpObserver Binding
+addon.ipobserver.description = This is the binding for weather stations marketed under many brands that come with or have an IpObserver station connected.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp.properties b/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp.properties
index 31259775d..ec4f5bdb3 100644
--- a/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp.properties
+++ b/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ipp.name = IPP Binding
-binding.ipp.description = This is the binding for the Internet Printing Protocol (IPP). You can show how many jobs are done/waiting on an IPP/CUPS Printer
+addon.ipp.name = IPP Binding
+addon.ipp.description = This is the binding for the Internet Printing Protocol (IPP). You can show how many jobs are done/waiting on an IPP/CUPS Printer
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp_de.properties b/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp_de.properties
index 8c768f658..8fe81fc70 100644
--- a/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp_de.properties
+++ b/bundles/org.openhab.binding.ipp/src/main/resources/OH-INF/i18n/ipp_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ipp.name = IPP Binding
-binding.ipp.description = Dies ist das Binding für das Internet Printing Protocol (IPP). Sie können abfragen, wie viele Aufträge eines IPP/CUPS Druckers warten oder erledigt sind.
+addon.ipp.name = IPP Binding
+addon.ipp.description = Dies ist das Binding für das Internet Printing Protocol (IPP). Sie können abfragen, wie viele Aufträge eines IPP/CUPS Druckers warten oder erledigt sind.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.irobot/src/main/resources/OH-INF/i18n/irobot.properties b/bundles/org.openhab.binding.irobot/src/main/resources/OH-INF/i18n/irobot.properties
index bcd73c3a3..c72f99cac 100644
--- a/bundles/org.openhab.binding.irobot/src/main/resources/OH-INF/i18n/irobot.properties
+++ b/bundles/org.openhab.binding.irobot/src/main/resources/OH-INF/i18n/irobot.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.irobot.name = iRobot Binding
-binding.irobot.description = This is the binding for iRobot vacuum robots.
+addon.irobot.name = iRobot Binding
+addon.irobot.description = This is the binding for iRobot vacuum robots.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.irtrans/src/main/resources/OH-INF/i18n/irtrans.properties b/bundles/org.openhab.binding.irtrans/src/main/resources/OH-INF/i18n/irtrans.properties
index bca7cbed4..d5acf3b64 100644
--- a/bundles/org.openhab.binding.irtrans/src/main/resources/OH-INF/i18n/irtrans.properties
+++ b/bundles/org.openhab.binding.irtrans/src/main/resources/OH-INF/i18n/irtrans.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.irtrans.name = IRtrans Binding
-binding.irtrans.description = This is the binding for IRtrans (www.irtrans.de) Transceivers
+addon.irtrans.name = IRtrans Binding
+addon.irtrans.description = This is the binding for IRtrans (www.irtrans.de) Transceivers
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/i18n/ism8.properties b/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/i18n/ism8.properties
index 62ee6daa3..99778eeea 100644
--- a/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/i18n/ism8.properties
+++ b/bundles/org.openhab.binding.ism8/src/main/resources/OH-INF/i18n/ism8.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ism8.name = ISM8 Binding
-binding.ism8.description = This is the binding for the ISM8 card used for Wolf heating systems or other Wolf eBus devices.
+addon.ism8.name = ISM8 Binding
+addon.ism8.description = This is the binding for the ISM8 card used for Wolf heating systems or other Wolf eBus devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/i18n/jablotron.properties b/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/i18n/jablotron.properties
index 9ef0a7a9f..5e20a1d0f 100644
--- a/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/i18n/jablotron.properties
+++ b/bundles/org.openhab.binding.jablotron/src/main/resources/OH-INF/i18n/jablotron.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.jablotron.name = Jablotron Binding
-binding.jablotron.description = This is the binding for Jablotron Alarm Systems.
+addon.jablotron.name = Jablotron Binding
+addon.jablotron.description = This is the binding for Jablotron Alarm Systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink.properties b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink.properties
index bc42dea08..17199247b 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink.properties
+++ b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink.properties
@@ -1,6 +1,6 @@
-# binding
-binding.jeelink.name = JeeLink Binding
-binding.jeelink.description = This is the binding for JeeLink USB Receivers, LaCrosseGateways and connected sensors.
+# add-on
+addon.jeelink.name = JeeLink Binding
+addon.jeelink.description = This is the binding for JeeLink USB Receivers, LaCrosseGateways and connected sensors.
 
 # bridge types
 bridge-type.jeelinkUsb.label = JeeLink (connected to USB)
diff --git a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_de.properties b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_de.properties
index ba9faffbd..092ae377f 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_de.properties
+++ b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.jeelink.name = JeeLink Binding
-binding.jeelink.description = Binding für JeeLink USB Empfänger, LaCrosseGateways und damit verbundene Sensoren.
+# add-on
+addon.jeelink.name = JeeLink Binding
+addon.jeelink.description = Binding für JeeLink USB Empfänger, LaCrosseGateways und damit verbundene Sensoren.
 
 # bridge types
 bridge-type.jeelinkUsb.label = JeeLink USB Empfänger
diff --git a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_hu.properties b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_hu.properties
index 80bc03227..dbe489dac 100644
--- a/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_hu.properties
+++ b/bundles/org.openhab.binding.jeelink/src/main/resources/OH-INF/i18n/jeelink_hu.properties
@@ -1,6 +1,6 @@
-# binding
-binding.jeelink.name = JeeLink kötés
-binding.jeelink.description = Ez a kötés a JeeLink USB vevők, LaCrosse átjárók és kapcsolódó érzékelők kezelésére szolgál.
+# add-on
+addon.jeelink.name = JeeLink kötés
+addon.jeelink.description = Ez a kötés a JeeLink USB vevők, LaCrosse átjárók és kapcsolódó érzékelők kezelésére szolgál.
 
 # bridge types
 bridge-type.jeelinkUsb.label = JeeLink (USB kapcsolat)
diff --git a/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin.properties b/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin.properties
index b564f966d..fe1ad084a 100644
--- a/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin.properties
+++ b/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.jellyfin.name = Jellyfin Binding
-binding.jellyfin.description = This is the binding for Jellyfin the free software media system.
+addon.jellyfin.name = Jellyfin Binding
+addon.jellyfin.description = This is the binding for Jellyfin the free software media system.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin_it.properties b/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin_it.properties
index 04f67ede6..1adea3f3a 100644
--- a/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin_it.properties
+++ b/bundles/org.openhab.binding.jellyfin/src/main/resources/OH-INF/i18n/jellyfin_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.jellyfin.name = Binding Jellyfin
-binding.jellyfin.description = Questo è il binding per Jellyfin il software media system libero.
+addon.jellyfin.name = Binding Jellyfin
+addon.jellyfin.description = Questo è il binding per Jellyfin il software media system libero.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet.properties b/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet.properties
index ea0bda216..31fe45e24 100644
--- a/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet.properties
+++ b/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.juicenet.name = JuiceNet Binding
-binding.juicenet.description = This is the binding supporting the JuiceNet EV charger.
+addon.juicenet.name = JuiceNet Binding
+addon.juicenet.description = This is the binding supporting the JuiceNet EV charger.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet_it.properties b/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet_it.properties
index 35e6683b1..02795d875 100644
--- a/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet_it.properties
+++ b/bundles/org.openhab.binding.juicenet/src/main/resources/OH-INF/i18n/juicenet_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.juicenet.name = Gestore JuiceNet
-binding.juicenet.description = Questo è il gestore che supporta il caricabatterie JuiceNet EV.
+addon.juicenet.name = Gestore JuiceNet
+addon.juicenet.description = Questo è il gestore che supporta il caricabatterie JuiceNet EV.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.kaleidescape/src/main/resources/OH-INF/i18n/kaleidescape.properties b/bundles/org.openhab.binding.kaleidescape/src/main/resources/OH-INF/i18n/kaleidescape.properties
index 6e993f08f..b03fc5a09 100644
--- a/bundles/org.openhab.binding.kaleidescape/src/main/resources/OH-INF/i18n/kaleidescape.properties
+++ b/bundles/org.openhab.binding.kaleidescape/src/main/resources/OH-INF/i18n/kaleidescape.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.kaleidescape.name = Kaleidescape Binding
-binding.kaleidescape.description = Controls a Kaleidescape Movie Player
+addon.kaleidescape.name = Kaleidescape Binding
+addon.kaleidescape.description = Controls a Kaleidescape Movie Player
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/i18n/keba.properties b/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/i18n/keba.properties
index c6b061fe4..a43c6673c 100644
--- a/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/i18n/keba.properties
+++ b/bundles/org.openhab.binding.keba/src/main/resources/OH-INF/i18n/keba.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.keba.name = Keba Binding
-binding.keba.description = This is the binding for Keba EV Charging Stations
+addon.keba.name = Keba Binding
+addon.keba.description = This is the binding for Keba EV Charging Stations
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.km200/src/main/resources/OH-INF/i18n/km200.properties b/bundles/org.openhab.binding.km200/src/main/resources/OH-INF/i18n/km200.properties
index 7851dba1e..342f93aab 100644
--- a/bundles/org.openhab.binding.km200/src/main/resources/OH-INF/i18n/km200.properties
+++ b/bundles/org.openhab.binding.km200/src/main/resources/OH-INF/i18n/km200.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.km200.name = KM200 Binding
-binding.km200.description = The KM200 Binding is communicating with a Buderus Logamatic web KM200 / KM100 / KM50 gateway. These devices are gateways for heating systems and allows to control them. It is possible to receive and send parameters.
+addon.km200.name = KM200 Binding
+addon.km200.description = The KM200 Binding is communicating with a Buderus Logamatic web KM200 / KM100 / KM50 gateway. These devices are gateways for heating systems and allows to control them. It is possible to receive and send parameters.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx.properties b/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx.properties
index c28549968..241a3ba53 100644
--- a/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx.properties
+++ b/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.knx.name = KNX Binding
-binding.knx.description = This binding supports connecting to a KNX bus
+addon.knx.name = KNX Binding
+addon.knx.description = This binding supports connecting to a KNX bus
 
 # thing types
 
@@ -152,7 +152,7 @@ channel-type.config.knx.single.ga.description = The group address(es) in Group A
 thing-type.config.knx.serial.group.knxsecure.label = KNX secure
 thing-type.config.knx.serial.group.knxsecure.description = Settings for KNX secure. Requires KNX secure features to be active in KNX installation.
 
-# binding specific strings
+# add-on specific strings
 
 error.knx-secure-routing-backbonegroupkey-invalid = backbonegroupkey invalid, please check if it is specified correctly
 error.knx-secure-routing-config-missing = Security configuration missing for secure routing
diff --git a/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx_de.properties b/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx_de.properties
index c70aa670b..7a910a074 100644
--- a/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx_de.properties
+++ b/bundles/org.openhab.binding.knx/src/main/resources/OH-INF/i18n/knx_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.knx.name = KNX Binding
-binding.knx.description = Dieses Binding unterstützt die Verbindung zum KNX Bus
+addon.knx.name = KNX Binding
+addon.knx.description = Dieses Binding unterstützt die Verbindung zum KNX Bus
 
 # thing types
 
@@ -152,7 +152,7 @@ channel-type.config.knx.single.ga.description = Die Gruppenadresse(n) in Gruppen
 thing-type.config.knx.serial.group.knxsecure.label = KNX Secure
 thing-type.config.knx.serial.group.knxsecure.description = Einstellungen für KNX Secure. Benötigt eine KNX Anlage mit aktiven KNX Secure Funktionen.
 
-# binding specific strings
+# add-on specific strings
 
 error.knx-secure-routing-backbonegroupkey-invalid = backbonegroupkey ungültig, bitte überprüfen Sie, ob er korrekt angegeben wurde
 error.knx-secure-routing-config-missing = Konfiguration für Secure Routing fehlt
diff --git a/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi.properties b/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi.properties
index 2bcb26100..147356c43 100644
--- a/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi.properties
+++ b/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.kodi.name = Kodi Binding
-binding.kodi.description = This is the binding for Kodi.
+addon.kodi.name = Kodi Binding
+addon.kodi.description = This is the binding for Kodi.
 
-# binding config
+# add-on config
 
-binding.config.kodi.callbackUrl.label = Callback URL
-binding.config.kodi.callbackUrl.description = url to use for playing notification sounds, e.g. http://192.168.0.2:8080
+addon.config.kodi.callbackUrl.label = Callback URL
+addon.config.kodi.callbackUrl.description = url to use for playing notification sounds, e.g. http://192.168.0.2:8080
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi_de.properties b/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi_de.properties
index d1add1c6b..1a68f382e 100644
--- a/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi_de.properties
+++ b/bundles/org.openhab.binding.kodi/src/main/resources/OH-INF/i18n/kodi_de.properties
@@ -1,10 +1,10 @@
-# binding
-binding.kodi.name = Kodi Binding
-binding.kodi.description = Dieses Binding integriert das Kodi Media Center. Durch dieses kann das Media Center gesteuert werden.
+# add-on
+addon.kodi.name = Kodi Binding
+addon.kodi.description = Dieses Binding integriert das Kodi Media Center. Durch dieses kann das Media Center gesteuert werden.
 
-# binding config
-binding.config.kodi.callbackUrl.label = Callback URL
-binding.config.kodi.callbackUrl.description = URL zum Abspielen von Benachrichtigungen (z.B. http://192.168.0.2:8080).
+# add-on config
+addon.config.kodi.callbackUrl.label = Callback URL
+addon.config.kodi.callbackUrl.description = URL zum Abspielen von Benachrichtigungen (z.B. http://192.168.0.2:8080).
 
 # thing types
 thing-type.kodi.kodi.label = Kodi Media Center
diff --git a/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/i18n/konnected.properties b/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/i18n/konnected.properties
index 93d5113c7..c08730b91 100644
--- a/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/i18n/konnected.properties
+++ b/bundles/org.openhab.binding.konnected/src/main/resources/OH-INF/i18n/konnected.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.konnected.name = Konnected Binding
-binding.konnected.description = This is the binding for Konnected.
+addon.konnected.name = Konnected Binding
+addon.konnected.description = This is the binding for Konnected.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter.properties b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter.properties
index 38e723592..18cda3a9a 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter.properties
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.kostalinverter.name = Kostal Inverter Binding
-binding.kostalinverter.description = Extracts informations from a Kostal Inverter
+addon.kostalinverter.name = Kostal Inverter Binding
+addon.kostalinverter.description = Extracts informations from a Kostal Inverter
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter_de.properties b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter_de.properties
index 86759bd81..661c4a3ea 100644
--- a/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter_de.properties
+++ b/bundles/org.openhab.binding.kostalinverter/src/main/resources/OH-INF/i18n/kostalinverter_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.kostalinverter.name = Kostal Inverter Binding
-binding.kostalinverter.description = Dieses Binding liest die Daten eines Kostal Wechselrichters aus dessen Weboberfläche aus.
+# add-on
+addon.kostalinverter.name = Kostal Inverter Binding
+addon.kostalinverter.description = Dieses Binding liest die Daten eines Kostal Wechselrichters aus dessen Weboberfläche aus.
 
 # thing types
 thing-type.kostalinverter.kostalinverter.description = Kostal Wechselrichter
diff --git a/bundles/org.openhab.binding.kvv/src/main/resources/OH-INF/i18n/kvv.properties b/bundles/org.openhab.binding.kvv/src/main/resources/OH-INF/i18n/kvv.properties
index 9f49f6060..c469ee921 100644
--- a/bundles/org.openhab.binding.kvv/src/main/resources/OH-INF/i18n/kvv.properties
+++ b/bundles/org.openhab.binding.kvv/src/main/resources/OH-INF/i18n/kvv.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.kvv.name = KVV Binding
-binding.kvv.description = This is the binding for KVV.
+addon.kvv.name = KVV Binding
+addon.kvv.description = This is the binding for KVV.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/i18n/lametrictime.properties b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/i18n/lametrictime.properties
index 43abd735b..80862a492 100644
--- a/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/i18n/lametrictime.properties
+++ b/bundles/org.openhab.binding.lametrictime/src/main/resources/OH-INF/i18n/lametrictime.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lametrictime.name = LaMetric Time Binding
-binding.lametrictime.description = This is the binding for LaMetric Time.
+addon.lametrictime.name = LaMetric Time Binding
+addon.lametrictime.description = This is the binding for LaMetric Time.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn.properties b/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn.properties
index af7307cb5..856f93450 100644
--- a/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn.properties
+++ b/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lcn.name = LCN Binding
-binding.lcn.description = This is the binding for Local Control Network (LCN)
+addon.lcn.name = LCN Binding
+addon.lcn.description = This is the binding for Local Control Network (LCN)
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn_de.properties b/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn_de.properties
index ee439de47..f6112a1c0 100644
--- a/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn_de.properties
+++ b/bundles/org.openhab.binding.lcn/src/main/resources/OH-INF/i18n/lcn_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lcn.name = LCN Binding
-binding.lcn.description = Binding für Local Control Network (LCN)
+addon.lcn.name = LCN Binding
+addon.lcn.description = Binding für Local Control Network (LCN)
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.leapmotion/src/main/resources/OH-INF/i18n/leapmotion.properties b/bundles/org.openhab.binding.leapmotion/src/main/resources/OH-INF/i18n/leapmotion.properties
index a7c86db72..339ea84e1 100644
--- a/bundles/org.openhab.binding.leapmotion/src/main/resources/OH-INF/i18n/leapmotion.properties
+++ b/bundles/org.openhab.binding.leapmotion/src/main/resources/OH-INF/i18n/leapmotion.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.leapmotion.name = Leap Motion Binding
-binding.leapmotion.description = This is the binding for Leap Motion controllers.
+addon.leapmotion.name = Leap Motion Binding
+addon.leapmotion.description = This is the binding for Leap Motion controllers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot.properties b/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot.properties
index 84b83271b..b91e97b15 100644
--- a/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot.properties
+++ b/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot.properties
@@ -1,6 +1,6 @@
-# binding
-binding.lghombot.name = LG HomBot Binding
-binding.lghombot.description = The LG HomBot binding allows control and supervision of your HomBot.
+# add-on
+addon.lghombot.name = LG HomBot Binding
+addon.lghombot.description = The LG HomBot binding allows control and supervision of your HomBot.
 
 # thing types
 thing-type.lghombot.LGHomBot.label = LG HomBot
diff --git a/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot_sv.properties b/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot_sv.properties
index 77a08bab1..af6314d78 100644
--- a/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot_sv.properties
+++ b/bundles/org.openhab.binding.lghombot/src/main/resources/OH-INF/i18n/lghombot_sv.properties
@@ -1,6 +1,6 @@
-# binding
-binding.lghombot.name = LG HomBot Binding
-binding.lghombot.description = LG HomBot binding tillåter kontrol och övervakning av din HomBot.
+# add-on
+addon.lghombot.name = LG HomBot Binding
+addon.lghombot.description = LG HomBot binding tillåter kontrol och övervakning av din HomBot.
 
 # thing types
 thing-type.lghombot.LGHomBot.label = LG HomBot
diff --git a/bundles/org.openhab.binding.lgtvserial/src/main/resources/OH-INF/i18n/lgtvserial.properties b/bundles/org.openhab.binding.lgtvserial/src/main/resources/OH-INF/i18n/lgtvserial.properties
index 317fc7d3f..ed5fe2bb5 100644
--- a/bundles/org.openhab.binding.lgtvserial/src/main/resources/OH-INF/i18n/lgtvserial.properties
+++ b/bundles/org.openhab.binding.lgtvserial/src/main/resources/OH-INF/i18n/lgtvserial.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lgtvserial.name = LG TV Serial Binding
-binding.lgtvserial.description = Controlling LG TVs using serial (RS232C) protocol
+addon.lgtvserial.name = LG TV Serial Binding
+addon.lgtvserial.description = Controlling LG TVs using serial (RS232C) protocol
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos.properties b/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos.properties
index 361f4d17c..bfb22383f 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos.properties
+++ b/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lgwebos.name = LG webOS Binding
-binding.lgwebos.description = Binding to connect LG's WebOS based smart TVs
+addon.lgwebos.name = LG webOS Binding
+addon.lgwebos.description = Binding to connect LG's WebOS based smart TVs
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos_fr.properties b/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos_fr.properties
index 45a5c7695..3f4101d03 100644
--- a/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos_fr.properties
+++ b/bundles/org.openhab.binding.lgwebos/src/main/resources/OH-INF/i18n/lgwebos_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lgwebos.name = Extension LG webOS
-binding.lgwebos.description = Cette extension permet de contrôler les téléviseurs connectés de la marque LG reposant sur le système d'exploitation webOS.
+addon.lgwebos.name = Extension LG webOS
+addon.lgwebos.description = Cette extension permet de contrôler les téléviseurs connectés de la marque LG reposant sur le système d'exploitation webOS.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx.properties b/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx.properties
index 98c629c50..fbc45416a 100644
--- a/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx.properties
+++ b/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx.properties
@@ -1,6 +1,6 @@
-# binding
-binding.lifx.name = LIFX Binding
-binding.lifx.description = This is the binding for LIFX lights.
+# add-on
+addon.lifx.name = LIFX Binding
+addon.lifx.description = This is the binding for LIFX lights.
 
 # thing types
 thing-type.lifx.colorlight.label = LIFX Color Light
diff --git a/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx_nl.properties b/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx_nl.properties
index fa6e0753b..5f72ce138 100644
--- a/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx_nl.properties
+++ b/bundles/org.openhab.binding.lifx/src/main/resources/OH-INF/i18n/lifx_nl.properties
@@ -1,6 +1,6 @@
-# binding
-binding.lifx.name = LIFX Binding
-binding.lifx.description = Dit is de binding voor LIFX lampen.
+# add-on
+addon.lifx.name = LIFX Binding
+addon.lifx.description = Dit is de binding voor LIFX lampen.
 
 # thing types
 thing-type.lifx.colorlight.label = LIFX Kleuren Lamp
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky.properties b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky.properties
index 33e37a02f..9eeaf4460 100644
--- a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky.properties
+++ b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.linky.name = Linky Binding
-binding.linky.description = Retrieves your energy consumption data from Enedis website
+addon.linky.name = Linky Binding
+addon.linky.description = Retrieves your energy consumption data from Enedis website
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky_fr.properties b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky_fr.properties
index 2c81df4c6..a62d52db7 100644
--- a/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky_fr.properties
+++ b/bundles/org.openhab.binding.linky/src/main/resources/OH-INF/i18n/linky_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.linky.name = Extension Linky
-binding.linky.description = Cette extension collecte vos données de consommation d'énergie depuis le site internet d'Enedis.
+addon.linky.name = Extension Linky
+addon.linky.description = Cette extension collecte vos données de consommation d'énergie depuis le site internet d'Enedis.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/i18n/linuxinput.properties b/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/i18n/linuxinput.properties
index 4dcd2a924..b401d6bed 100644
--- a/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/i18n/linuxinput.properties
+++ b/bundles/org.openhab.binding.linuxinput/src/main/resources/OH-INF/i18n/linuxinput.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.linuxinput.name = LinuxInput Binding
-binding.linuxinput.description = This is the binding for LinuxInput.
+addon.linuxinput.name = LinuxInput Binding
+addon.linuxinput.description = This is the binding for LinuxInput.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lirc/src/main/resources/OH-INF/i18n/lirc.properties b/bundles/org.openhab.binding.lirc/src/main/resources/OH-INF/i18n/lirc.properties
index 6f5771637..61d570c3d 100644
--- a/bundles/org.openhab.binding.lirc/src/main/resources/OH-INF/i18n/lirc.properties
+++ b/bundles/org.openhab.binding.lirc/src/main/resources/OH-INF/i18n/lirc.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lirc.name = LIRC Binding
-binding.lirc.description = The LIRC binding allows transmission and receipt of standard infrared remote control signals via a LIRC server.
+addon.lirc.name = LIRC Binding
+addon.lirc.description = The LIRC binding allows transmission and receipt of standard infrared remote control signals via a LIRC server.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome.properties b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome.properties
index 264cfb5c9..71618fd70 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome.properties
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.livisismarthome.name = LIVISI SmartHome Binding
-binding.livisismarthome.description = The LIVISI SmartHome binding integrates your LIVISI SmartHome system.
+addon.livisismarthome.name = LIVISI SmartHome Binding
+addon.livisismarthome.description = The LIVISI SmartHome binding integrates your LIVISI SmartHome system.
 
 # common messages
 
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_de.properties b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_de.properties
index 1e7d34470..4c193c694 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_de.properties
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.livisismarthome.name = LIVISI SmartHome Binding
-binding.livisismarthome.description = Das LIVISI SmartHome Binding verbindet dein LIVISI SmartHome System mit openHAB.
+addon.livisismarthome.name = LIVISI SmartHome Binding
+addon.livisismarthome.description = Das LIVISI SmartHome Binding verbindet dein LIVISI SmartHome System mit openHAB.
 
 # common messages
 
diff --git a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_it.properties b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_it.properties
index 0d388f586..7b5258d93 100644
--- a/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_it.properties
+++ b/bundles/org.openhab.binding.livisismarthome/src/main/resources/OH-INF/i18n/livisismarthome_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.livisismarthome.name = Binding LIVISI SmartHome
-binding.livisismarthome.description = Il binding LIVISI SmartHome integra il sistema LIVISI SmartHome.
+addon.livisismarthome.name = Binding LIVISI SmartHome
+addon.livisismarthome.description = Il binding LIVISI SmartHome integra il sistema LIVISI SmartHome.
 
 # common messages
 
diff --git a/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader.properties b/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader.properties
index 0008f9e77..4e95c2518 100644
--- a/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader.properties
+++ b/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.logreader.name = LogReader Binding
-binding.logreader.description = Binding that reads through log files and searches e.g. errors and warnings
+addon.logreader.name = LogReader Binding
+addon.logreader.description = Binding that reads through log files and searches e.g. errors and warnings
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader_de.properties b/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader_de.properties
index 0aea5a103..9a2044ee0 100644
--- a/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader_de.properties
+++ b/bundles/org.openhab.binding.logreader/src/main/resources/OH-INF/i18n/logreader_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.logreader.name = LogReader Binding
-binding.logreader.description = Das LogReader Binding ermöglicht es Logdateien zu überwachen und auf Fehler, Warnungen oder benutzerdefinierte Einträge zu durchsuchen.
+addon.logreader.name = LogReader Binding
+addon.logreader.description = Das LogReader Binding ermöglicht es Logdateien zu überwachen und auf Fehler, Warnungen oder benutzerdefinierte Einträge zu durchsuchen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/i18n/loxone.properties b/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/i18n/loxone.properties
index 640cdce98..d0c41007f 100644
--- a/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/i18n/loxone.properties
+++ b/bundles/org.openhab.binding.loxone/src/main/resources/OH-INF/i18n/loxone.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.loxone.name = Loxone Binding
-binding.loxone.description = This is the binding for Loxone Miniserver
+addon.loxone.name = Loxone Binding
+addon.loxone.description = This is the binding for Loxone Miniserver
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo.properties b/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo.properties
index 9bd90d74e..de3613822 100644
--- a/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo.properties
+++ b/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.luftdateninfo.name = LuftdatenInfo Binding
-binding.luftdateninfo.description = Binding to integrate DIY Sensors from luftdaten.info Sensor Community
+addon.luftdateninfo.name = LuftdatenInfo Binding
+addon.luftdateninfo.description = Binding to integrate DIY Sensors from luftdaten.info Sensor Community
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo_de.properties b/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo_de.properties
index 34cc26d1e..1ba9feb21 100644
--- a/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo_de.properties
+++ b/bundles/org.openhab.binding.luftdateninfo/src/main/resources/OH-INF/i18n/luftdateninfo_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.luftdateninfo.name = LuftdatenInfo Binding
-binding.luftdateninfo.description = Das Binding stellt die Daten der Eigenbau-Sensoren von LuftdatenInfo zur Verfügung
+addon.luftdateninfo.name = LuftdatenInfo Binding
+addon.luftdateninfo.description = Das Binding stellt die Daten der Eigenbau-Sensoren von LuftdatenInfo zur Verfügung
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/i18n/lutron.properties b/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/i18n/lutron.properties
index 3d3ddf7ea..380a03c85 100644
--- a/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/i18n/lutron.properties
+++ b/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/i18n/lutron.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.lutron.name = Lutron Binding
-binding.lutron.description = The Lutron binding interfaces with Lutron lighting control and home automation systems such as RadioRA, RadioRA 2, HomeWorks, HomeWorks QS, RA2 Select, Caseta, and GRAFIK Eye.
+addon.lutron.name = Lutron Binding
+addon.lutron.description = The Lutron binding interfaces with Lutron lighting control and home automation systems such as RadioRA, RadioRA 2, HomeWorks, HomeWorks QS, RA2 Select, Caseta, and GRAFIK Eye.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom.properties b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom.properties
index 4c8a8c189..36c1cf626 100644
--- a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom.properties
+++ b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.luxom.name = Luxom Binding
-binding.luxom.description = This is the binding for Luxom bus system (https://www.luxom.io/)
+addon.luxom.name = Luxom Binding
+addon.luxom.description = This is the binding for Luxom bus system (https://www.luxom.io/)
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_fr.properties b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_fr.properties
index 9a3de2216..a7e09d397 100644
--- a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_fr.properties
+++ b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.luxom.name = Extension Luxom
-binding.luxom.description = Ceci est l'extension pour le système de bus Luxom (https\://www.luxom.io/).
+addon.luxom.name = Extension Luxom
+addon.luxom.description = Ceci est l'extension pour le système de bus Luxom (https\://www.luxom.io/).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_it.properties b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_it.properties
index 7b839f39f..2b97110a5 100644
--- a/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_it.properties
+++ b/bundles/org.openhab.binding.luxom/src/main/resources/OH-INF/i18n/luxom_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.luxom.name = Binding Luxom
-binding.luxom.description = Questo è il binding per il Luxom bus system (https\://www.luxom.io/)
+addon.luxom.name = Binding Luxom
+addon.luxom.description = Questo è il binding per il Luxom bus system (https\://www.luxom.io/)
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties
index 9fa56f201..40925b365 100644
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.luxtronikheatpump.name = Luxtronik Heatpump Binding
-binding.luxtronikheatpump.description = This is the binding for a Heatpump with Luxtronik control.
+addon.luxtronikheatpump.name = Luxtronik Heatpump Binding
+addon.luxtronikheatpump.description = This is the binding for a Heatpump with Luxtronik control.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties
index ed5b92764..796bdede6 100644
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.luxtronikheatpump.name = Luxtronik Wärmepumpen Binding
-binding.luxtronikheatpump.description = Dieses Binding integriert Wärmepumpen mit einer Luxtronik-Steuerung.
+addon.luxtronikheatpump.name = Luxtronik Wärmepumpen Binding
+addon.luxtronikheatpump.description = Dieses Binding integriert Wärmepumpen mit einer Luxtronik-Steuerung.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv.properties b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv.properties
index 5093563eb..7b3551d1a 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv.properties
+++ b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.magentatv.name = MagentaTV Binding
-binding.magentatv.description = This is the binding for MagentaTV receivers
+addon.magentatv.name = MagentaTV Binding
+addon.magentatv.description = This is the binding for MagentaTV receivers
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties
index e382f1b50..27e4683fc 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties
+++ b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.magentatv.name = MagentaTV Binding
-binding.magentatv.description = Dieses Binding integriert Telekom MagentaTV Receiver.
+addon.magentatv.name = MagentaTV Binding
+addon.magentatv.description = Dieses Binding integriert Telekom MagentaTV Receiver.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties
index f526993d3..9deedf1b2 100644
--- a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties
+++ b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mail.name = Mail Binding
-binding.mail.description = This binding is used to access POP3, IMAP and SMTP servers.
+addon.mail.name = Mail Binding
+addon.mail.description = This binding is used to access POP3, IMAP and SMTP servers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_de.properties b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_de.properties
index aad1f9cc4..da30ac778 100644
--- a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_de.properties
+++ b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mail.name = Mail Binding
-binding.mail.description = Dieses Binding kann verwendet werden, um auf POP3, IMAP und SMTP Server zuzugreifen.
+addon.mail.name = Mail Binding
+addon.mail.description = Dieses Binding kann verwendet werden, um auf POP3, IMAP und SMTP Server zuzugreifen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_fr.properties b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_fr.properties
index 807b6aee5..7b2a15a2c 100644
--- a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_fr.properties
+++ b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mail.name = Extension Mail
-binding.mail.description = Cette extension est utilisée pour accéder aux serveurs POP3, IMAP et SMTP.
+addon.mail.name = Extension Mail
+addon.mail.description = Cette extension est utilisée pour accéder aux serveurs POP3, IMAP et SMTP.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_hu.properties b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_hu.properties
index 78b1b8bcd..cda93fcd3 100644
--- a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_hu.properties
+++ b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mail.name = Levelezés kötés
-binding.mail.description = Ez a kötés lehetővé teszi a POP3, IMAP és SMTP kiszolgáló kapcsolódását.
+addon.mail.name = Levelezés kötés
+addon.mail.description = Ez a kötés lehetővé teszi a POP3, IMAP és SMTP kiszolgáló kapcsolódását.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max.properties b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max.properties
index 4c1f02f10..4897a49d1 100644
--- a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max.properties
+++ b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.max.name = MAX! Binding
-binding.max.description = This is the binding for the eQ-3 MAX! Home Solution.
+addon.max.name = MAX! Binding
+addon.max.description = This is the binding for the eQ-3 MAX! Home Solution.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max_de.properties b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max_de.properties
index 6ffecc27f..a5c5ffc60 100644
--- a/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max_de.properties
+++ b/bundles/org.openhab.binding.max/src/main/resources/OH-INF/i18n/max_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.max.name = MAX\! Heizungssteuerung Binding
-binding.max.description = Dieses Binding integriert die MAX\! Heizungssteuerung (z.B. Heizkörperthermostat, Heizkörperthermostat+, Wandthermostat+, Eco Taster, Fensterkontakt).
+addon.max.name = MAX\! Heizungssteuerung Binding
+addon.max.description = Dieses Binding integriert die MAX\! Heizungssteuerung (z.B. Heizkörperthermostat, Heizkörperthermostat+, Wandthermostat+, Eco Taster, Fensterkontakt).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd.properties b/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd.properties
index 696e9b9f2..29b3a21f7 100644
--- a/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd.properties
+++ b/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mcd.name = MCD Binding
-binding.mcd.description = This binding allows you to send sensor events from your openHAB environment to the cloud application Managing Care Digital (MCD) by C&S Computer und Software GmbH (https://www.managingcare.de/). MCD is the platform for inpatient and outpatient nursing services. Our REST API allows you to send a variety of sensor events to the system and thus being able to connect your Ambient Assisted Living (AAL) or smart home environment to the documentation software of your nursing service. Please note that a valid account is needed to access MCD and the Sensor API.
+addon.mcd.name = MCD Binding
+addon.mcd.description = This binding allows you to send sensor events from your openHAB environment to the cloud application Managing Care Digital (MCD) by C&S Computer und Software GmbH (https://www.managingcare.de/). MCD is the platform for inpatient and outpatient nursing services. Our REST API allows you to send a variety of sensor events to the system and thus being able to connect your Ambient Assisted Living (AAL) or smart home environment to the documentation software of your nursing service. Please note that a valid account is needed to access MCD and the Sensor API.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd_it.properties b/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd_it.properties
index dfb93dc5e..b62d93fa6 100644
--- a/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd_it.properties
+++ b/bundles/org.openhab.binding.mcd/src/main/resources/OH-INF/i18n/mcd_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mcd.name = Binding MCD
-binding.mcd.description = Questo binding consente di inviare eventi del sensore dall'ambiente openHAB all'applicazione cloud Managing Care Digital (MCD) da C&S Computer und Software GmbH (https\://www. anagingcare.de/). MCD è la piattaforma per i servizi di assistenza ospedaliera e ambulatoriale. La nostra API REST consente di inviare al sistema una varietà di eventi sensori e quindi di collegare il vostro Ambient Assisted Living (AAL) o l'ambiente domestico intelligente al software di documentazione del vostro servizio di cura. Si prega di notare che un account valido è necessario per accedere a MCD e l'API Sensor.
+addon.mcd.name = Binding MCD
+addon.mcd.description = Questo binding consente di inviare eventi del sensore dall'ambiente openHAB all'applicazione cloud Managing Care Digital (MCD) da C&S Computer und Software GmbH (https\://www. anagingcare.de/). MCD è la piattaforma per i servizi di assistenza ospedaliera e ambulatoriale. La nostra API REST consente di inviare al sistema una varietà di eventi sensori e quindi di collegare il vostro Ambient Assisted Living (AAL) o l'ambiente domestico intelligente al software di documentazione del vostro servizio di cura. Si prega di notare che un account valido è necessario per accedere a MCD e l'API Sensor.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/i18n/mcp23017.properties b/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/i18n/mcp23017.properties
index cc1bf3185..22f837c88 100644
--- a/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/i18n/mcp23017.properties
+++ b/bundles/org.openhab.binding.mcp23017/src/main/resources/OH-INF/i18n/mcp23017.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mcp23017.name = MCP23017 Binding
-binding.mcp23017.description = This is the binding for MCP23017 I/O expansion chips.
+addon.mcp23017.name = MCP23017 Binding
+addon.mcp23017.description = This is the binding for MCP23017 I/O expansion chips.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater.properties b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater.properties
index bc50a1e60..a5e0b7837 100644
--- a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater.properties
+++ b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.meater.name = MEATER Binding
-binding.meater.description = This is the binding for MEATER probe.
+addon.meater.name = MEATER Binding
+addon.meater.description = This is the binding for MEATER probe.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_da.properties b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_da.properties
index befdef22f..405a412bc 100644
--- a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_da.properties
+++ b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_da.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.meater.name = MEATER Binding
-binding.meater.description = Dette er bindingen til MEATER trådløst stegetermometer.
+addon.meater.name = MEATER Binding
+addon.meater.description = Dette er bindingen til MEATER trådløst stegetermometer.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_fr.properties b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_fr.properties
index 2abe660ea..b7b3e4163 100644
--- a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_fr.properties
+++ b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.meater.name = Extension MEATER
-binding.meater.description = Il s'agit de l'extension pour la sonde MEATER.
+addon.meater.name = Extension MEATER
+addon.meater.description = Il s'agit de l'extension pour la sonde MEATER.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_it.properties b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_it.properties
index c050a72e3..e5b9d2ff0 100644
--- a/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_it.properties
+++ b/bundles/org.openhab.binding.meater/src/main/resources/OH-INF/i18n/meater_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.meater.name = Gestore MEATER
-binding.meater.description = Questo è il gestore per la sonda MEATER.
+addon.meater.name = Gestore MEATER
+addon.meater.description = Questo è il gestore per la sonda MEATER.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/i18n/mecmeter.properties b/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/i18n/mecmeter.properties
index 6c87ffa78..647e489ea 100644
--- a/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/i18n/mecmeter.properties
+++ b/bundles/org.openhab.binding.mecmeter/src/main/resources/OH-INF/i18n/mecmeter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mecmeter.name = mecMeter Binding
-binding.mecmeter.description = This is the binding for the din-rail power meter from MEC.
+addon.mecmeter.name = mecMeter Binding
+addon.mecmeter.description = This is the binding for the din-rail power meter from MEC.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/i18n/melcloud.properties b/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/i18n/melcloud.properties
index 5ee7dfecb..5df9122bd 100644
--- a/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/i18n/melcloud.properties
+++ b/bundles/org.openhab.binding.melcloud/src/main/resources/OH-INF/i18n/melcloud.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.melcloud.name = MELCloud Binding
-binding.melcloud.description = Binding for Mitsubishi MELCloud connected A.C. devices.
+addon.melcloud.name = MELCloud Binding
+addon.melcloud.description = Binding for Mitsubishi MELCloud connected A.C. devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme.properties b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme.properties
index e9328cf48..6bb95a97a 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme.properties
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mercedesme.name = Mercedes Me Binding
-binding.mercedesme.description = The binding provides access to your Mercedes developer account and vehicles
+addon.mercedesme.name = Mercedes Me Binding
+addon.mercedesme.description = The binding provides access to your Mercedes developer account and vehicles
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme_it.properties b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme_it.properties
index dd1623927..0b658c3ce 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme_it.properties
+++ b/bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/i18n/mercedesme_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mercedesme.name = Binding Mercedes Me
-binding.mercedesme.description = Il binding fornisce l'accesso al tuo account sviluppatore Mercedes e ai veicoli
+addon.mercedesme.name = Binding Mercedes Me
+addon.mercedesme.description = Il binding fornisce l'accesso al tuo account sviluppatore Mercedes e ai veicoli
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue.properties b/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue.properties
index 32db0fad1..0ff216099 100644
--- a/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue.properties
+++ b/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.meteoblue.name = meteoblue Binding
-binding.meteoblue.description = The meteoblue binding retrieves weather information from the meteoblue weather service.
+addon.meteoblue.name = meteoblue Binding
+addon.meteoblue.description = The meteoblue binding retrieves weather information from the meteoblue weather service.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue_fr.properties b/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue_fr.properties
index 8d8d411ef..28c0f781d 100644
--- a/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue_fr.properties
+++ b/bundles/org.openhab.binding.meteoblue/src/main/resources/OH-INF/i18n/meteoblue_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.meteoblue.name = Extension meteoblue
-binding.meteoblue.description = L'extension meteoblue interroge le service meteoblue pour récupérer les prévisions météorologiques.
+addon.meteoblue.name = Extension meteoblue
+addon.meteoblue.description = L'extension meteoblue interroge le service meteoblue pour récupérer les prévisions météorologiques.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.meteostick/src/main/resources/OH-INF/i18n/meteostick.properties b/bundles/org.openhab.binding.meteostick/src/main/resources/OH-INF/i18n/meteostick.properties
index 3126ff7d2..90164403a 100644
--- a/bundles/org.openhab.binding.meteostick/src/main/resources/OH-INF/i18n/meteostick.properties
+++ b/bundles/org.openhab.binding.meteostick/src/main/resources/OH-INF/i18n/meteostick.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.meteostick.name = MeteoStick Binding
-binding.meteostick.description = This is the binding for MeteoStick USB weather station receiver.
+addon.meteostick.name = MeteoStick Binding
+addon.meteostick.description = This is the binding for MeteoStick USB weather station receiver.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties
index 3517b67c6..d3d31eeb7 100644
--- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties
+++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.miele.name = Miele Binding
-binding.miele.description = This is the binding for Miele@home appliances
+addon.miele.name = Miele Binding
+addon.miele.description = This is the binding for Miele@home appliances
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_da.properties b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_da.properties
index 565a0f360..3fbaf4d7c 100644
--- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_da.properties
+++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_da.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.miele.name = Miele Binding
-binding.miele.description = Dette er bindingen til Miele@home-husholdningsapparater
+addon.miele.name = Miele Binding
+addon.miele.description = Dette er bindingen til Miele@home-husholdningsapparater
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_de.properties b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_de.properties
index 216008051..372c330da 100644
--- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_de.properties
+++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.miele.name = Miele Binding
-binding.miele.description = Das ist die Bindung für Miele@home Geräte
+addon.miele.name = Miele Binding
+addon.miele.description = Das ist die Bindung für Miele@home Geräte
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud.properties b/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud.properties
index bb407e3b1..e74b7d860 100644
--- a/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud.properties
+++ b/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud.properties
@@ -1,6 +1,6 @@
-# Binding related texts
-binding.mielecloud.name=Miele@home Cloud Binding
-binding.mielecloud.description=This is the cloud-based Miele@home binding.
+# add-on related texts
+addon.mielecloud.name=Miele@home Cloud Binding
+addon.mielecloud.description=This is the cloud-based Miele@home binding.
 
 # Thing related texts
 thing-type.mielecloud.account.label=Miele@home Account
diff --git a/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud_de.properties b/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud_de.properties
index 2f914cb99..ded1ce74c 100644
--- a/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud_de.properties
+++ b/bundles/org.openhab.binding.mielecloud/src/main/resources/OH-INF/i18n/mielecloud_de.properties
@@ -1,6 +1,6 @@
-# Binding related texts
-binding.mielecloud.name=Miele@home Cloud-Binding
-binding.mielecloud.description=Dies ist die Cloud-basierte Miele@home-Binding.
+# add-on related texts
+addon.mielecloud.name=Miele@home Cloud-Binding
+addon.mielecloud.description=Dies ist die Cloud-basierte Miele@home-Binding.
 
 # Thing related texts
 thing-type.mielecloud.account.label=Miele@home Konto
diff --git a/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/i18n/mihome.properties b/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/i18n/mihome.properties
index ed99edd0e..57e93a844 100644
--- a/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/i18n/mihome.properties
+++ b/bundles/org.openhab.binding.mihome/src/main/resources/OH-INF/i18n/mihome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mihome.name = Xiaomi Mi Smart Home Binding
-binding.mihome.description = Connects to Xiaomi Smart Gateway v2 and allows to communicate with Xiaomi Mi Smart Home suite (also called Xiaomi Aqara). The Gateway connects with a range of Xiaomi Zigbee sensors such as Wireless Switches, Wall Plugs or Temperature Sensors.
+addon.mihome.name = Xiaomi Mi Smart Home Binding
+addon.mihome.description = Connects to Xiaomi Smart Gateway v2 and allows to communicate with Xiaomi Mi Smart Home suite (also called Xiaomi Aqara). The Gateway connects with a range of Xiaomi Zigbee sensors such as Wireless Switches, Wall Plugs or Temperature Sensors.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/i18n/miio.properties b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/i18n/miio.properties
index 6386ec449..667b8f66d 100644
--- a/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/i18n/miio.properties
+++ b/bundles/org.openhab.binding.miio/src/main/resources/OH-INF/i18n/miio.properties
@@ -1,20 +1,20 @@
-# binding
+# add-on
 
-binding.miio.name = Xiaomi Wifi devices (Mi IO) Binding
-binding.miio.description = Binding for Xiaomi wifi devices (Mi IO protocol) which are normally controlled by the mihome app like Mi Robot Vacuums, Yeelights, Humidifiers, Fans etc.
+addon.miio.name = Xiaomi Wifi devices (Mi IO) Binding
+addon.miio.description = Binding for Xiaomi wifi devices (Mi IO protocol) which are normally controlled by the mihome app like Mi Robot Vacuums, Yeelights, Humidifiers, Fans etc.
 
-# binding config
+# add-on config
 
-binding.config.miio.cloudDiscoveryMode.label = Cloud Discovery Mode
-binding.config.miio.cloudDiscoveryMode.description = Allow for discovery via the cloud. This may be used for devices that are not on the same network as OpenHAB server
-binding.config.miio.cloudDiscoveryMode.option.disabled = Local discovery only (Default)
-binding.config.miio.cloudDiscoveryMode.option.supportedOnly = Discover online supported devices from Xiaomi cloud
-binding.config.miio.cloudDiscoveryMode.option.all = Discover all online devices from Xiaomi cloud
-binding.config.miio.country.label = Xiaomi server country
-binding.config.miio.country.description = Xiaomi server country(s) (e.g. sg,de). Separate multiple servers with comma. Leave empty for all. See binding readme for country to server mapping
-binding.config.miio.password.label = Xiaomi cloud password
-binding.config.miio.username.label = Xiaomi cloud username
-binding.config.miio.username.description = Xiaomi cloud username. Typically your email
+addon.config.miio.cloudDiscoveryMode.label = Cloud Discovery Mode
+addon.config.miio.cloudDiscoveryMode.description = Allow for discovery via the cloud. This may be used for devices that are not on the same network as OpenHAB server
+addon.config.miio.cloudDiscoveryMode.option.disabled = Local discovery only (Default)
+addon.config.miio.cloudDiscoveryMode.option.supportedOnly = Discover online supported devices from Xiaomi cloud
+addon.config.miio.cloudDiscoveryMode.option.all = Discover all online devices from Xiaomi cloud
+addon.config.miio.country.label = Xiaomi server country
+addon.config.miio.country.description = Xiaomi server country(s) (e.g. sg,de). Separate multiple servers with comma. Leave empty for all. See binding readme for country to server mapping
+addon.config.miio.password.label = Xiaomi cloud password
+addon.config.miio.username.label = Xiaomi cloud username
+addon.config.miio.username.description = Xiaomi cloud username. Typically your email
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mikrotik/src/main/resources/OH-INF/i18n/mikrotik.properties b/bundles/org.openhab.binding.mikrotik/src/main/resources/OH-INF/i18n/mikrotik.properties
index 6d81401ab..661eb15af 100644
--- a/bundles/org.openhab.binding.mikrotik/src/main/resources/OH-INF/i18n/mikrotik.properties
+++ b/bundles/org.openhab.binding.mikrotik/src/main/resources/OH-INF/i18n/mikrotik.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mikrotik.name = Mikrotik Binding
-binding.mikrotik.description = This is the binding for integrating Mikrotik RouterOS powered devices (routers, access points, switches, etc) to facilitate WiFi clients and network interface tracking.
+addon.mikrotik.name = Mikrotik Binding
+addon.mikrotik.description = This is the binding for integrating Mikrotik RouterOS powered devices (routers, access points, switches, etc) to facilitate WiFi clients and network interface tracking.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/i18n/milight.properties b/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/i18n/milight.properties
index 918d9b26b..642575bc3 100644
--- a/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/i18n/milight.properties
+++ b/bundles/org.openhab.binding.milight/src/main/resources/OH-INF/i18n/milight.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.milight.name = Milight Binding
-binding.milight.description = A binding for Milight/Easybulb/compatible white, color and color+white bulbs.
+addon.milight.name = Milight Binding
+addon.milight.description = A binding for Milight/Easybulb/compatible white, color and color+white bulbs.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/i18n/millheat.properties b/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/i18n/millheat.properties
index 58b7063f7..436c2de66 100644
--- a/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/i18n/millheat.properties
+++ b/bundles/org.openhab.binding.millheat/src/main/resources/OH-INF/i18n/millheat.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.millheat.name = Millheat Binding
-binding.millheat.description = This is the binding for Mill Heat Wi-Fi enabled heaters. See https://www.millheat.com/mill-wifi/
+addon.millheat.name = Millheat Binding
+addon.millheat.description = This is the binding for Mill Heat Wi-Fi enabled heaters. See https://www.millheat.com/mill-wifi/
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.minecraft/src/main/resources/OH-INF/i18n/minecraft.properties b/bundles/org.openhab.binding.minecraft/src/main/resources/OH-INF/i18n/minecraft.properties
index d2b74dcc7..0ed41b87b 100644
--- a/bundles/org.openhab.binding.minecraft/src/main/resources/OH-INF/i18n/minecraft.properties
+++ b/bundles/org.openhab.binding.minecraft/src/main/resources/OH-INF/i18n/minecraft.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.minecraft.name = Minecraft Binding
-binding.minecraft.description = This binding can integrate Minecraft servers.
+addon.minecraft.name = Minecraft Binding
+addon.minecraft.description = This binding can integrate Minecraft servers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/i18n/helioseasycontrols_de.properties b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/i18n/helioseasycontrols_de.properties
index a66e32117..72008c239 100644
--- a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/i18n/helioseasycontrols_de.properties
+++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/resources/OH-INF/i18n/helioseasycontrols_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.modbus.name = HeliosEasyControls Binding
-binding.modbus.description = Dieses Binding erlaubt die Integration von Helios KWL Geräten mit easyControls via Modbus TCP
+# add-on
+addon.modbus.name = HeliosEasyControls Binding
+addon.modbus.description = Dieses Binding erlaubt die Integration von Helios KWL Geräten mit easyControls via Modbus TCP
 
 # thing type
 thing-type.modbus.helios-easycontrols.label = Helios KWL
diff --git a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties
index bee8c2ea9..808c541c8 100644
--- a/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties
+++ b/bundles/org.openhab.binding.modbus/src/main/resources/OH-INF/i18n/modbus.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.modbus.name = Modbus Binding
-binding.modbus.description = Binding for Modbus
+addon.modbus.name = Modbus Binding
+addon.modbus.description = Binding for Modbus
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.monopriceaudio/src/main/resources/OH-INF/i18n/monopriceaudio.properties b/bundles/org.openhab.binding.monopriceaudio/src/main/resources/OH-INF/i18n/monopriceaudio.properties
index 1b163efe4..dd1c89728 100644
--- a/bundles/org.openhab.binding.monopriceaudio/src/main/resources/OH-INF/i18n/monopriceaudio.properties
+++ b/bundles/org.openhab.binding.monopriceaudio/src/main/resources/OH-INF/i18n/monopriceaudio.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.monopriceaudio.name = Monoprice Whole House Audio Binding
-binding.monopriceaudio.description = Controls Monoprice and Dayton Audio Whole House Amplifiers.
+addon.monopriceaudio.name = Monoprice Whole House Audio Binding
+addon.monopriceaudio.description = Controls Monoprice and Dayton Audio Whole House Amplifiers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd.properties b/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd.properties
index 763b6d886..4449f02b5 100644
--- a/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd.properties
+++ b/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mpd.name = MPD Binding
-binding.mpd.description = This is the binding for the Music Player Daemon.
+addon.mpd.name = MPD Binding
+addon.mpd.description = This is the binding for the Music Player Daemon.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd_de.properties b/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd_de.properties
index efbc6eed0..40d70e4ec 100644
--- a/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd_de.properties
+++ b/bundles/org.openhab.binding.mpd/src/main/resources/OH-INF/i18n/mpd_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mpd.name = MPD Binding
-binding.mpd.description = Das MPD Binding erlaubt es Music Player Daemons zu steuern.
+addon.mpd.name = MPD Binding
+addon.mpd.description = Das MPD Binding erlaubt es Music Player Daemons zu steuern.
 
 # thing types
 
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 dcb27b71a..cca71bcec 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
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mqtt.name = MQTT Binding
-binding.mqtt.description = Allows management of MQTT broker connections and linking of MQTT topics to Things and Channels
+addon.mqtt.name = MQTT Binding
+addon.mqtt.description = Allows management of MQTT broker connections and linking of MQTT topics to Things and Channels
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_de.properties b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_de.properties
index 050a879b1..3bd562095 100644
--- a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_de.properties
+++ b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mqtt.name = MQTT Binding
-binding.mqtt.description = Erlaubt die Verwaltung von MQTT Verbindungen und das Verknüpfen von MQTT Topics
+addon.mqtt.name = MQTT Binding
+addon.mqtt.description = Erlaubt die Verwaltung von MQTT Verbindungen und das Verknüpfen von MQTT Topics
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_hu.properties b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_hu.properties
index 275c41012..044cb1c2a 100644
--- a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_hu.properties
+++ b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mqtt.name = MQTT kötés
-binding.mqtt.description = MQTT bróker kezelését teszi lehetővé, mellyel MQTT témákat kapcsolhat dolgokhoz és csatornákhoz
+addon.mqtt.name = MQTT kötés
+addon.mqtt.description = MQTT bróker kezelését teszi lehetővé, mellyel MQTT témákat kapcsolhat dolgokhoz és csatornákhoz
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_it.properties b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_it.properties
index bca9a3751..056feb886 100644
--- a/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_it.properties
+++ b/bundles/org.openhab.binding.mqtt/src/main/resources/OH-INF/i18n/mqtt_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mqtt.name = Binding MQTT
-binding.mqtt.description = Consente la gestione delle connessioni dei broker MQTT e il collegamento dei Topic MQTT alle Thing e ai Channel
+addon.mqtt.name = Binding MQTT
+addon.mqtt.description = Consente la gestione delle connessioni dei broker MQTT e il collegamento dei Topic MQTT alle Thing e ai Channel
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties
index f5a1129b0..2cbf443a2 100644
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mybmw.name = MyBMW
-binding.mybmw.description = Provides access to your Vehicle Data like MyBMW App
+addon.mybmw.name = MyBMW
+addon.mybmw.description = Provides access to your Vehicle Data like MyBMW App
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw_de.properties b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw_de.properties
index 929220e4f..060bada39 100644
--- a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw_de.properties
+++ b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw_de.properties
@@ -1,6 +1,6 @@
-# Binding
-binding.mybmw.name = MyBMW
-binding.mybmw.description = Fahrzeugdaten �ber die MyBMW App
+# add-on
+addon.mybmw.name = MyBMW
+addon.mybmw.description = Fahrzeugdaten �ber die MyBMW App
 
 # bridge types
 thing-type.mybmw.account.label = MyBMW Benutzerkonto
diff --git a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft.properties b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft.properties
index 0e267f734..d9c80e3ce 100644
--- a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft.properties
+++ b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mycroft.name = Mycroft Binding
-binding.mycroft.description = Connects to a Mycroft instance in order to receive information from, and send commands to it. Typical usage includes triggering Mycroft to listen (as if a wake word was detected), sending text for Mycroft to speak, reacting on some specific intent, command skills by faking a spoken utterance, etc.
+addon.mycroft.name = Mycroft Binding
+addon.mycroft.description = Connects to a Mycroft instance in order to receive information from, and send commands to it. Typical usage includes triggering Mycroft to listen (as if a wake word was detected), sending text for Mycroft to speak, reacting on some specific intent, command skills by faking a spoken utterance, etc.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fi.properties b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fi.properties
index 9e255abc1..b21ceff9f 100644
--- a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fi.properties
+++ b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mycroft.name = Mycroft-lisäosa
-binding.mycroft.description = Muodostaa yhteyden Mycroftin-instanssiin tietojen lähettämistä ja vastaanottamista varten. Tyypillisiä käyttökohteita ovat Mycroftin kuuntelun liipaisu (kuten jos herätyssana havaittaisiin), tekstin lähettäminen puhuttavaksi, joihonkin tiettyyn aikeeseen reagoiminen, komennon lähettäminen hämäämällä puhetta, jne.
+addon.mycroft.name = Mycroft-lisäosa
+addon.mycroft.description = Muodostaa yhteyden Mycroftin-instanssiin tietojen lähettämistä ja vastaanottamista varten. Tyypillisiä käyttökohteita ovat Mycroftin kuuntelun liipaisu (kuten jos herätyssana havaittaisiin), tekstin lähettäminen puhuttavaksi, joihonkin tiettyyn aikeeseen reagoiminen, komennon lähettäminen hämäämällä puhetta, jne.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fr.properties b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fr.properties
index b08b7e263..820355381 100644
--- a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fr.properties
+++ b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mycroft.name = Extension Mycroft
-binding.mycroft.description = Cette extension se connecte à une enceinte Mycroft pour recevoir des informations et envoyer des commandes. Parmi les usages typiques \: déclencher l'écoute de Mycroft (comme si le mot de réveil avait été détecté), envoyer un texte pour qu'il soit énoncé, réagir à un Intent, commander à des Skills comme si une phrase avait été prononcée, etc.
+addon.mycroft.name = Extension Mycroft
+addon.mycroft.description = Cette extension se connecte à une enceinte Mycroft pour recevoir des informations et envoyer des commandes. Parmi les usages typiques \: déclencher l'écoute de Mycroft (comme si le mot de réveil avait été détecté), envoyer un texte pour qu'il soit énoncé, réagir à un Intent, commander à des Skills comme si une phrase avait été prononcée, etc.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_it.properties b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_it.properties
index 6e8a605d4..9487a8a52 100644
--- a/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_it.properties
+++ b/bundles/org.openhab.binding.mycroft/src/main/resources/OH-INF/i18n/mycroft_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mycroft.name = Binding Mycroft
-binding.mycroft.description = Si connette a un'istanza di Mycroft per ricevere informazioni e inviare comandi. L'uso tipico include l'attivazione di Mycroft per ascoltare (utilizzando una parola per svegliare), l'invio di testo per Mycroft per parlare, reagendo su qualche evento specifico, abilità di comando simulando un enunciato parlato, ecc.
+addon.mycroft.name = Binding Mycroft
+addon.mycroft.description = Si connette a un'istanza di Mycroft per ricevere informazioni e inviare comandi. L'uso tipico include l'attivazione di Mycroft per ascoltare (utilizzando una parola per svegliare), l'invio di testo per Mycroft per parlare, reagendo su qualche evento specifico, abilità di comando simulando un enunciato parlato, ecc.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.myq/src/main/resources/OH-INF/i18n/myq.properties b/bundles/org.openhab.binding.myq/src/main/resources/OH-INF/i18n/myq.properties
index 74cc4cc7d..7fafc355e 100644
--- a/bundles/org.openhab.binding.myq/src/main/resources/OH-INF/i18n/myq.properties
+++ b/bundles/org.openhab.binding.myq/src/main/resources/OH-INF/i18n/myq.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.myq.name = MyQ Binding
-binding.myq.description = The MyQ binding allows monitoring and control of garage doors that are MyQ enabled.
+addon.myq.name = MyQ Binding
+addon.myq.description = The MyQ binding allows monitoring and control of garage doors that are MyQ enabled.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/i18n/mystrom.properties b/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/i18n/mystrom.properties
index b5c44019d..18a914510 100644
--- a/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/i18n/mystrom.properties
+++ b/bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/i18n/mystrom.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.mystrom.name = myStrom Binding
-binding.mystrom.description = This is the binding for myStrom devices.
+addon.mystrom.name = myStrom Binding
+addon.mystrom.description = This is the binding for myStrom devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties
index f1cd2dac0..e2f12dd02 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf.properties
@@ -1,5 +1,5 @@
-binding.nanoleaf.name = Nanoleaf Binding
-binding.nanoleaf.description = Integrates the Nanoleaf light panels
+addon.nanoleaf.name = Nanoleaf Binding
+addon.nanoleaf.description = Integrates the Nanoleaf light panels
 
 # thing types
 thing-type.nanoleaf.controller.name = Nanoleaf Controller
diff --git a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf_de.properties b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf_de.properties
index 37da0e06e..7da3a7c4d 100644
--- a/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf_de.properties
+++ b/bundles/org.openhab.binding.nanoleaf/src/main/resources/OH-INF/i18n/nanoleaf_de.properties
@@ -1,5 +1,5 @@
-binding.nanoleaf.name = Nanoleaf Binding
-binding.nanoleaf.description = Binding für die Integration des Nanoleaf Light Panels (Ein mit dem Controller verbundenes Paneel)
+addon.nanoleaf.name = Nanoleaf Binding
+addon.nanoleaf.description = Binding für die Integration des Nanoleaf Light Panels (Ein mit dem Controller verbundenes Paneel)
 
 # thing types
 thing-type.nanoleaf.controller.name = Nanoleaf Controller
diff --git a/bundles/org.openhab.binding.neato/src/main/resources/OH-INF/i18n/neato.properties b/bundles/org.openhab.binding.neato/src/main/resources/OH-INF/i18n/neato.properties
index dd91726fb..15df67fef 100644
--- a/bundles/org.openhab.binding.neato/src/main/resources/OH-INF/i18n/neato.properties
+++ b/bundles/org.openhab.binding.neato/src/main/resources/OH-INF/i18n/neato.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.neato.name = Neato Binding
-binding.neato.description = This is the binding for Neato.
+addon.neato.name = Neato Binding
+addon.neato.description = This is the binding for Neato.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.neeo/src/main/resources/OH-INF/i18n/neeo.properties b/bundles/org.openhab.binding.neeo/src/main/resources/OH-INF/i18n/neeo.properties
index c922aa63a..b89de1bc0 100644
--- a/bundles/org.openhab.binding.neeo/src/main/resources/OH-INF/i18n/neeo.properties
+++ b/bundles/org.openhab.binding.neeo/src/main/resources/OH-INF/i18n/neeo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.neeo.name = Neeo Binding
-binding.neeo.description = This binding allows you to discover NEEO Brain(s), discover the Rooms within and the Devices within those Rooms. The binding then will expose that information to openHAB and allow you to execute Recipes/Scenarios and Macros on the Devices
+addon.neeo.name = Neeo Binding
+addon.neeo.description = This binding allows you to discover NEEO Brain(s), discover the Rooms within and the Devices within those Rooms. The binding then will expose that information to openHAB and allow you to execute Recipes/Scenarios and Macros on the Devices
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.neohub/src/main/resources/OH-INF/i18n/neohub.properties b/bundles/org.openhab.binding.neohub/src/main/resources/OH-INF/i18n/neohub.properties
index d29d02521..42032c884 100644
--- a/bundles/org.openhab.binding.neohub/src/main/resources/OH-INF/i18n/neohub.properties
+++ b/bundles/org.openhab.binding.neohub/src/main/resources/OH-INF/i18n/neohub.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.neohub.name = NeoHub Binding
-binding.neohub.description = This is the binding for Heatmiser NeoHub devices
+addon.neohub.name = NeoHub Binding
+addon.neohub.description = This is the binding for Heatmiser NeoHub devices
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nest/src/main/resources/OH-INF/i18n/nest.properties b/bundles/org.openhab.binding.nest/src/main/resources/OH-INF/i18n/nest.properties
index fa1732035..b328211a7 100644
--- a/bundles/org.openhab.binding.nest/src/main/resources/OH-INF/i18n/nest.properties
+++ b/bundles/org.openhab.binding.nest/src/main/resources/OH-INF/i18n/nest.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nest.name = Nest Binding
-binding.nest.description = Nest connects to the Nest cloud and allows control of the various Nest devices.
+addon.nest.name = Nest Binding
+addon.nest.description = Nest connects to the Nest cloud and allows control of the various Nest devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties
index 4c8f8d870..4f2f8042c 100644
--- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties
+++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.netatmo.name = Netatmo Binding
-binding.netatmo.description = The Netatmo binding integrates Weather Station with companion modules, Healthy Home Coach, Thermostat Plug and Welcome Camera.
+addon.netatmo.name = Netatmo Binding
+addon.netatmo.description = The Netatmo binding integrates Weather Station with companion modules, Healthy Home Coach, Thermostat Plug and Welcome Camera.
 
-# binding config
+# add-on config
 
-binding.config.netatmo.readFriends.label = Access Guests
-binding.config.netatmo.readFriends.description = For Weather Stations: A friend gave you access to their Netatmo Weather Station.
+addon.config.netatmo.readFriends.label = Access Guests
+addon.config.netatmo.readFriends.description = For Weather Stations: A friend gave you access to their Netatmo Weather Station.
 
 # channel group types
 
diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fi.properties b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fi.properties
index 8843feebe..73dfb9cac 100644
--- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fi.properties
+++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fi.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.netatmo.name = Netatmo-lisäosa
-binding.netatmo.description = Netatmo-lisäosa integroi sääaseman lisämoduleineen, Healthy Home Coachin, termostaatin ja Welcome-kameran.
+addon.netatmo.name = Netatmo-lisäosa
+addon.netatmo.description = Netatmo-lisäosa integroi sääaseman lisämoduleineen, Healthy Home Coachin, termostaatin ja Welcome-kameran.
 
-# binding config
+# add-on config
 
-binding.config.netatmo.readFriends.label = Pääsy vieraille
-binding.config.netatmo.readFriends.description = Sääasemille\: ystävä on antanut sinulle oikeudet omaan sääasemaansa.
+addon.config.netatmo.readFriends.label = Pääsy vieraille
+addon.config.netatmo.readFriends.description = Sääasemille\: ystävä on antanut sinulle oikeudet omaan sääasemaansa.
 
 # channel group types
 
diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fr.properties b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fr.properties
index 1c21f6f7f..8b349d5e3 100644
--- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fr.properties
+++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_fr.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.netatmo.name = Extension Netatmo
-binding.netatmo.description = L'extension Netatmo gère la Station Météo avec ses modules compagnons, le capteur de qualité d'air intérieur, les équipements de sécurité (Welcome, Presence..) et de contrôle de l'énergie (Thermostat, Vannes...).
+addon.netatmo.name = Extension Netatmo
+addon.netatmo.description = L'extension Netatmo gère la Station Météo avec ses modules compagnons, le capteur de qualité d'air intérieur, les équipements de sécurité (Welcome, Presence..) et de contrôle de l'énergie (Thermostat, Vannes...).
 
-# binding config
+# add-on config
 
-binding.config.netatmo.readFriends.label = Accès en tant qu'invité
-binding.config.netatmo.readFriends.description = Pour les Stations Météo \: Un ami vous a donné accès à sa Station Météo Netatmo.
+addon.config.netatmo.readFriends.label = Accès en tant qu'invité
+addon.config.netatmo.readFriends.description = Pour les Stations Météo \: Un ami vous a donné accès à sa Station Météo Netatmo.
 
 # channel group types
 
diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_it.properties b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_it.properties
index b422ca95a..1c886d01f 100644
--- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_it.properties
+++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo_it.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.netatmo.name = Binding Netatmo
-binding.netatmo.description = Il binding Netatmo integra la Stazione Meteo con altri moduli, Healthy Home Coach, Termostato Plug e Welcome Camera.
+addon.netatmo.name = Binding Netatmo
+addon.netatmo.description = Il binding Netatmo integra la Stazione Meteo con altri moduli, Healthy Home Coach, Termostato Plug e Welcome Camera.
 
-# binding config
+# add-on config
 
-binding.config.netatmo.readFriends.label = Accesso Ospiti
-binding.config.netatmo.readFriends.description = Per le Stazioni Meteorologiche\: Un amico ti ha dato accesso alla sua Stazione Meteo Netatmo.
+addon.config.netatmo.readFriends.label = Accesso Ospiti
+addon.config.netatmo.readFriends.description = Per le Stazioni Meteorologiche\: Un amico ti ha dato accesso alla sua Stazione Meteo Netatmo.
 
 # channel group types
 
diff --git a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network.properties b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network.properties
index 425e67c94..63752d76e 100644
--- a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network.properties
+++ b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network.properties
@@ -1,20 +1,20 @@
-# binding
+# add-on
 
-binding.network.name = Network Binding
-binding.network.description = The Network Binding can be used for device presence detection and to determine network device health
+addon.network.name = Network Binding
+addon.network.description = The Network Binding can be used for device presence detection and to determine network device health
 
-# binding config
+# add-on config
 
-binding.config.network.allowDHCPlisten.label = Listen for DHCP Requests
-binding.config.network.allowDHCPlisten.description = Usually a device requests an IP address in an IPv4 network with the help of DHCP as soon as it enters a network. If we listen to those packets, we can detect a device presence even faster. You need elevated access rights (see readme) for this to work.
-binding.config.network.allowSystemPings.label = Allow System Pings
-binding.config.network.allowSystemPings.description = Allows or disallows to use system pings next to the java integrated ping functionality. On windows the system ping works more reliable most of the time.
-binding.config.network.arpPingToolPath.label = ARP Ping Tool Path
-binding.config.network.arpPingToolPath.description = If your arp ping tool is not called arping and cannot be found in the PATH environment, you can configure the absolute path / tool name here.
-binding.config.network.cacheDeviceStateTimeInMS.label = Cache Time
-binding.config.network.cacheDeviceStateTimeInMS.description = The result of a device presence detection is cached for a small amount of time. Be aware that no new pings will be issued within this time frame, even if explicitly requested.
-binding.config.network.preferResponseTimeAsLatency.label = Use Response Time as Latency
-binding.config.network.preferResponseTimeAsLatency.description = If enabled, an attempt will be made to extract the latency from the output of the ping command. If no such latency value is found in the ping command output, the time to execute the ping command is used as fallback latency. If disabled, the time to execute the ping command is always used as latency value.
+addon.config.network.allowDHCPlisten.label = Listen for DHCP Requests
+addon.config.network.allowDHCPlisten.description = Usually a device requests an IP address in an IPv4 network with the help of DHCP as soon as it enters a network. If we listen to those packets, we can detect a device presence even faster. You need elevated access rights (see readme) for this to work.
+addon.config.network.allowSystemPings.label = Allow System Pings
+addon.config.network.allowSystemPings.description = Allows or disallows to use system pings next to the java integrated ping functionality. On windows the system ping works more reliable most of the time.
+addon.config.network.arpPingToolPath.label = ARP Ping Tool Path
+addon.config.network.arpPingToolPath.description = If your arp ping tool is not called arping and cannot be found in the PATH environment, you can configure the absolute path / tool name here.
+addon.config.network.cacheDeviceStateTimeInMS.label = Cache Time
+addon.config.network.cacheDeviceStateTimeInMS.description = The result of a device presence detection is cached for a small amount of time. Be aware that no new pings will be issued within this time frame, even if explicitly requested.
+addon.config.network.preferResponseTimeAsLatency.label = Use Response Time as Latency
+addon.config.network.preferResponseTimeAsLatency.description = If enabled, an attempt will be made to extract the latency from the output of the ping command. If no such latency value is found in the ping command output, the time to execute the ping command is used as fallback latency. If disabled, the time to execute the ping command is always used as latency value.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_de.properties b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_de.properties
index 666f6269d..be642eefc 100644
--- a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_de.properties
+++ b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_de.properties
@@ -1,20 +1,20 @@
-# binding
+# add-on
 
-binding.network.name = Network Binding
-binding.network.description = Das Network Binding überprüft, ob sich ein Gerät aktuell im Netzwerk befindet oder nicht.
+addon.network.name = Network Binding
+addon.network.description = Das Network Binding überprüft, ob sich ein Gerät aktuell im Netzwerk befindet oder nicht.
 
-# binding config
+# add-on config
 
-binding.config.network.allowDHCPlisten.label = Auf DHCP-Anfragen hören
-binding.config.network.allowDHCPlisten.description = Normalerweise fordert ein Gerät eine IP-Adresse in einem IPv4-Netzwerk mit Hilfe von DHCP an, sobald es mit einem Netzwerk verbunden ist. Wenn auf solche Pakete gehört wird,, kann eine Gerätepräsenz noch schneller erkannt werden. Sie benötigen erhöhte Zugriffsrechte (siehe readme) damit dies funktioniert.
-binding.config.network.allowSystemPings.label = System Pings erlauben
-binding.config.network.allowSystemPings.description = Erlaubt oder verbietet die Verwendung von Systempings neben der Java-integrierten Ping-Funktionalität. Bei Windows funktioniert das System Ping meistens zuverlässiger.
-binding.config.network.arpPingToolPath.label = ARP Ping Werkzeugpfad
-binding.config.network.arpPingToolPath.description = Wenn Ihr Arping-Werkzeug nicht Arping genannt wird und nicht in der PATH-Umgebung gefunden werden kann, können sie hier den absoluten Pfad/Werkzeugnamen einstellen.
-binding.config.network.cacheDeviceStateTimeInMS.label = Cache-Zeit
-binding.config.network.cacheDeviceStateTimeInMS.description = Das Ergebnis einer Präsenzerkennung wird für eine kurze Zeit zwischengespeichert. Beachten Sie, dass innerhalb dieses Zeitrahmens keine neuen Pings ausgestellt werden, auch wenn dies ausdrücklich gefordert wird.
-binding.config.network.preferResponseTimeAsLatency.label = Antwortzeit als Latenz verwenden
-binding.config.network.preferResponseTimeAsLatency.description = Wenn aktiviert, wird versucht, die Latenz aus der Ausgabe des Ping-Befehls zu extrahieren. Wenn in der Ausgabe des Ping-Befehls kein solcher Latenzwert gefunden wird, wird die Zeit zum Ausführen des Ping-Befehls als Fallback-Latenz verwendet. Wenn deaktiviert, wird die Zeit zum Ausführen des Ping-Befehls immer als Latenzwert verwendet.
+addon.config.network.allowDHCPlisten.label = Auf DHCP-Anfragen hören
+addon.config.network.allowDHCPlisten.description = Normalerweise fordert ein Gerät eine IP-Adresse in einem IPv4-Netzwerk mit Hilfe von DHCP an, sobald es mit einem Netzwerk verbunden ist. Wenn auf solche Pakete gehört wird,, kann eine Gerätepräsenz noch schneller erkannt werden. Sie benötigen erhöhte Zugriffsrechte (siehe readme) damit dies funktioniert.
+addon.config.network.allowSystemPings.label = System Pings erlauben
+addon.config.network.allowSystemPings.description = Erlaubt oder verbietet die Verwendung von Systempings neben der Java-integrierten Ping-Funktionalität. Bei Windows funktioniert das System Ping meistens zuverlässiger.
+addon.config.network.arpPingToolPath.label = ARP Ping Werkzeugpfad
+addon.config.network.arpPingToolPath.description = Wenn Ihr Arping-Werkzeug nicht Arping genannt wird und nicht in der PATH-Umgebung gefunden werden kann, können sie hier den absoluten Pfad/Werkzeugnamen einstellen.
+addon.config.network.cacheDeviceStateTimeInMS.label = Cache-Zeit
+addon.config.network.cacheDeviceStateTimeInMS.description = Das Ergebnis einer Präsenzerkennung wird für eine kurze Zeit zwischengespeichert. Beachten Sie, dass innerhalb dieses Zeitrahmens keine neuen Pings ausgestellt werden, auch wenn dies ausdrücklich gefordert wird.
+addon.config.network.preferResponseTimeAsLatency.label = Antwortzeit als Latenz verwenden
+addon.config.network.preferResponseTimeAsLatency.description = Wenn aktiviert, wird versucht, die Latenz aus der Ausgabe des Ping-Befehls zu extrahieren. Wenn in der Ausgabe des Ping-Befehls kein solcher Latenzwert gefunden wird, wird die Zeit zum Ausführen des Ping-Befehls als Fallback-Latenz verwendet. Wenn deaktiviert, wird die Zeit zum Ausführen des Ping-Befehls immer als Latenzwert verwendet.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fi.properties b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fi.properties
index c3a2367de..24d733be8 100644
--- a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fi.properties
+++ b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fi.properties
@@ -1,20 +1,20 @@
-# binding
+# add-on
 
-binding.network.name = Verkkolisäosa
-binding.network.description = Verkkolisäosaa voidaan käyttää laitteiden läsnäolon havaitsemiseksi ja verkon kunnon määrittämiseksi
+addon.network.name = Verkkolisäosa
+addon.network.description = Verkkolisäosaa voidaan käyttää laitteiden läsnäolon havaitsemiseksi ja verkon kunnon määrittämiseksi
 
-# binding config
+# add-on config
 
-binding.config.network.allowDHCPlisten.label = Kuuntele DHCP-pyyntöjä
-binding.config.network.allowDHCPlisten.description = Yleensä laite pyytää IP-osoitetta IPv4-verkossa DHCP\:n avulla heti kun se liittyy verkkoon. Jos kuuntelemme näitä paketteja, voimme havaita laitteen läsnäolon vielä nopeammin. Tarvitset korotetut käyttöoikeudet (katso readme), jotta tämä toimisi.
-binding.config.network.allowSystemPings.label = Salli järjestelmän pingit
-binding.config.network.allowSystemPings.description = Sallii tai estää järjestelmän pingien käytön java integroidun ping- toiminnon ohessa. Windowsissa järjestelmän oma ping toimii usein luotettavammin.
-binding.config.network.arpPingToolPath.label = ARP-ping -työkalun polku
-binding.config.network.arpPingToolPath.description = Jos arp ping työkalu ei ole nimeltään arping eikä löydy PATH ympäristömuuttujasta, voit määrittää absoluuttisen polun / työkalun nimen täällä.
-binding.config.network.cacheDeviceStateTimeInMS.label = Välimuistin kesto
-binding.config.network.cacheDeviceStateTimeInMS.description = Laitteen läsnäolon havaitsemisen tulos on välimuistissa vähän aikaa. Huomaa, että tänä aikana ei lähetetä uusia pingejä, vaikka niitä nimenomaisesti pyydettäisiin.
-binding.config.network.preferResponseTimeAsLatency.label = Käytä vasteaikaa latenssina
-binding.config.network.preferResponseTimeAsLatency.description = Jos tämä on käytössä, yritetään lukea latenssi ping-komennon tulosteesta. Jos ping-komennon tulosteesta ei löydy tällaista latenssiarvoa, ping-komennon suorittamiseen kuluvaa aikaa käytetään toissijaisena latenssina. Jos tämä ei ole käytössä, ping-komennon suorittamiseen kuluvaa aikaa käytetään aina latenssiarvona.
+addon.config.network.allowDHCPlisten.label = Kuuntele DHCP-pyyntöjä
+addon.config.network.allowDHCPlisten.description = Yleensä laite pyytää IP-osoitetta IPv4-verkossa DHCP\:n avulla heti kun se liittyy verkkoon. Jos kuuntelemme näitä paketteja, voimme havaita laitteen läsnäolon vielä nopeammin. Tarvitset korotetut käyttöoikeudet (katso readme), jotta tämä toimisi.
+addon.config.network.allowSystemPings.label = Salli järjestelmän pingit
+addon.config.network.allowSystemPings.description = Sallii tai estää järjestelmän pingien käytön java integroidun ping- toiminnon ohessa. Windowsissa järjestelmän oma ping toimii usein luotettavammin.
+addon.config.network.arpPingToolPath.label = ARP-ping -työkalun polku
+addon.config.network.arpPingToolPath.description = Jos arp ping työkalu ei ole nimeltään arping eikä löydy PATH ympäristömuuttujasta, voit määrittää absoluuttisen polun / työkalun nimen täällä.
+addon.config.network.cacheDeviceStateTimeInMS.label = Välimuistin kesto
+addon.config.network.cacheDeviceStateTimeInMS.description = Laitteen läsnäolon havaitsemisen tulos on välimuistissa vähän aikaa. Huomaa, että tänä aikana ei lähetetä uusia pingejä, vaikka niitä nimenomaisesti pyydettäisiin.
+addon.config.network.preferResponseTimeAsLatency.label = Käytä vasteaikaa latenssina
+addon.config.network.preferResponseTimeAsLatency.description = Jos tämä on käytössä, yritetään lukea latenssi ping-komennon tulosteesta. Jos ping-komennon tulosteesta ei löydy tällaista latenssiarvoa, ping-komennon suorittamiseen kuluvaa aikaa käytetään toissijaisena latenssina. Jos tämä ei ole käytössä, ping-komennon suorittamiseen kuluvaa aikaa käytetään aina latenssiarvona.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fr.properties b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fr.properties
index 047d45ca9..c0de2960b 100644
--- a/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fr.properties
+++ b/bundles/org.openhab.binding.network/src/main/resources/OH-INF/i18n/network_fr.properties
@@ -1,20 +1,20 @@
-# binding
+# add-on
 
-binding.network.name = Extension Réseau
-binding.network.description = L'extension Réseau peut être utilisée pour la détection de présence d'équipements réseau et pour déterminer l'état du réseau
+addon.network.name = Extension Réseau
+addon.network.description = L'extension Réseau peut être utilisée pour la détection de présence d'équipements réseau et pour déterminer l'état du réseau
 
-# binding config
+# add-on config
 
-binding.config.network.allowDHCPlisten.label = Observation des requêtes DHCP
-binding.config.network.allowDHCPlisten.description = Habituellement, un périphérique demande une adresse IP sur un réseau IPv4 à l'aide du protocole DHCP dès qu'il y entre. En écoutant ces paquets, nous pouvons détecter la présence du périphérique presque immédiatement. Vous aurez besoin de droits d'accès élevés (voir readme) pour que cela fonctionne.
-binding.config.network.allowSystemPings.label = Utiliser le Ping système
-binding.config.network.allowSystemPings.description = Active ou désactive l'utilisation des pings système en complément de la fonctionnalité native de Java. En environnement Windows, le ping système est la plupart du temps plus fiable.
-binding.config.network.arpPingToolPath.label = Emplacement de l'outil de Ping ARP
-binding.config.network.arpPingToolPath.description = Si votre outil de ping arp n'est pas nommé arping ou ne peut pas être trouvé dans l'environnement PATH, vous pouvez configurer ici le chemin absolu / nom de l'outil.
-binding.config.network.cacheDeviceStateTimeInMS.label = Durée du cache
-binding.config.network.cacheDeviceStateTimeInMS.description = Le résultat d'une détection de présence du périphérique est mis en cache pour une brève durée. Aucun nouveau ping ne sera émis dans ce délai, même s'il est explicitement demandé.
-binding.config.network.preferResponseTimeAsLatency.label = Utiliser le temps de réponse comme latence
-binding.config.network.preferResponseTimeAsLatency.description = Si activé, une tentative sera faite pour extraire la latence du résultat de la commande ping. Si aucune valeur de latence de ce type n'est trouvée dans la sortie de la commande ping, le temps d'exécution de la commande ping est utilisé comme temps de latence. Si désactivé, le temps d'exécution de la commande ping est toujours utilisé comme valeur de latence.
+addon.config.network.allowDHCPlisten.label = Observation des requêtes DHCP
+addon.config.network.allowDHCPlisten.description = Habituellement, un périphérique demande une adresse IP sur un réseau IPv4 à l'aide du protocole DHCP dès qu'il y entre. En écoutant ces paquets, nous pouvons détecter la présence du périphérique presque immédiatement. Vous aurez besoin de droits d'accès élevés (voir readme) pour que cela fonctionne.
+addon.config.network.allowSystemPings.label = Utiliser le Ping système
+addon.config.network.allowSystemPings.description = Active ou désactive l'utilisation des pings système en complément de la fonctionnalité native de Java. En environnement Windows, le ping système est la plupart du temps plus fiable.
+addon.config.network.arpPingToolPath.label = Emplacement de l'outil de Ping ARP
+addon.config.network.arpPingToolPath.description = Si votre outil de ping arp n'est pas nommé arping ou ne peut pas être trouvé dans l'environnement PATH, vous pouvez configurer ici le chemin absolu / nom de l'outil.
+addon.config.network.cacheDeviceStateTimeInMS.label = Durée du cache
+addon.config.network.cacheDeviceStateTimeInMS.description = Le résultat d'une détection de présence du périphérique est mis en cache pour une brève durée. Aucun nouveau ping ne sera émis dans ce délai, même s'il est explicitement demandé.
+addon.config.network.preferResponseTimeAsLatency.label = Utiliser le temps de réponse comme latence
+addon.config.network.preferResponseTimeAsLatency.description = Si activé, une tentative sera faite pour extraire la latence du résultat de la commande ping. Si aucune valeur de latence de ce type n'est trouvée dans la sortie de la commande ping, le temps d'exécution de la commande ping est utilisé comme temps de latence. Si désactivé, le temps d'exécution de la commande ping est toujours utilisé comme valeur de latence.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.networkupstools/src/main/resources/OH-INF/i18n/networkupstools.properties b/bundles/org.openhab.binding.networkupstools/src/main/resources/OH-INF/i18n/networkupstools.properties
index 9af554cee..4c6f6330f 100644
--- a/bundles/org.openhab.binding.networkupstools/src/main/resources/OH-INF/i18n/networkupstools.properties
+++ b/bundles/org.openhab.binding.networkupstools/src/main/resources/OH-INF/i18n/networkupstools.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.networkupstools.name = Network UPS Tools Binding
-binding.networkupstools.description = Binding for connecting to Network UPS Tools (NUT) servers
+addon.networkupstools.name = Network UPS Tools Binding
+addon.networkupstools.description = Binding for connecting to Network UPS Tools (NUT) servers
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties
index f7b92b550..ca46c363b 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nibeheatpump.name = NibeHeatPump Binding
-binding.nibeheatpump.description = This is the binding for Nibe heat pumps.
+addon.nibeheatpump.name = NibeHeatPump Binding
+addon.nibeheatpump.description = This is the binding for Nibe heat pumps.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink.properties b/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink.properties
index 76265aa64..292649bd2 100644
--- a/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink.properties
+++ b/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nibeuplink.name = NibeUplink Binding
-binding.nibeuplink.description = This is the binding for NibeUplink.
+addon.nibeuplink.name = NibeUplink Binding
+addon.nibeuplink.description = This is the binding for NibeUplink.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink_de.properties b/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink_de.properties
index 870bdfd04..e80a2235a 100644
--- a/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink_de.properties
+++ b/bundles/org.openhab.binding.nibeuplink/src/main/resources/OH-INF/i18n/nibeuplink_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.nibeuplink.name = Nibe Uplink binding
-binding.nibeuplink.description = Abfrage von Nibe Wärmepumpendaten über die Nibe Uplink API.
+# add-on
+addon.nibeuplink.name = Nibe Uplink binding
+addon.nibeuplink.description = Abfrage von Nibe Wärmepumpendaten über die Nibe Uplink API.
 
 # thing types
 thing-type.nibeuplink.web.label = Nibe Wärmepumpe
diff --git a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/i18n/nikobus.properties b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/i18n/nikobus.properties
index 6bff0b760..912d5ca74 100644
--- a/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/i18n/nikobus.properties
+++ b/bundles/org.openhab.binding.nikobus/src/main/resources/OH-INF/i18n/nikobus.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nikobus.name = Nikobus Binding
-binding.nikobus.description = This is the binding for Nikobus.
+addon.nikobus.name = Nikobus Binding
+addon.nikobus.description = This is the binding for Nikobus.
 
 # thing types
 
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 8ae3b7921..5d216a5a8 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,4 +1,4 @@
-# binding
+# add-on
 bindingName = Niko Home Control Binding
 bindingDescription = This is the binding for the Niko Home Control system
 
diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_fr.properties b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_fr.properties
index 7134d1703..f52e7b5d4 100644
--- a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_fr.properties
+++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_fr.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 bindingName = Extension Niko Home Control
 bindingDescription = Il s'agit de l'extension pour le système Niko Home Control.
 
diff --git a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties
index 2735bd200..749ae6d71 100644
--- a/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties
+++ b/bundles/org.openhab.binding.nikohomecontrol/src/main/resources/OH-INF/i18n/nikohomecontrol_nl.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 bindingName = Niko Home Control Binding
 bindingDescription = Dit is de binding voor het Niko Home Control systeem
 
diff --git a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub.properties b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub.properties
index 0d0174125..f183b81d6 100644
--- a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub.properties
+++ b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nobohub.name = Glen Dimplex Nob� Hub Binding
-binding.nobohub.description = This is the binding for Glen Dimplex Nob� Hub.
+addon.nobohub.name = Glen Dimplex Nob� Hub Binding
+addon.nobohub.description = This is the binding for Glen Dimplex Nob� Hub.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_fr.properties b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_fr.properties
index 0af8e89b5..6ad5cc9e6 100644
--- a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_fr.properties
+++ b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nobohub.name = Extension du Hub Glen Dimplex Nobø
-binding.nobohub.description = Il s'agit de l'extension pour le Hub Glen Dimplex Nobø.
+addon.nobohub.name = Extension du Hub Glen Dimplex Nobø
+addon.nobohub.description = Il s'agit de l'extension pour le Hub Glen Dimplex Nobø.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_no.properties b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_no.properties
index 0a5546a66..5144c1ecc 100644
--- a/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_no.properties
+++ b/bundles/org.openhab.binding.nobohub/src/main/resources/OH-INF/i18n/nobohub_no.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nobohub.name = Glen Dimplex Nob� Hub Binding
-binding.nobohub.description = Dette er en binding for Glen Dimplex Nob� Hub.
+addon.nobohub.name = Glen Dimplex Nob� Hub Binding
+addon.nobohub.description = Dette er en binding for Glen Dimplex Nob� Hub.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.novafinedust/src/main/resources/OH-INF/i18n/novafinedust.properties b/bundles/org.openhab.binding.novafinedust/src/main/resources/OH-INF/i18n/novafinedust.properties
index a6e2b3887..ffaeea13c 100644
--- a/bundles/org.openhab.binding.novafinedust/src/main/resources/OH-INF/i18n/novafinedust.properties
+++ b/bundles/org.openhab.binding.novafinedust/src/main/resources/OH-INF/i18n/novafinedust.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.novafinedust.name = NovaFineDust Binding
-binding.novafinedust.description = This is the binding for Nova Fitness Fine Dust SDS011 sensor.
+addon.novafinedust.name = NovaFineDust Binding
+addon.novafinedust.description = This is the binding for Nova Fitness Fine Dust SDS011 sensor.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp.properties b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp.properties
index c68fc88a3..ce02f6b89 100644
--- a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp.properties
+++ b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ntp.name = NTP Binding
-binding.ntp.description = The NTP Binding polls the configured timeserver and post the current date and time.
+addon.ntp.name = NTP Binding
+addon.ntp.description = The NTP Binding polls the configured timeserver and post the current date and time.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_de.properties b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_de.properties
index b72cccf93..f003e45a4 100644
--- a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_de.properties
+++ b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ntp.name = NTP Binding
-binding.ntp.description = Dieses Binding fragt das aktuelle Datum und die aktuelle Zeit bei einem Zeitserver ab.
+addon.ntp.name = NTP Binding
+addon.ntp.description = Dieses Binding fragt das aktuelle Datum und die aktuelle Zeit bei einem Zeitserver ab.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_fr.properties b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_fr.properties
index 1276d5d10..71ca235d6 100644
--- a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_fr.properties
+++ b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ntp.name = Extension NTP
-binding.ntp.description = L'extension NTP interroge le serveur de temps configuré et fournit la date et l'heure actuelles.
+addon.ntp.name = Extension NTP
+addon.ntp.description = L'extension NTP interroge le serveur de temps configuré et fournit la date et l'heure actuelles.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_hu.properties b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_hu.properties
index 8ebee4d91..4e2366c3c 100644
--- a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_hu.properties
+++ b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ntp.name = NTP kötés
-binding.ntp.description = Az NTP kötés a beállított időkiszolgálót kérdezi le és az aktuális dátumot és időt teszi közzé.
+addon.ntp.name = NTP kötés
+addon.ntp.description = Az NTP kötés a beállított időkiszolgálót kérdezi le és az aktuális dátumot és időt teszi közzé.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_tr.properties b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_tr.properties
index 8f7069a3d..6b958120a 100644
--- a/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_tr.properties
+++ b/bundles/org.openhab.binding.ntp/src/main/resources/OH-INF/i18n/ntp_tr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ntp.name = NTP bağlantısı
-binding.ntp.description = NTP bağlantısı bir zaman sunucusundan geçerli tarih ve saati sorgular.
+addon.ntp.name = NTP bağlantısı
+addon.ntp.description = NTP bağlantısı bir zaman sunucusundan geçerli tarih ve saati sorgular.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nuki/src/main/resources/OH-INF/i18n/nuki.properties b/bundles/org.openhab.binding.nuki/src/main/resources/OH-INF/i18n/nuki.properties
index 5cc074d64..ea637b3be 100644
--- a/bundles/org.openhab.binding.nuki/src/main/resources/OH-INF/i18n/nuki.properties
+++ b/bundles/org.openhab.binding.nuki/src/main/resources/OH-INF/i18n/nuki.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nuki.name = Nuki Binding
-binding.nuki.description = The Nuki Binding allows simple and fast integration of Nuki Smart Locks into openHAB. This binding needs the Nuki Smart Lock(s) to be paired via Bluetooth with a Nuki Bridge to function correctly.
+addon.nuki.name = Nuki Binding
+addon.nuki.description = The Nuki Binding allows simple and fast integration of Nuki Smart Locks into openHAB. This binding needs the Nuki Smart Lock(s) to be paired via Bluetooth with a Nuki Bridge to function correctly.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nuvo/src/main/resources/OH-INF/i18n/nuvo.properties b/bundles/org.openhab.binding.nuvo/src/main/resources/OH-INF/i18n/nuvo.properties
index 4d69eef37..a1e29cdf6 100644
--- a/bundles/org.openhab.binding.nuvo/src/main/resources/OH-INF/i18n/nuvo.properties
+++ b/bundles/org.openhab.binding.nuvo/src/main/resources/OH-INF/i18n/nuvo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nuvo.name = Nuvo Whole House Audio Binding
-binding.nuvo.description = Controls the Nuvo Grand Concerto or Essentia G Whole House Amplifier.
+addon.nuvo.name = Nuvo Whole House Audio Binding
+addon.nuvo.description = Controls the Nuvo Grand Concerto or Essentia G Whole House Amplifier.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.nzwateralerts/src/main/resources/OH-INF/i18n/nzwateralerts.properties b/bundles/org.openhab.binding.nzwateralerts/src/main/resources/OH-INF/i18n/nzwateralerts.properties
index 67c28a236..012458e93 100644
--- a/bundles/org.openhab.binding.nzwateralerts/src/main/resources/OH-INF/i18n/nzwateralerts.properties
+++ b/bundles/org.openhab.binding.nzwateralerts/src/main/resources/OH-INF/i18n/nzwateralerts.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.nzwateralerts.name = NZ Water Alerts Binding
-binding.nzwateralerts.description = Water Alert Levels for New Zealand water supply.
+addon.nzwateralerts.name = NZ Water Alerts Binding
+addon.nzwateralerts.description = Water Alert Levels for New Zealand water supply.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.oceanic/src/main/resources/OH-INF/i18n/oceanic.properties b/bundles/org.openhab.binding.oceanic/src/main/resources/OH-INF/i18n/oceanic.properties
index a63c0e11a..b3d87199f 100644
--- a/bundles/org.openhab.binding.oceanic/src/main/resources/OH-INF/i18n/oceanic.properties
+++ b/bundles/org.openhab.binding.oceanic/src/main/resources/OH-INF/i18n/oceanic.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.oceanic.name = openHAB Oceanic Binding
-binding.oceanic.description = This is the binding for Oceanic Water Softener.
+addon.oceanic.name = openHAB Oceanic Binding
+addon.oceanic.description = This is the binding for Oceanic Water Softener.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties
index 0d13b2e47..10910ce75 100644
--- a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ojelectronics.name = OJElectronics Binding
-binding.ojelectronics.description = This is the binding for OJElectronics.
+addon.ojelectronics.name = OJElectronics Binding
+addon.ojelectronics.description = This is the binding for OJElectronics.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics_de.properties b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics_de.properties
index f0a2f5aca..71559a78a 100644
--- a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics_de.properties
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.ojelectronics.name = Binding für OJElectronics
-binding.ojelectronics.description = Binding für OJElectronics.
+# add-on
+addon.ojelectronics.name = Binding für OJElectronics
+addon.ojelectronics.description = Binding für OJElectronics.
 
 # thing types
 thing-type.ojelectronics.owd5.label = OWD5/MWD5 Thermostate
diff --git a/bundles/org.openhab.binding.omnikinverter/src/main/resources/OH-INF/i18n/omnikinverter.properties b/bundles/org.openhab.binding.omnikinverter/src/main/resources/OH-INF/i18n/omnikinverter.properties
index 1033c3b5a..55276ae52 100644
--- a/bundles/org.openhab.binding.omnikinverter/src/main/resources/OH-INF/i18n/omnikinverter.properties
+++ b/bundles/org.openhab.binding.omnikinverter/src/main/resources/OH-INF/i18n/omnikinverter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.omnikinverter.name = OmnikInverter Binding
-binding.omnikinverter.description = This is the binding for the Omnik solar grid inverters. The integration is based on the undocumented API, which is reverse engineered at https://github.com/Woutrrr/Omnik-Data-Logger. As such, the known supported inverters are known to work with inverters with wifi bridge which start with the serial number '602' and '606'.
+addon.omnikinverter.name = OmnikInverter Binding
+addon.omnikinverter.description = This is the binding for the Omnik solar grid inverters. The integration is based on the undocumented API, which is reverse engineered at https://github.com/Woutrrr/Omnik-Data-Logger. As such, the known supported inverters are known to work with inverters with wifi bridge which start with the serial number '602' and '606'.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties b/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties
index 72c9c55e2..99e89bdee 100644
--- a/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties
+++ b/bundles/org.openhab.binding.omnilink/src/main/resources/OH-INF/i18n/omnilink.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.omnilink.name = OmniLink Binding
-binding.omnilink.description = This is the binding for OmniLink, a security system that interfaces with many devices.
+addon.omnilink.name = OmniLink Binding
+addon.omnilink.description = This is the binding for OmniLink, a security system that interfaces with many devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.onebusaway/src/main/resources/OH-INF/i18n/onebusaway.properties b/bundles/org.openhab.binding.onebusaway/src/main/resources/OH-INF/i18n/onebusaway.properties
index 92c5d95a5..b7f259dba 100644
--- a/bundles/org.openhab.binding.onebusaway/src/main/resources/OH-INF/i18n/onebusaway.properties
+++ b/bundles/org.openhab.binding.onebusaway/src/main/resources/OH-INF/i18n/onebusaway.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.onebusaway.name = OneBusAway Binding
-binding.onebusaway.description = This is the binding for OneBusAway, an open system to provide transit data.
+addon.onebusaway.name = OneBusAway Binding
+addon.onebusaway.description = This is the binding for OneBusAway, an open system to provide transit data.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/i18n/onewire.properties b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/i18n/onewire.properties
index 320980f61..f82cbbeee 100644
--- a/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/i18n/onewire.properties
+++ b/bundles/org.openhab.binding.onewire/src/main/resources/OH-INF/i18n/onewire.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.onewire.name = OneWire Binding
-binding.onewire.description = This is the binding for OneWire.
+addon.onewire.name = OneWire Binding
+addon.onewire.description = This is the binding for OneWire.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.onewiregpio/src/main/resources/OH-INF/i18n/onewiregpio.properties b/bundles/org.openhab.binding.onewiregpio/src/main/resources/OH-INF/i18n/onewiregpio.properties
index 71d7a0ba5..e09ee48fa 100644
--- a/bundles/org.openhab.binding.onewiregpio/src/main/resources/OH-INF/i18n/onewiregpio.properties
+++ b/bundles/org.openhab.binding.onewiregpio/src/main/resources/OH-INF/i18n/onewiregpio.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.onewiregpio.name = OneWireGPIO Binding
-binding.onewiregpio.description = Use GPIO in various devices like RaspberryPi to communicate the OneWire protocol
+addon.onewiregpio.name = OneWireGPIO Binding
+addon.onewiregpio.description = Use GPIO in various devices like RaspberryPi to communicate the OneWire protocol
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties
index 5dc56ceea..0a2a4d554 100644
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.onkyo.name = Onkyo Binding
-binding.onkyo.description = This is the binding for Onkyo receivers.
+addon.onkyo.name = Onkyo Binding
+addon.onkyo.description = This is the binding for Onkyo receivers.
 
-# binding config
+# add-on config
 
-binding.config.onkyo.callbackUrl.label = Callback URL
-binding.config.onkyo.callbackUrl.description = url to use for playing notification sounds, e.g. http://192.168.0.2:8080
+addon.config.onkyo.callbackUrl.label = Callback URL
+addon.config.onkyo.callbackUrl.description = url to use for playing notification sounds, e.g. http://192.168.0.2:8080
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo_de.properties b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo_de.properties
index 04b09b9db..de7b15ea3 100644
--- a/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo_de.properties
+++ b/bundles/org.openhab.binding.onkyo/src/main/resources/OH-INF/i18n/onkyo_de.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.onkyo.name = Onkyo Bindung
-binding.onkyo.description = Dies ist die Bindung für Onkyo Receiver.
+addon.onkyo.name = Onkyo Bindung
+addon.onkyo.description = Dies ist die Bindung für Onkyo Receiver.
 
-# binding config
+# add-on config
 
-binding.config.onkyo.callbackUrl.label = Rückruf-URL
-binding.config.onkyo.callbackUrl.description = url zum Abspielen von Benachrichtigungstönen, z.B. http\://192.168.0.2\:8080
+addon.config.onkyo.callbackUrl.label = Rückruf-URL
+addon.config.onkyo.callbackUrl.description = url zum Abspielen von Benachrichtigungstönen, z.B. http\://192.168.0.2\:8080
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.opengarage/src/main/resources/OH-INF/i18n/opengarage.properties b/bundles/org.openhab.binding.opengarage/src/main/resources/OH-INF/i18n/opengarage.properties
index ddf4fc7be..6ca7c0dca 100644
--- a/bundles/org.openhab.binding.opengarage/src/main/resources/OH-INF/i18n/opengarage.properties
+++ b/bundles/org.openhab.binding.opengarage/src/main/resources/OH-INF/i18n/opengarage.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.opengarage.name = OpenGarage Binding
-binding.opengarage.description = This is the binding for OpenGarage.
+addon.opengarage.name = OpenGarage Binding
+addon.opengarage.description = This is the binding for OpenGarage.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler.properties b/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler.properties
index 25ce02629..5b961ed9f 100644
--- a/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler.properties
+++ b/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.opensprinkler.name = OpenSprinkler Binding
-binding.opensprinkler.description = This is the binding for OpenSprinkler.
+addon.opensprinkler.name = OpenSprinkler Binding
+addon.opensprinkler.description = This is the binding for OpenSprinkler.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler_fi.properties b/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler_fi.properties
index c2164fe7f..7fc953b5f 100644
--- a/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler_fi.properties
+++ b/bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler_fi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.opensprinkler.name = OpenSprinkler-lisäosa
-binding.opensprinkler.description = Tämä on lisäosa OpenSprinkleriä varten.
+addon.opensprinkler.name = OpenSprinkler-lisäosa
+addon.opensprinkler.description = Tämä on lisäosa OpenSprinkleriä varten.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/i18n/openthermgateway.properties b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/i18n/openthermgateway.properties
index e76bba2f9..a87378dcd 100644
--- a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/i18n/openthermgateway.properties
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/i18n/openthermgateway.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openthermgateway.name = OpenTherm Gateway Binding
-binding.openthermgateway.description = This is the binding for the OpenTherm Gateway, designed by Schelte Bron. For more information about the OpenTherm Gateway please see http://otgw.tclcode.com/
+addon.openthermgateway.name = OpenTherm Gateway Binding
+addon.openthermgateway.description = This is the binding for the OpenTherm Gateway, designed by Schelte Bron. For more information about the OpenTherm Gateway please see http://otgw.tclcode.com/
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv.properties b/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv.properties
index bb0524347..b889bd5f5 100644
--- a/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv.properties
+++ b/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openuv.name = OpenUV Binding
-binding.openuv.description = Global Real-Time UV Index Forecast API
+addon.openuv.name = OpenUV Binding
+addon.openuv.description = Global Real-Time UV Index Forecast API
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv_fr.properties b/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv_fr.properties
index 3901f3896..4af54e3fb 100644
--- a/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv_fr.properties
+++ b/bundles/org.openhab.binding.openuv/src/main/resources/OH-INF/i18n/openuv_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openuv.name = Extension OpenUV
-binding.openuv.description = Cette extension fournit des prévisions d'indice UV en temps réel en s'appuyant sur l'API openUV.
+addon.openuv.name = Extension OpenUV
+addon.openuv.description = Cette extension fournit des prévisions d'indice UV en temps réel en s'appuyant sur l'API openUV.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties
index 6f37aa0e5..8bfd0c261 100644
--- a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties
+++ b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openweathermap.name = OpenWeatherMap Binding
-binding.openweathermap.description = OpenWeatherMap - Current weather and forecasts in your city.
+addon.openweathermap.name = OpenWeatherMap Binding
+addon.openweathermap.description = OpenWeatherMap - Current weather and forecasts in your city.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties
index 381d83f4c..b53cdc145 100644
--- a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties
+++ b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openweathermap.name = OpenWeatherMap Binding
-binding.openweathermap.description = OpenWeatherMap - Aktuelles Wetter und Prognosen in Ihrer Stadt.
+addon.openweathermap.name = OpenWeatherMap Binding
+addon.openweathermap.description = OpenWeatherMap - Aktuelles Wetter und Prognosen in Ihrer Stadt.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties
index 528230a73..6d3a719e4 100644
--- a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties
+++ b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openweathermap.name = Extension OpenWeatherMap
-binding.openweathermap.description = L'extension OpenWeatherMap fournit la météo actuelle et les prévisions dans votre ville.
+addon.openweathermap.name = Extension OpenWeatherMap
+addon.openweathermap.description = L'extension OpenWeatherMap fournit la météo actuelle et les prévisions dans votre ville.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_it.properties b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_it.properties
index 1dc65283b..435647481 100644
--- a/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_it.properties
+++ b/bundles/org.openhab.binding.openweathermap/src/main/resources/OH-INF/i18n/openweathermap_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openweathermap.name = Binding OpenWeatherMap
-binding.openweathermap.description = OpenWeatherMap - Meteo Attuale e Previsioni nella tua città.
+addon.openweathermap.name = Binding OpenWeatherMap
+addon.openweathermap.description = OpenWeatherMap - Meteo Attuale e Previsioni nella tua città.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
index ad9d91eb2..201fb6144 100644
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openwebnet.name = OpenWebNet (BTicino/Legrand) Binding
-binding.openwebnet.description = The OpenWebNet Binding integrates the BTicino/Legrand 'MyHOME' connected home system using the OpenWebNet protocol. It supports BUS (SCS) and Zigbee USB gateways and devices.
+addon.openwebnet.name = OpenWebNet (BTicino/Legrand) Binding
+addon.openwebnet.description = The OpenWebNet Binding integrates the BTicino/Legrand 'MyHOME' connected home system using the OpenWebNet protocol. It supports BUS (SCS) and Zigbee USB gateways and devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_de.properties b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_de.properties
index cf8ced884..aac062f6a 100644
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_de.properties
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openwebnet.name = OpenWebNet (BTicino/Legrand) Binding
-binding.openwebnet.description = Das OpenWebNet Binding integriert das BTicino/Legrand 'MyHOME' verbundene Home-System über das OpenWebNet-Protokoll. Es unterstützt BUS (SCS) und ZigBee USB Gateways und Geräte.
+addon.openwebnet.name = OpenWebNet (BTicino/Legrand) Binding
+addon.openwebnet.description = Das OpenWebNet Binding integriert das BTicino/Legrand 'MyHOME' verbundene Home-System über das OpenWebNet-Protokoll. Es unterstützt BUS (SCS) und ZigBee USB Gateways und Geräte.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_it.properties b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_it.properties
index 8cd7ae8d1..b1fc126d4 100644
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_it.properties
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.openwebnet.name = Binding OpenWebNet (BTicino/Legrand)
-binding.openwebnet.description = Il Binding OpenWebNet integra i sistemi BTicino/Legrand MyHOME usando il protocollo OpenWebNet. Sono supportati sia dispositivi collegati tramite BUS (SCS) che quelli collegati via protocollo wireless Zigbee tramite adattatore USB.
+addon.openwebnet.name = Binding OpenWebNet (BTicino/Legrand)
+addon.openwebnet.description = Il Binding OpenWebNet integra i sistemi BTicino/Legrand MyHOME usando il protocollo OpenWebNet. Sono supportati sia dispositivi collegati tramite BUS (SCS) che quelli collegati via protocollo wireless Zigbee tramite adattatore USB.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.oppo/src/main/resources/OH-INF/i18n/oppo.properties b/bundles/org.openhab.binding.oppo/src/main/resources/OH-INF/i18n/oppo.properties
index 1f8d292f6..8e623a592 100644
--- a/bundles/org.openhab.binding.oppo/src/main/resources/OH-INF/i18n/oppo.properties
+++ b/bundles/org.openhab.binding.oppo/src/main/resources/OH-INF/i18n/oppo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.oppo.name = Oppo Blu-ray Player Binding
-binding.oppo.description = Controls the Oppo UDP-203/205 and BDP-83/93/95/103/105 Blu-ray Players
+addon.oppo.name = Oppo Blu-ray Player Binding
+addon.oppo.description = Controls the Oppo UDP-203/205 and BDP-83/93/95/103/105 Blu-ray Players
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.orbitbhyve/src/main/resources/OH-INF/i18n/orbitbhyve.properties b/bundles/org.openhab.binding.orbitbhyve/src/main/resources/OH-INF/i18n/orbitbhyve.properties
index ffa8044b0..ed0173e95 100644
--- a/bundles/org.openhab.binding.orbitbhyve/src/main/resources/OH-INF/i18n/orbitbhyve.properties
+++ b/bundles/org.openhab.binding.orbitbhyve/src/main/resources/OH-INF/i18n/orbitbhyve.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.orbitbhyve.name = Orbit B-hyve Binding
-binding.orbitbhyve.description = This is the binding for Orbit B-hyve Wi-Fi irrigation systems.
+addon.orbitbhyve.name = Orbit B-hyve Binding
+addon.orbitbhyve.description = This is the binding for Orbit B-hyve Wi-Fi irrigation systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.orvibo/src/main/resources/OH-INF/i18n/orvibo.properties b/bundles/org.openhab.binding.orvibo/src/main/resources/OH-INF/i18n/orvibo.properties
index d575653e1..f2f739409 100644
--- a/bundles/org.openhab.binding.orvibo/src/main/resources/OH-INF/i18n/orvibo.properties
+++ b/bundles/org.openhab.binding.orvibo/src/main/resources/OH-INF/i18n/orvibo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.orvibo.name = Orvibo Binding
-binding.orvibo.description = This is the binding for Orvibo devices.
+addon.orvibo.name = Orvibo Binding
+addon.orvibo.description = This is the binding for Orvibo devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/i18n/paradoxalarm.properties b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/i18n/paradoxalarm.properties
index 8981beb17..e347f372d 100644
--- a/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/i18n/paradoxalarm.properties
+++ b/bundles/org.openhab.binding.paradoxalarm/src/main/resources/OH-INF/i18n/paradoxalarm.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.paradoxalarm.name = ParadoxAlarm Binding
-binding.paradoxalarm.description = This is the binding for ParadoxAlarm.
+addon.paradoxalarm.name = ParadoxAlarm Binding
+addon.paradoxalarm.description = This is the binding for ParadoxAlarm.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pentair/src/main/resources/OH-INF/i18n/pentair.properties b/bundles/org.openhab.binding.pentair/src/main/resources/OH-INF/i18n/pentair.properties
index ea8b14d3d..d1b605b1d 100644
--- a/bundles/org.openhab.binding.pentair/src/main/resources/OH-INF/i18n/pentair.properties
+++ b/bundles/org.openhab.binding.pentair/src/main/resources/OH-INF/i18n/pentair.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pentair.name = Pentair Binding
-binding.pentair.description = This is the binding for Pentair pool systems.
+addon.pentair.name = Pentair Binding
+addon.pentair.description = This is the binding for Pentair pool systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties
index c6e76ede8..ba716458c 100644
--- a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties
+++ b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.phc.name = PHC Binding
-binding.phc.description = This is a binding for PHC modules (EM, AM, JRM and DIM). It communicates with the PHC Modulbus (RS485).
+addon.phc.name = PHC Binding
+addon.phc.description = This is a binding for PHC modules (EM, AM, JRM and DIM). It communicates with the PHC Modulbus (RS485).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc_de.properties b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc_de.properties
index fc1358874..3b59c114d 100644
--- a/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc_de.properties
+++ b/bundles/org.openhab.binding.phc/src/main/resources/OH-INF/i18n/phc_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.phc.name = PHC Binding
-binding.phc.description = Dies ist ein Binding für PHC Module (EM, AM, JRM und DIM). Es kommuniziert mit dem PHC Modulbus (RS485).
+addon.phc.name = PHC Binding
+addon.phc.description = Dies ist ein Binding für PHC Module (EM, AM, JRM und DIM). Es kommuniziert mit dem PHC Modulbus (RS485).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight.properties b/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight.properties
index dde79df31..c7c899338 100644
--- a/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight.properties
+++ b/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pilight.name = Pilight Binding
-binding.pilight.description = The pilight binding allows openHAB to communicate with a pilight instance. Pilight is a service used to control 'Click On Click Off' devices like 433 MHz remote controlled sockets a cheap way, e.g. by using a Raspberry Pi with corresponding 433 MHz sender.
+addon.pilight.name = Pilight Binding
+addon.pilight.description = The pilight binding allows openHAB to communicate with a pilight instance. Pilight is a service used to control 'Click On Click Off' devices like 433 MHz remote controlled sockets a cheap way, e.g. by using a Raspberry Pi with corresponding 433 MHz sender.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight_de.properties b/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight_de.properties
index 856f4e888..8d53d2be9 100644
--- a/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight_de.properties
+++ b/bundles/org.openhab.binding.pilight/src/main/resources/OH-INF/i18n/pilight_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.pilight.name = Pilight Binding
-binding.pilight.description = Das pilight-Binding ermöglicht openHAB die Kommunikation mit einer pilight-Instanz. Pilight ist ein Dienst, der verwendet wird, um 'Click On Click Off'-Geräte wie bspw. 433 MHz Funksteckdosen auf kostengünstige Weise zu steuern, z.B. durch Verwendung eines Raspberry Pi mit entsprechendem 433 MHz Sender.
+# add-on
+addon.pilight.name = Pilight Binding
+addon.pilight.description = Das pilight-Binding ermöglicht openHAB die Kommunikation mit einer pilight-Instanz. Pilight ist ein Dienst, der verwendet wird, um 'Click On Click Off'-Geräte wie bspw. 433 MHz Funksteckdosen auf kostengünstige Weise zu steuern, z.B. durch Verwendung eines Raspberry Pi mit entsprechendem 433 MHz Sender.
 
 # thing types
 thing-type.pilight.bridge.label = Pilight Bridge
diff --git a/bundles/org.openhab.binding.pioneeravr/src/main/resources/OH-INF/i18n/pioneeravr.properties b/bundles/org.openhab.binding.pioneeravr/src/main/resources/OH-INF/i18n/pioneeravr.properties
index 8f87d1367..02987721c 100644
--- a/bundles/org.openhab.binding.pioneeravr/src/main/resources/OH-INF/i18n/pioneeravr.properties
+++ b/bundles/org.openhab.binding.pioneeravr/src/main/resources/OH-INF/i18n/pioneeravr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pioneeravr.name = PioneerAvr Binding
-binding.pioneeravr.description = A binding for Pioneer AVRs.
+addon.pioneeravr.name = PioneerAvr Binding
+addon.pioneeravr.description = A binding for Pioneer AVRs.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer.properties b/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer.properties
index e9b55b6b2..6060df710 100644
--- a/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer.properties
+++ b/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer.properties
@@ -1,6 +1,6 @@
-# binding
-binding.pixometer.name = Pixometer Binding
-binding.pixometer.description = This binding can connect to the Pixometer.io API and accesses meters and measurement data from the connected account.
+# add-on
+addon.pixometer.name = Pixometer Binding
+addon.pixometer.description = This binding can connect to the Pixometer.io API and accesses meters and measurement data from the connected account.
 
 # thing types
 thing-type.pixometer.account.label = Pixometer Account
diff --git a/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer_de.properties b/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer_de.properties
index 781f90829..c7820d729 100644
--- a/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer_de.properties
+++ b/bundles/org.openhab.binding.pixometer/src/main/resources/OH-INF/i18n/pixometer_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.pixometer.name = Pixometer Binding
-binding.pixometer.description = Mit dem Pixometer Binding ist es möglich über die Pixometer.io API Daten und Messwerte von den dort erfassten Zählern abzurufen. 
+# add-on
+addon.pixometer.name = Pixometer Binding
+addon.pixometer.description = Mit dem Pixometer Binding ist es möglich über die Pixometer.io API Daten und Messwerte von den dort erfassten Zählern abzurufen. 
 
 # thing types
 thing-type.pixometer.account.label = Pixometer Account
diff --git a/bundles/org.openhab.binding.pjlinkdevice/src/main/resources/OH-INF/i18n/pjLinkDevice.properties b/bundles/org.openhab.binding.pjlinkdevice/src/main/resources/OH-INF/i18n/pjLinkDevice.properties
index 6e53a0167..407416c46 100644
--- a/bundles/org.openhab.binding.pjlinkdevice/src/main/resources/OH-INF/i18n/pjLinkDevice.properties
+++ b/bundles/org.openhab.binding.pjlinkdevice/src/main/resources/OH-INF/i18n/pjLinkDevice.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pjLinkDevice.name = PJLinkDevice Binding
-binding.pjLinkDevice.description = This binding can control PJLink compatible devices. The PJLink protocol was mainly standardized for digital projectors, but some other types of devices also use it, in particular TV screens.
+addon.pjLinkDevice.name = PJLinkDevice Binding
+addon.pjLinkDevice.description = This binding can control PJLink compatible devices. The PJLink protocol was mainly standardized for digital projectors, but some other types of devices also use it, in particular TV screens.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation.properties b/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation.properties
index 4ccd63736..6095f9f82 100755
--- a/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation.properties
+++ b/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation.properties
@@ -1,7 +1,7 @@
 
-# binding
-binding.playstation.name = Sony PlayStation Binding
-binding.playstation.description = Monitor and control your Sony PlayStation.
+# add-on
+addon.playstation.name = Sony PlayStation Binding
+addon.playstation.description = Monitor and control your Sony PlayStation.
 
 # thing types
 thing-type.playstation.PS3.label = PlayStation 3
diff --git a/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation_sv.properties b/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation_sv.properties
index c8b3d2342..edae7ca26 100644
--- a/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation_sv.properties
+++ b/bundles/org.openhab.binding.playstation/src/main/resources/OH-INF/i18n/playstation_sv.properties
@@ -1,7 +1,7 @@
 
-# binding
-binding.playstation.name = Sony PlayStation Binding
-binding.playstation.description = Övervaka och styr ditt Sony PlayStation.
+# add-on
+addon.playstation.name = Sony PlayStation Binding
+addon.playstation.description = Övervaka och styr ditt Sony PlayStation.
 
 # thing types
 thing-type.playstation.PS3.label = PlayStation 3
diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo.properties b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo.properties
index c0e3a79d2..b722f0daf 100644
--- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo.properties
+++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.plclogo.name = PLCLogo Binding
-binding.plclogo.description = This binding provides native support for Siemens LOGO! PLC.
+addon.plclogo.name = PLCLogo Binding
+addon.plclogo.description = This binding provides native support for Siemens LOGO! PLC.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo_de.properties b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo_de.properties
index b85bad131..29d69a465 100644
--- a/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo_de.properties
+++ b/bundles/org.openhab.binding.plclogo/src/main/resources/OH-INF/i18n/plclogo_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.plclogo.name = PLCLogo Binding
-binding.plclogo.description = Dieses Binding bietet Unterstüzung für Siemens LOGO! Steuerungen.
+# add-on
+addon.plclogo.name = PLCLogo Binding
+addon.plclogo.description = Dieses Binding bietet Unterstüzung für Siemens LOGO! Steuerungen.
 
 # thing types
 thing-type.plclogo.device.label = Steuerung
diff --git a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties
index 62c4121eb..991c94d85 100644
--- a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties
+++ b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties
@@ -1,6 +1,6 @@
-# binding
-binding.plugwise.name = Plugwise Binding
-binding.plugwise.description = Monitor and control Plugwise Zigbee devices using the Stick. Supported devices are the Circle, Circle+, Scan, Sense, Stealth and Switch.
+# add-on
+addon.plugwise.name = Plugwise Binding
+addon.plugwise.description = Monitor and control Plugwise Zigbee devices using the Stick. Supported devices are the Circle, Circle+, Scan, Sense, Stealth and Switch.
 
 
 # bridge type configuration parameters
diff --git a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise_nl.properties b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise_nl.properties
index 7d8c29005..b7555fabf 100644
--- a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise_nl.properties
+++ b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise_nl.properties
@@ -1,6 +1,6 @@
-# binding
-binding.plugwise.name = Plugwise Binding
-binding.plugwise.description = Monitor en schakel Plugwise Zigbee apparaten met de Stick. Ondersteunde apparaten zijn de Circle, Circle+, Scan, Sense, Stealth en Switch.
+# add-on
+addon.plugwise.name = Plugwise Binding
+addon.plugwise.description = Monitor en schakel Plugwise Zigbee apparaten met de Stick. Ondersteunde apparaten zijn de Circle, Circle+, Scan, Sense, Stealth en Switch.
 
 
 # bridge type configuration parameters
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties
index fdca9b09d..b3f750f52 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.plugwiseha.name = Plugwise Home Automation Binding
-binding.plugwiseha.description = This binding supports the Plugwise Home Automation 'Adam' gateway. It allows users to access temperature controls of zones defined on the gateway
+addon.plugwiseha.name = Plugwise Home Automation Binding
+addon.plugwiseha.description = This binding supports the Plugwise Home Automation 'Adam' gateway. It allows users to access temperature controls of zones defined on the gateway
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties
index c12887795..bf5b4f524 100644
--- a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties
+++ b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.powermax.name = Powermax Binding
-binding.powermax.description = The Powermax binding interfaces with Visonic PowerMax and PowerMaster alarm panel series.
+addon.powermax.name = Powermax Binding
+addon.powermax.description = The Powermax binding interfaces with Visonic PowerMax and PowerMaster alarm panel series.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax_fr.properties b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax_fr.properties
index 6e0581fc4..7c036e057 100644
--- a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax_fr.properties
+++ b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.powermax.name = Extension Powermax
-binding.powermax.description = Cette extension s'interface avec les centrales d'alarme de la marque Visonic (séries PowerMax et PowerMaster).
+addon.powermax.name = Extension Powermax
+addon.powermax.description = Cette extension s'interface avec les centrales d'alarme de la marque Visonic (séries PowerMax et PowerMaster).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer.properties b/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer.properties
index 0abc473d2..f65fa1baa 100644
--- a/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer.properties
+++ b/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer.properties
@@ -1,6 +1,6 @@
-# binding
-binding.proteusecometer.name = Proteus EcoMeter
-binding.proteusecometer.description = Puts your EcoMeter data into openHAB
+# add-on
+addon.proteusecometer.name = Proteus EcoMeter
+addon.proteusecometer.description = Puts your EcoMeter data into openHAB
 # thing types
 thing-type.proteusecometer.EcoMeterS.label = Proteus EcoMeter S
 thing-type.proteusecometer.EcoMeterS.description = Sensor for measuring water level of a cistern. Connected via USB
diff --git a/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer_de.properties b/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer_de.properties
index 096bb83b0..df294fab6 100644
--- a/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer_de.properties
+++ b/bundles/org.openhab.binding.proteusecometer/src/main/resources/OH-INF/i18n/proteusecometer_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.proteusecometer.name = Proteus EcoMeter
-binding.proteusecometer.description = EcoMeter Sensordaten in openHAB
+# add-on
+addon.proteusecometer.name = Proteus EcoMeter
+addon.proteusecometer.description = EcoMeter Sensordaten in openHAB
 # thing types
 thing-type.proteusecometer.EcoMeterS.label = Proteus EcoMeter S
 thing-type.proteusecometer.EcoMeterS.description = Füllstandsanzeige für Zisterne, Wassertanks, Erdtanks
diff --git a/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl.properties b/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl.properties
index 24a304150..c5180d75b 100644
--- a/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl.properties
+++ b/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.prowl.name = Prowl Binding
-binding.prowl.description = This is the binding for Prowl.
+addon.prowl.name = Prowl Binding
+addon.prowl.description = This is the binding for Prowl.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_fr.properties b/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_fr.properties
index ae5c1b864..744412e20 100644
--- a/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_fr.properties
+++ b/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.prowl.name = Extension Prowl
-binding.prowl.description = Il s'agit de l'extension pour Prowl.
+addon.prowl.name = Extension Prowl
+addon.prowl.description = Il s'agit de l'extension pour Prowl.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_it.properties b/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_it.properties
index 7f5e15795..69d1e5021 100644
--- a/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_it.properties
+++ b/bundles/org.openhab.binding.prowl/src/main/resources/OH-INF/i18n/prowl_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.prowl.name = Binding Prowl
-binding.prowl.description = Questo e' il binding per Prowl.
+addon.prowl.name = Binding Prowl
+addon.prowl.description = Questo e' il binding per Prowl.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland.properties b/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland.properties
index 0cac8fc9f..68d799d9e 100644
--- a/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland.properties
+++ b/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.publictransportswitzerland.name = Public Transport Switzerland Binding
-binding.publictransportswitzerland.description = Connects to the "Swiss public transport API" to provide real-time public transport information.
+addon.publictransportswitzerland.name = Public Transport Switzerland Binding
+addon.publictransportswitzerland.description = Connects to the "Swiss public transport API" to provide real-time public transport information.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_fi.properties b/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_fi.properties
index 6fe903609..139a9346b 100644
--- a/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_fi.properties
+++ b/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_fi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.publictransportswitzerland.name = Sveitsin julkisen liikenteen lisäosa
-binding.publictransportswitzerland.description = Ottaa yhteyden "Sveitsin julkisen liikenteen rajapintaan" esittääkseen reaaliaikaista tietoa julkisesta liikenteestä.
+addon.publictransportswitzerland.name = Sveitsin julkisen liikenteen lisäosa
+addon.publictransportswitzerland.description = Ottaa yhteyden "Sveitsin julkisen liikenteen rajapintaan" esittääkseen reaaliaikaista tietoa julkisesta liikenteestä.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_it.properties b/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_it.properties
index 72a12455f..151b880aa 100644
--- a/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_it.properties
+++ b/bundles/org.openhab.binding.publictransportswitzerland/src/main/resources/OH-INF/i18n/publictransportswitzerland_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.publictransportswitzerland.name = Binding Trasporto Pubblico Svizzero
-binding.publictransportswitzerland.description = Collegamenti alle “ API Trasporto Pubblico Svizzero” per fornire informazioni in tempo reale sul trasporto pubblico.
+addon.publictransportswitzerland.name = Binding Trasporto Pubblico Svizzero
+addon.publictransportswitzerland.description = Collegamenti alle “ API Trasporto Pubblico Svizzero” per fornire informazioni in tempo reale sul trasporto pubblico.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pulseaudio/src/main/resources/OH-INF/i18n/pulseaudio.properties b/bundles/org.openhab.binding.pulseaudio/src/main/resources/OH-INF/i18n/pulseaudio.properties
index 75aa31a75..16281ba95 100644
--- a/bundles/org.openhab.binding.pulseaudio/src/main/resources/OH-INF/i18n/pulseaudio.properties
+++ b/bundles/org.openhab.binding.pulseaudio/src/main/resources/OH-INF/i18n/pulseaudio.properties
@@ -1,18 +1,18 @@
-# binding
+# add-on
 
-binding.pulseaudio.name = Pulseaudio Binding
-binding.pulseaudio.description = This is the binding for Pulseaudio.
+addon.pulseaudio.name = Pulseaudio Binding
+addon.pulseaudio.description = This is the binding for Pulseaudio.
 
-# binding config
+# add-on config
 
-binding.config.pulseaudio.sink.label = Import Sinks
-binding.config.pulseaudio.sink.description = Activate the import of sink elements.
-binding.config.pulseaudio.sinkInput.label = Import Sink Inputs
-binding.config.pulseaudio.sinkInput.description = Activate the import of sink-input elements.
-binding.config.pulseaudio.source.label = Import Sources
-binding.config.pulseaudio.source.description = Activate the import of source elements.
-binding.config.pulseaudio.sourceOutput.label = Import Source Outputs
-binding.config.pulseaudio.sourceOutput.description = Activate the import of source-output elements.
+addon.config.pulseaudio.sink.label = Import Sinks
+addon.config.pulseaudio.sink.description = Activate the import of sink elements.
+addon.config.pulseaudio.sinkInput.label = Import Sink Inputs
+addon.config.pulseaudio.sinkInput.description = Activate the import of sink-input elements.
+addon.config.pulseaudio.source.label = Import Sources
+addon.config.pulseaudio.source.description = Activate the import of source elements.
+addon.config.pulseaudio.sourceOutput.label = Import Source Outputs
+addon.config.pulseaudio.sourceOutput.description = Activate the import of source-output elements.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pushbullet/src/main/resources/OH-INF/i18n/pushbullet.properties b/bundles/org.openhab.binding.pushbullet/src/main/resources/OH-INF/i18n/pushbullet.properties
index 67da019db..4b0ddc059 100644
--- a/bundles/org.openhab.binding.pushbullet/src/main/resources/OH-INF/i18n/pushbullet.properties
+++ b/bundles/org.openhab.binding.pushbullet/src/main/resources/OH-INF/i18n/pushbullet.properties
@@ -1,6 +1,6 @@
-# binding
-binding.pushbullet.name = Pushbullet Binding
-binding.pushbullet.description = The Pushbullet binding allows you to send messages to other users of the Pushbullet service.
+# add-on
+addon.pushbullet.name = Pushbullet Binding
+addon.pushbullet.description = The Pushbullet binding allows you to send messages to other users of the Pushbullet service.
 
 # action
 actionSendPushbulletNoteLabel = publish a Pushbullet message
diff --git a/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover.properties b/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover.properties
index abc609c56..d570bb1c6 100644
--- a/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover.properties
+++ b/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pushover.name = Pushover Binding
-binding.pushover.description = Pushover - Simple Notifications.
+addon.pushover.name = Pushover Binding
+addon.pushover.description = Pushover - Simple Notifications.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover_de.properties b/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover_de.properties
index 58e18e579..8d0b511d5 100644
--- a/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover_de.properties
+++ b/bundles/org.openhab.binding.pushover/src/main/resources/OH-INF/i18n/pushover_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pushover.name = Pushover Binding
-binding.pushover.description = Pushover - Simple Notifications.
+addon.pushover.name = Pushover Binding
+addon.pushover.description = Pushover - Simple Notifications.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties
index 3ccd839c0..b3c88546e 100644
--- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties
+++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pushsafer.name = Pushsafer Binding
-binding.pushsafer.description = With Pushsafer you can send & receive push notifications in real time, easily and securely on your iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera & Yandex)!
+addon.pushsafer.name = Pushsafer Binding
+addon.pushsafer.description = With Pushsafer you can send & receive push notifications in real time, easily and securely on your iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera & Yandex)!
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties
index 6263d4715..4aa0a86f4 100644
--- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties
+++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.pushsafer.name = Pushsafer Binding
-binding.pushsafer.description = Mit Pushsafer können Nachrichten in Echtzeit gesendet und empfangen werden. Einfach und sicher auf Ihrem iPhone, iPad, Android, Windows Mobile oder Windows Desktop Gerät sowie in Ihrem Browser (Chrome, Firefox, Opera & Yandex)\!
+addon.pushsafer.name = Pushsafer Binding
+addon.pushsafer.description = Mit Pushsafer können Nachrichten in Echtzeit gesendet und empfangen werden. Einfach und sicher auf Ihrem iPhone, iPad, Android, Windows Mobile oder Windows Desktop Gerät sowie in Ihrem Browser (Chrome, Firefox, Opera & Yandex)\!
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus.properties b/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus.properties
index 927884f80..3ea894165 100644
--- a/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus.properties
+++ b/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.qbus.name = Qbus Binding
-binding.qbus.description = This is the binding for the Qbus home automation system. Qbus is a system made and developed in Belgium (https://www.qbus.be/nl-nl)
+addon.qbus.name = Qbus Binding
+addon.qbus.description = This is the binding for the Qbus home automation system. Qbus is a system made and developed in Belgium (https://www.qbus.be/nl-nl)
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus_nl.properties b/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus_nl.properties
index d9f8602d4..df8814178 100644
--- a/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus_nl.properties
+++ b/bundles/org.openhab.binding.qbus/src/main/resources/OH-INF/i18n/qbus_nl.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.qbus.name = Qbus Binding
-binding.qbus.description = Deze binding maakt via een server applicate verbinding met de Qbus controller.
+addon.qbus.name = Qbus Binding
+addon.qbus.description = Deze binding maakt via een server applicate verbinding met de Qbus controller.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.qolsysiq/src/main/resources/OH-INF/i18n/qolsysiq.properties b/bundles/org.openhab.binding.qolsysiq/src/main/resources/OH-INF/i18n/qolsysiq.properties
index 5a81255e8..a4bd7677c 100644
--- a/bundles/org.openhab.binding.qolsysiq/src/main/resources/OH-INF/i18n/qolsysiq.properties
+++ b/bundles/org.openhab.binding.qolsysiq/src/main/resources/OH-INF/i18n/qolsysiq.properties
@@ -1,9 +1,9 @@
 ## mvn i18n:generate-default-translations
 
-# binding
+# add-on
 
-binding.qolsysiq.name = QolsysIQ Binding
-binding.qolsysiq.description = This is the binding for Qolsys IQ Alarm Systems.
+addon.qolsysiq.name = QolsysIQ Binding
+addon.qolsysiq.description = This is the binding for Qolsys IQ Alarm Systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties
index 999cfd709..e8191e4c7 100644
--- a/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties
+++ b/bundles/org.openhab.binding.radiothermostat/src/main/resources/OH-INF/i18n/radiothermostat.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.radiothermostat.name = Radio Thermostat Binding
-binding.radiothermostat.description = Controls the RadioThermostat model CT30, CT50 or CT80 via the built-in WIFI module
+addon.radiothermostat.name = Radio Thermostat Binding
+addon.radiothermostat.description = Controls the RadioThermostat model CT30, CT50 or CT80 via the built-in WIFI module
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties b/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties
index c5f2c9fa1..d9cf430a4 100644
--- a/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties
+++ b/bundles/org.openhab.binding.regoheatpump/src/main/resources/OH-INF/i18n/regoheatpump.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.regoheatpump.name = RegoHeatPump Binding
-binding.regoheatpump.description = The Rego controller based heat pumps binding.
+addon.regoheatpump.name = RegoHeatPump Binding
+addon.regoheatpump.description = The Rego controller based heat pumps binding.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab.properties b/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab.properties
index 3f8293f81..0ef443853 100644
--- a/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab.properties
+++ b/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.remoteopenhab.name = Remote openHAB Binding
-binding.remoteopenhab.description = The Remote openHAB binding allows to communicate with remote openHAB servers.
+addon.remoteopenhab.name = Remote openHAB Binding
+addon.remoteopenhab.description = The Remote openHAB binding allows to communicate with remote openHAB servers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_de.properties b/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_de.properties
index adda5365d..483d9a989 100644
--- a/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_de.properties
+++ b/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.remoteopenhab.name = Remote openHAB Binding
-binding.remoteopenhab.description = Die Remote openHAB Bindung ermöglicht die Kommunikation mit entfernten openHAB Servern.
+addon.remoteopenhab.name = Remote openHAB Binding
+addon.remoteopenhab.description = Die Remote openHAB Bindung ermöglicht die Kommunikation mit entfernten openHAB Servern.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_hu.properties b/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_hu.properties
index 0e7e75f86..3598bc265 100644
--- a/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_hu.properties
+++ b/bundles/org.openhab.binding.remoteopenhab/src/main/resources/OH-INF/i18n/remoteopenhab_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.remoteopenhab.name = Távoli openHAB kötés
-binding.remoteopenhab.description = A távoli openHAB kötés egyéb openHAB kiszolgálókkal való kommunikációt tesz lehetővé.
+addon.remoteopenhab.name = Távoli openHAB kötés
+addon.remoteopenhab.description = A távoli openHAB kötés egyéb openHAB kiszolgálókkal való kommunikációt tesz lehetővé.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault.properties b/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault.properties
index 4faaca2d4..72572fe32 100644
--- a/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault.properties
+++ b/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.renault.name = Renault Binding
-binding.renault.description = This is the binding for Renault electric cars.
+addon.renault.name = Renault Binding
+addon.renault.description = This is the binding for Renault electric cars.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault_fr.properties b/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault_fr.properties
index f3a20af26..f08ebe2b6 100644
--- a/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault_fr.properties
+++ b/bundles/org.openhab.binding.renault/src/main/resources/OH-INF/i18n/renault_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.renault.name = Extension Renault
-binding.renault.description = C'est l'extension pour les voitures électriques Renault.
+addon.renault.name = Extension Renault
+addon.renault.description = C'est l'extension pour les voitures électriques Renault.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol.properties b/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol.properties
index 6500ec0ca..0b90fef0a 100644
--- a/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol.properties
+++ b/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.resol.name = Resol Binding
-binding.resol.description = This is the binding for Resol solar and system controllers (including branded versions).
+addon.resol.name = Resol Binding
+addon.resol.description = This is the binding for Resol solar and system controllers (including branded versions).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol_de.properties b/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol_de.properties
index bebe6480f..4a6ed666d 100644
--- a/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol_de.properties
+++ b/bundles/org.openhab.binding.resol/src/main/resources/OH-INF/i18n/resol_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.resol.name = Resol Binding
-binding.resol.description = Verbindet Solar- und Systemregler des Herstellers Resol und weitere, die für andere Marken von Resol produziert werden.
+# add-on
+addon.resol.name = Resol Binding
+addon.resol.description = Verbindet Solar- und Systemregler des Herstellers Resol und weitere, die für andere Marken von Resol produziert werden.
 
 # thing types
 thing-type.resol.device.label = Resol Gerät
diff --git a/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi.properties b/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi.properties
index fe9124115..bf7c8ddb8 100644
--- a/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi.properties
+++ b/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.revogi.name = Revogi Binding
-binding.revogi.description = This is the binding for Revogi devices. Revogi is a vendor of several smart home devices like light bulbs, power strips and sensors.
+addon.revogi.name = Revogi Binding
+addon.revogi.description = This is the binding for Revogi devices. Revogi is a vendor of several smart home devices like light bulbs, power strips and sensors.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi_de.properties b/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi_de.properties
index 7f929bb9e..cc96b78dd 100644
--- a/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi_de.properties
+++ b/bundles/org.openhab.binding.revogi/src/main/resources/OH-INF/i18n/revogi_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.revogi.name = Revogi Smart Strip Binding
-binding.revogi.description = Mit diesem Binding kann man die Steckdosen im Smart Strip steuern und Verbrauchsinformationen erhalten
+# add-on
+addon.revogi.name = Revogi Smart Strip Binding
+addon.revogi.description = Mit diesem Binding kann man die Steckdosen im Smart Strip steuern und Verbrauchsinformationen erhalten
 
 # thing types
 thing-type.revogi.smartstrip.label = SmartStrip
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
index 718e0c03c..10e12bfa7 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
+++ b/bundles/org.openhab.binding.rfxcom/src/main/resources/OH-INF/i18n/rfxcom.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.rfxcom.name = RFXCOM Binding
-binding.rfxcom.description = This is the binding for RFXCOM transceivers.
+addon.rfxcom.name = RFXCOM Binding
+addon.rfxcom.description = This is the binding for RFXCOM transceivers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.rme/src/main/resources/OH-INF/i18n/rme.properties b/bundles/org.openhab.binding.rme/src/main/resources/OH-INF/i18n/rme.properties
index 8af6d1847..cf4069f33 100644
--- a/bundles/org.openhab.binding.rme/src/main/resources/OH-INF/i18n/rme.properties
+++ b/bundles/org.openhab.binding.rme/src/main/resources/OH-INF/i18n/rme.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.rme.name = openHAB RME Binding
-binding.rme.description = This is the binding for RME Rain Manager.
+addon.rme.name = openHAB RME Binding
+addon.rme.description = This is the binding for RME Rain Manager.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.robonect/src/main/resources/OH-INF/i18n/robonect.properties b/bundles/org.openhab.binding.robonect/src/main/resources/OH-INF/i18n/robonect.properties
index eba22b4f8..533ba3abd 100644
--- a/bundles/org.openhab.binding.robonect/src/main/resources/OH-INF/i18n/robonect.properties
+++ b/bundles/org.openhab.binding.robonect/src/main/resources/OH-INF/i18n/robonect.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.robonect.name = Robonect Binding
-binding.robonect.description = This is the binding for Robonect.
+addon.robonect.name = Robonect Binding
+addon.robonect.description = This is the binding for Robonect.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.roku/src/main/resources/OH-INF/i18n/roku.properties b/bundles/org.openhab.binding.roku/src/main/resources/OH-INF/i18n/roku.properties
index a71481c0d..1a4ebccda 100644
--- a/bundles/org.openhab.binding.roku/src/main/resources/OH-INF/i18n/roku.properties
+++ b/bundles/org.openhab.binding.roku/src/main/resources/OH-INF/i18n/roku.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.roku.name = Roku Binding
-binding.roku.description = Controls Roku Streaming Media Players and TVs
+addon.roku.name = Roku Binding
+addon.roku.description = Controls Roku Streaming Media Players and TVs
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties
index 7bc44e09a..414a3f6e1 100644
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.rotel.name = Rotel Binding
-binding.rotel.description = The Rotel binding controls a Rotel audio device like a surround processor, a surround receiver, a stereo preamplifier, an integrated amplifier, a CD player or a tuner.
+addon.rotel.name = Rotel Binding
+addon.rotel.description = The Rotel binding controls a Rotel audio device like a surround processor, a surround receiver, a stereo preamplifier, an integrated amplifier, a CD player or a tuner.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel_fr.properties b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel_fr.properties
index c76bd737c..5b64e54ee 100644
--- a/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel_fr.properties
+++ b/bundles/org.openhab.binding.rotel/src/main/resources/OH-INF/i18n/rotel_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.rotel.name = Extension Rotel
-binding.rotel.description = L'extension Rotel permet de contrôler des appareils audio de la marque Rotel comme un préampli ou amplli Hi-Fi stéréo, un préampli ou ampli Home-Cinéma, un lecteur CD ou un tuner.
+addon.rotel.name = Extension Rotel
+addon.rotel.description = L'extension Rotel permet de contrôler des appareils audio de la marque Rotel comme un préampli ou amplli Hi-Fi stéréo, un préampli ou ampli Home-Cinéma, un lecteur CD ou un tuner.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.russound/src/main/resources/OH-INF/i18n/russound.properties b/bundles/org.openhab.binding.russound/src/main/resources/OH-INF/i18n/russound.properties
index 0b6b48c73..a4e253811 100644
--- a/bundles/org.openhab.binding.russound/src/main/resources/OH-INF/i18n/russound.properties
+++ b/bundles/org.openhab.binding.russound/src/main/resources/OH-INF/i18n/russound.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.russound.name = Russound Binding
-binding.russound.description = This is the binding for Russound Whole House Audio systems (MCA and X-Systems).
+addon.russound.name = Russound Binding
+addon.russound.description = This is the binding for Russound Whole House Audio systems (MCA and X-Systems).
 
 # thing types
 
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 24e1f22c8..aac611194 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,4 +1,4 @@
-# binding
+# add-on
 
 bindingName = SagerCaster Binding
 bindingDescription = The Sager Weathercaster is a scientific instrument for accurate prediction of the weather.
diff --git a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_de.properties b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_de.properties
index 7df1835da..45c9ff9b6 100644
--- a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_de.properties
+++ b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_de.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 bindingName = SagerCaster Binding
 bindingDescription = Die SagerCaster-Erweiterung wird zur Erstellung von Wettervorhersagen verwendet.
 
diff --git a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_fr.properties b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_fr.properties
index fc839ebee..a99455f51 100644
--- a/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_fr.properties
+++ b/bundles/org.openhab.binding.sagercaster/src/main/resources/OH-INF/i18n/sagercaster_fr.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 
 bindingName = Extension SagerCaster
 bindingDescription = Sager Weathercaster est un instrument scientifique pour produire des prédicitions météo précises.
diff --git a/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv.properties b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv.properties
index 7f759ba29..44ce03b37 100644
--- a/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv.properties
+++ b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.samsungtv.name = Samsung TV Binding
-binding.samsungtv.description = This is the binding for Samsung TV. Binding should support all Samsung TV C (2010), D (2011) and E (2012) models
+addon.samsungtv.name = Samsung TV Binding
+addon.samsungtv.description = This is the binding for Samsung TV. Binding should support all Samsung TV C (2010), D (2011) and E (2012) models
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_de.properties b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_de.properties
index bdfe7ab43..c84e9c5e2 100644
--- a/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_de.properties
+++ b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.samsungtv.name = Samsung TV Binding
-binding.samsungtv.description = Dieses Binding integriert Samsung TV Geräte, wodurch diese gesteuert werden können.
+# add-on
+addon.samsungtv.name = Samsung TV Binding
+addon.samsungtv.description = Dieses Binding integriert Samsung TV Geräte, wodurch diese gesteuert werden können.
 
 # thing types
 thing-type.samsungtv.tv.label = Samsung TV
diff --git a/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_hu.properties b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_hu.properties
index b9d190890..f921c6619 100644
--- a/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_hu.properties
+++ b/bundles/org.openhab.binding.samsungtv/src/main/resources/OH-INF/i18n/samsungtv_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.samsungtv.name = Samsung TV kötés
-binding.samsungtv.description = Ez a kötés a Samsung TV készülékekhez készült. A kötés támogatja a C (2010), D (2011) és E (2012) modelleket
+addon.samsungtv.name = Samsung TV kötés
+addon.samsungtv.description = Ez a kötés a Samsung TV készülékekhez készült. A kötés támogatja a C (2010), D (2011) és E (2012) modelleket
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.semsportal/src/main/resources/OH-INF/i18n/semsportal.properties b/bundles/org.openhab.binding.semsportal/src/main/resources/OH-INF/i18n/semsportal.properties
index ac8960156..f07c1559b 100644
--- a/bundles/org.openhab.binding.semsportal/src/main/resources/OH-INF/i18n/semsportal.properties
+++ b/bundles/org.openhab.binding.semsportal/src/main/resources/OH-INF/i18n/semsportal.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.semsportal.name = SEMSPortal Binding
-binding.semsportal.description = This is the binding for SEMSPortal. The SEMS portal is where a GoodWE solar installation uploads it's data. The SEMS portal has a lot of data, only a few of them are currently mapped to a channel. You will need an account at semsportal.com and have your solar installation registered on that account.
+addon.semsportal.name = SEMSPortal Binding
+addon.semsportal.description = This is the binding for SEMSPortal. The SEMS portal is where a GoodWE solar installation uploads it's data. The SEMS portal has a lot of data, only a few of them are currently mapped to a channel. You will need an account at semsportal.com and have your solar installation registered on that account.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.senechome/src/main/resources/OH-INF/i18n/senechome.properties b/bundles/org.openhab.binding.senechome/src/main/resources/OH-INF/i18n/senechome.properties
index 20da0aa96..a27af54f3 100644
--- a/bundles/org.openhab.binding.senechome/src/main/resources/OH-INF/i18n/senechome.properties
+++ b/bundles/org.openhab.binding.senechome/src/main/resources/OH-INF/i18n/senechome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.senechome.name = SenecHome Binding
-binding.senechome.description = This is the binding for SenecHome.
+addon.senechome.name = SenecHome Binding
+addon.senechome.description = This is the binding for SenecHome.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.seneye/src/main/resources/OH-INF/i18n/seneye.properties b/bundles/org.openhab.binding.seneye/src/main/resources/OH-INF/i18n/seneye.properties
index bb2e83d24..ecd646acf 100644
--- a/bundles/org.openhab.binding.seneye/src/main/resources/OH-INF/i18n/seneye.properties
+++ b/bundles/org.openhab.binding.seneye/src/main/resources/OH-INF/i18n/seneye.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.seneye.name = Seneye Binding
-binding.seneye.description = The seneye binding polls the seneye API for your aquarium readings.
+addon.seneye.name = Seneye Binding
+addon.seneye.description = The seneye binding polls the seneye API for your aquarium readings.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox.properties b/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox.properties
index effe01100..9aabbbf4c 100644
--- a/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox.properties
+++ b/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sensebox.name = senseBox Binding
-binding.sensebox.description = The senseBox binding imports data from the senseBox Citizen Science project.
+addon.sensebox.name = senseBox Binding
+addon.sensebox.description = The senseBox binding imports data from the senseBox Citizen Science project.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox_de.properties b/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox_de.properties
index 19ee508b6..0c83325fc 100644
--- a/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox_de.properties
+++ b/bundles/org.openhab.binding.sensebox/src/main/resources/OH-INF/i18n/sensebox_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sensebox.name = senseBox Binding
-binding.sensebox.description = Das senseBox Binding importiert Daten aus dem senseBox Citizen Science-Projekt.
+addon.sensebox.name = senseBox Binding
+addon.sensebox.description = Das senseBox Binding importiert Daten aus dem senseBox Citizen Science-Projekt.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/i18n/sensibo.properties b/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/i18n/sensibo.properties
index 05d554bdd..66eec8034 100644
--- a/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/i18n/sensibo.properties
+++ b/bundles/org.openhab.binding.sensibo/src/main/resources/OH-INF/i18n/sensibo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sensibo.name = Sensibo Binding
-binding.sensibo.description = This is the binding for Sensibo products
+addon.sensibo.name = Sensibo Binding
+addon.sensibo.description = This is the binding for Sensibo products
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.serial/src/main/resources/OH-INF/i18n/serial.properties b/bundles/org.openhab.binding.serial/src/main/resources/OH-INF/i18n/serial.properties
index 7c964a99d..32e799535 100644
--- a/bundles/org.openhab.binding.serial/src/main/resources/OH-INF/i18n/serial.properties
+++ b/bundles/org.openhab.binding.serial/src/main/resources/OH-INF/i18n/serial.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.serial.name = Serial Binding
-binding.serial.description = This binding supports sending/receiving data to/from a serial port
+addon.serial.name = Serial Binding
+addon.serial.description = This binding supports sending/receiving data to/from a serial port
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.serialbutton/src/main/resources/OH-INF/i18n/serialbutton.properties b/bundles/org.openhab.binding.serialbutton/src/main/resources/OH-INF/i18n/serialbutton.properties
index 90e1706c3..16134ada9 100644
--- a/bundles/org.openhab.binding.serialbutton/src/main/resources/OH-INF/i18n/serialbutton.properties
+++ b/bundles/org.openhab.binding.serialbutton/src/main/resources/OH-INF/i18n/serialbutton.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.serialbutton.name = Serial Button Binding
-binding.serialbutton.description = This binding supports physical push buttons connected to a serial port.
+addon.serialbutton.name = Serial Button Binding
+addon.serialbutton.description = This binding supports physical push buttons connected to a serial port.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties
index 7ca493dea..68fa3f2f1 100644
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties
@@ -1,14 +1,14 @@
-# binding
-binding.shelly.name = Shelly Binding
-binding.shelly.description = This binding integrates Shelly devices that can be controlled via WiFi.
-binding.shelly.config.defaultUserId.label = Default UserId
-binding.shelly.config.defaultUserId.description = This default user id will be used for device access if no one is specified in the thing configuration.
-binding.shelly.config.defaultPassword.label = Default Password
-binding.shelly.config.defaultPassword.description = Default password for device access if none is specified in the thing configuration.
-binding.shelly.config.localIP.label = Host Interface IP
-binding.shelly.config.localIP.description = This interface will be used to setup CoIoT listen and build Action URLs. openHAB's network configuration will be used if this is not set (recommended)
-binding.shelly.config.autoCoIoT.label = Auto-CoIoT
-binding.shelly.config.autoCoIoT.description = If enabled CoIoT will be automatically used when the devices runs a firmware version 1.6 or newer; false: Use thing configuration to enabled/disable CoIoT events.  
+# add-on
+addon.shelly.name = Shelly Binding
+addon.shelly.description = This binding integrates Shelly devices that can be controlled via WiFi.
+addon.shelly.config.defaultUserId.label = Default UserId
+addon.shelly.config.defaultUserId.description = This default user id will be used for device access if no one is specified in the thing configuration.
+addon.shelly.config.defaultPassword.label = Default Password
+addon.shelly.config.defaultPassword.description = Default password for device access if none is specified in the thing configuration.
+addon.shelly.config.localIP.label = Host Interface IP
+addon.shelly.config.localIP.description = This interface will be used to setup CoIoT listen and build Action URLs. openHAB's network configuration will be used if this is not set (recommended)
+addon.shelly.config.autoCoIoT.label = Auto-CoIoT
+addon.shelly.config.autoCoIoT.description = If enabled CoIoT will be automatically used when the devices runs a firmware version 1.6 or newer; false: Use thing configuration to enabled/disable CoIoT events.  
 
 # Config status messages
 message.config-status.error.missing-device-ip = IP address of the Shelly device is missing.
diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly_de.properties b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly_de.properties
index 6fa2c73fc..2cc80c8fc 100644
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly_de.properties
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly_de.properties
@@ -1,14 +1,14 @@
-# binding
-binding.shelly.name = Shelly Binding
-binding.shelly.description = Dieses Binding unterstützt Shelly Geräte, die über WiFi gesteuert werden können.
-binding.shelly.config.defaultUserId.label = Standardbenutzerkennung
-binding.shelly.config.defaultUserId.description = Sofern konfiguriert, wird diese für den Zugriff auf das Gerät verwendet, wenn in der Thing-Konfiguration keine angegeben ist.
-binding.shelly.config.defaultPassword.label = Passwort
-binding.shelly.config.defaultPassword.description = Dieses Passwort wird für den Gerätezugriff verwendet, wenn in der Thing-Konfiguration keines gesetzt ist.
-binding.shelly.config.localIP.label = IP-Adresse
-binding.shelly.config.localIP.description = Lokale IP-Adresse der Netzwerk-Schnittstelle, welche für Verbindungen genutzt wird (CoIoT Listen und http-Callback). Default\: Voreingestelltes Interface aus der openHAB Netzwerkkonfiguration.
-binding.shelly.config.autoCoIoT.label = Auto-CoIoT
-binding.shelly.config.autoCoIoT.description = Bei aktiviertem Auto-CoIoT wird das Protokoll aktiviert, sobald das Gerät eine Firmwareversion 1.6 oder neuer verwendet. Andernfalls wird dies über die Thing-Konfiguration gesteuert.
+# add-on
+addon.shelly.name = Shelly Binding
+addon.shelly.description = Dieses Binding unterstützt Shelly Geräte, die über WiFi gesteuert werden können.
+addon.shelly.config.defaultUserId.label = Standardbenutzerkennung
+addon.shelly.config.defaultUserId.description = Sofern konfiguriert, wird diese für den Zugriff auf das Gerät verwendet, wenn in der Thing-Konfiguration keine angegeben ist.
+addon.shelly.config.defaultPassword.label = Passwort
+addon.shelly.config.defaultPassword.description = Dieses Passwort wird für den Gerätezugriff verwendet, wenn in der Thing-Konfiguration keines gesetzt ist.
+addon.shelly.config.localIP.label = IP-Adresse
+addon.shelly.config.localIP.description = Lokale IP-Adresse der Netzwerk-Schnittstelle, welche für Verbindungen genutzt wird (CoIoT Listen und http-Callback). Default\: Voreingestelltes Interface aus der openHAB Netzwerkkonfiguration.
+addon.shelly.config.autoCoIoT.label = Auto-CoIoT
+addon.shelly.config.autoCoIoT.description = Bei aktiviertem Auto-CoIoT wird das Protokoll aktiviert, sobald das Gerät eine Firmwareversion 1.6 oder neuer verwendet. Andernfalls wird dies über die Thing-Konfiguration gesteuert.
 
 # Config status messages
 message.config-status.error.missing-device-ip = Die IP-Adresse des Shelly Gerätes ist nicht konfiguriert.
diff --git a/bundles/org.openhab.binding.siemensrds/src/main/resources/OH-INF/i18n/siemensrds.properties b/bundles/org.openhab.binding.siemensrds/src/main/resources/OH-INF/i18n/siemensrds.properties
index 0594a45a0..36af7119d 100644
--- a/bundles/org.openhab.binding.siemensrds/src/main/resources/OH-INF/i18n/siemensrds.properties
+++ b/bundles/org.openhab.binding.siemensrds/src/main/resources/OH-INF/i18n/siemensrds.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.siemensrds.name = Siemens RDS Binding
-binding.siemensrds.description = This is the binding for Siemens RDS smart thermostats
+addon.siemensrds.name = Siemens RDS Binding
+addon.siemensrds.description = This is the binding for Siemens RDS smart thermostats
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.silvercrestwifisocket/src/main/resources/OH-INF/i18n/silvercrestwifisocket.properties b/bundles/org.openhab.binding.silvercrestwifisocket/src/main/resources/OH-INF/i18n/silvercrestwifisocket.properties
index e3eb3ade9..7c530debc 100644
--- a/bundles/org.openhab.binding.silvercrestwifisocket/src/main/resources/OH-INF/i18n/silvercrestwifisocket.properties
+++ b/bundles/org.openhab.binding.silvercrestwifisocket/src/main/resources/OH-INF/i18n/silvercrestwifisocket.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.silvercrestwifisocket.name = Silvercrest Wifi Socket Binding
-binding.silvercrestwifisocket.description = This is the binding for Silvercrest Wifi Socket sold by Lidl.
+addon.silvercrestwifisocket.name = Silvercrest Wifi Socket Binding
+addon.silvercrestwifisocket.description = This is the binding for Silvercrest Wifi Socket sold by Lidl.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter.properties b/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter.properties
index 6ad870250..12f9ef6c9 100644
--- a/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter.properties
+++ b/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.smaenergymeter.name = SMA Energy Meter Binding
-binding.smaenergymeter.description = Binding for a SMA Energy Meter.
+addon.smaenergymeter.name = SMA Energy Meter Binding
+addon.smaenergymeter.description = Binding for a SMA Energy Meter.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter_de.properties b/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter_de.properties
index 2b40a9c39..2987fa4c4 100644
--- a/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter_de.properties
+++ b/bundles/org.openhab.binding.smaenergymeter/src/main/resources/OH-INF/i18n/smaenergymeter_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.smaenergymeter.name = SMA Energy Meter Binding
-binding.smaenergymeter.description = Binding für einen SMA Energy Meter.
+# add-on
+addon.smaenergymeter.name = SMA Energy Meter Binding
+addon.smaenergymeter.description = Binding für einen SMA Energy Meter.
 
 # thing types
 thing-type.smaenergymeter.energymeter.label = SMA Energy Meter
diff --git a/bundles/org.openhab.binding.smartmeter/src/main/resources/OH-INF/i18n/smartmeter.properties b/bundles/org.openhab.binding.smartmeter/src/main/resources/OH-INF/i18n/smartmeter.properties
index b257c733d..adcfa059e 100644
--- a/bundles/org.openhab.binding.smartmeter/src/main/resources/OH-INF/i18n/smartmeter.properties
+++ b/bundles/org.openhab.binding.smartmeter/src/main/resources/OH-INF/i18n/smartmeter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.smartmeter.name = Smartmeter Binding
-binding.smartmeter.description = The Smartmeter binding is able to read SML messages (PUSH) and supports IEC 62056-21 modes A,B,C (PULL) and D (PUSH).
+addon.smartmeter.name = Smartmeter Binding
+addon.smartmeter.description = The Smartmeter binding is able to read SML messages (PUSH) and supports IEC 62056-21 modes A,B,C (PULL) and D (PUSH).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/i18n/smartthings.properties b/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/i18n/smartthings.properties
index 600a3cc59..af094cdf3 100644
--- a/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/i18n/smartthings.properties
+++ b/bundles/org.openhab.binding.smartthings/src/main/resources/OH-INF/i18n/smartthings.properties
@@ -3,5 +3,5 @@ config-status.error.missing-ip-configuration=No IP address for the Smartthings b
 config-status.error.missing-port-configuration=No port for the Smartthings bridge has been provided.
 config-status.error.missing-smartthings-name=No Smartthings name has been provided
 
-binding.smartthings.name = Smartthings 
-binding.smartthings.description = Samsung Smartthings hub
+addon.smartthings.name = Smartthings 
+addon.smartthings.description = Samsung Smartthings hub
diff --git a/bundles/org.openhab.binding.smhi/src/main/resources/OH-INF/i18n/smhi.properties b/bundles/org.openhab.binding.smhi/src/main/resources/OH-INF/i18n/smhi.properties
index 9efd510b6..7a5a29347 100644
--- a/bundles/org.openhab.binding.smhi/src/main/resources/OH-INF/i18n/smhi.properties
+++ b/bundles/org.openhab.binding.smhi/src/main/resources/OH-INF/i18n/smhi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.smhi.name = SMHI Binding
-binding.smhi.description = Binding for getting weather forecasts from the Swedish Meteorological and Hydrological Institute (SMHI)
+addon.smhi.name = SMHI Binding
+addon.smhi.description = Binding for getting weather forecasts from the Swedish Meteorological and Hydrological Institute (SMHI)
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem.properties b/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem.properties
index 3634b7d0f..7dccaf398 100644
--- a/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem.properties
+++ b/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.smsmodem.name = SMSModem Binding
-binding.smsmodem.description = This binding handle a GSM modem connected to the openHAB server (Serial), or exposed on the network. It can send and receive SMS.
+addon.smsmodem.name = SMSModem Binding
+addon.smsmodem.description = This binding handle a GSM modem connected to the openHAB server (Serial), or exposed on the network. It can send and receive SMS.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_fr.properties b/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_fr.properties
index fd253435b..11dface9e 100644
--- a/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_fr.properties
+++ b/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.smsmodem.name = Extension SMSModem
-binding.smsmodem.description = Cette extension gère un modem GSM supportant les messages AT et connecté au serveur (en USB/série), ou exposé sur le réseau. Elle peut envoyer et recevoir des SMS.
+addon.smsmodem.name = Extension SMSModem
+addon.smsmodem.description = Cette extension gère un modem GSM supportant les messages AT et connecté au serveur (en USB/série), ou exposé sur le réseau. Elle peut envoyer et recevoir des SMS.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_it.properties b/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_it.properties
index 416ef6e14..9de00fa2b 100644
--- a/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_it.properties
+++ b/bundles/org.openhab.binding.smsmodem/src/main/resources/OH-INF/i18n/smsmodem_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.smsmodem.name = Gestione Modem SMS
-binding.smsmodem.description = Gestisce un modem GSM collegato al server openHAB (via seriale), o connesso alla rete. Può inviare e ricevere SMS.
+addon.smsmodem.name = Gestione Modem SMS
+addon.smsmodem.description = Gestisce un modem GSM collegato al server openHAB (via seriale), o connesso alla rete. Può inviare e ricevere SMS.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties
index 0039650ed..68ccf324b 100644
--- a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties
+++ b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sncf.name = SNCF Binding
-binding.sncf.description = Retrieves French railway informations
+addon.sncf.name = SNCF Binding
+addon.sncf.description = Retrieves French railway informations
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf_fr.properties b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf_fr.properties
index e655cfb12..d9cf26566 100644
--- a/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf_fr.properties
+++ b/bundles/org.openhab.binding.sncf/src/main/resources/OH-INF/i18n/sncf_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sncf.name = Extension SNCF
-binding.sncf.description = Cette extension fournit des informations sur les chemins de fer français.
+addon.sncf.name = Extension SNCF
+addon.sncf.description = Cette extension fournit des informations sur les chemins de fer français.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp.properties b/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp.properties
index 41f2e8520..736e0a4b3 100644
--- a/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp.properties
+++ b/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.snmp.name = SNMP Binding
-binding.snmp.description = This is the binding for SNMP.
+addon.snmp.name = SNMP Binding
+addon.snmp.description = This is the binding for SNMP.
 
-# binding config
+# add-on config
 
-binding.config.snmp.port.label = Incoming SNMP Port
-binding.config.snmp.port.description = Port for receiving traps, set to 0 to disable.
+addon.config.snmp.port.label = Incoming SNMP Port
+addon.config.snmp.port.description = Port for receiving traps, set to 0 to disable.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp_de.properties b/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp_de.properties
index 97038dd9b..c37ca57b3 100644
--- a/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp_de.properties
+++ b/bundles/org.openhab.binding.snmp/src/main/resources/OH-INF/i18n/snmp_de.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.snmp.name = SNMP Binding
-binding.snmp.description = Dies ist das Binding für SNMP (Simple Network Management Protocol)
+addon.snmp.name = SNMP Binding
+addon.snmp.description = Dies ist das Binding für SNMP (Simple Network Management Protocol)
 
-# binding config
+# add-on config
 
-binding.config.snmp.port.label = Eingehender SNMP-Port
-binding.config.snmp.port.description = Port zum Empfangen von TRAPS, auf 0 setzen um zu Deaktivieren.
+addon.config.snmp.port.label = Eingehender SNMP-Port
+addon.config.snmp.port.description = Port zum Empfangen von TRAPS, auf 0 setzen um zu Deaktivieren.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge.properties b/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge.properties
index 889349b95..3f4598dd1 100644
--- a/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge.properties
+++ b/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.solaredge.name = SolarEdge Binding
-binding.solaredge.description = This is the binding for SolarEdge.
+addon.solaredge.name = SolarEdge Binding
+addon.solaredge.description = This is the binding for SolarEdge.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge_de.properties b/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge_de.properties
index 7f8abdc90..9586769e3 100644
--- a/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge_de.properties
+++ b/bundles/org.openhab.binding.solaredge/src/main/resources/OH-INF/i18n/solaredge_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.solaredge.name = SolarEdge Binding
-binding.solaredge.description = Abfrage von Kennzahlen der Photovoltaikanlage über die Web-API von SolarEdge.
+# add-on
+addon.solaredge.name = SolarEdge Binding
+addon.solaredge.description = Abfrage von Kennzahlen der Photovoltaikanlage über die Web-API von SolarEdge.
 
 # thing types
 thing-type.solaredge.web.label = SolarEdge Wechselrichter
diff --git a/bundles/org.openhab.binding.solarlog/src/main/resources/OH-INF/i18n/solarlog.properties b/bundles/org.openhab.binding.solarlog/src/main/resources/OH-INF/i18n/solarlog.properties
index 7c36f792b..c2fa2aef5 100644
--- a/bundles/org.openhab.binding.solarlog/src/main/resources/OH-INF/i18n/solarlog.properties
+++ b/bundles/org.openhab.binding.solarlog/src/main/resources/OH-INF/i18n/solarlog.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.solarlog.name = Solar-Log Binding
-binding.solarlog.description = This is the binding for the Solar-Log product range developed and sold by Solare Datensysteme GmbH. The Solar-Log devices allow monitoring of Photovoltaic (PV) installations and provide a JSON API to extract data. This includes information about current energy production and use, and other vital parameters of a PV installation. This binding makes this data accessible to openHAB from where it can be persistently stored, used to trigger actions or be displayed for information.
+addon.solarlog.name = Solar-Log Binding
+addon.solarlog.description = This is the binding for the Solar-Log product range developed and sold by Solare Datensysteme GmbH. The Solar-Log devices allow monitoring of Photovoltaic (PV) installations and provide a JSON API to extract data. This includes information about current energy production and use, and other vital parameters of a PV installation. This binding makes this data accessible to openHAB from where it can be persistently stored, used to trigger actions or be displayed for information.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax.properties b/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax.properties
index 9a85c2403..4edfb9baf 100644
--- a/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax.properties
+++ b/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.solarmax.name = SolarMax Binding
-binding.solarmax.description = This is the binding for SolarMax power inverters, particularly the MT Series
+addon.solarmax.name = SolarMax Binding
+addon.solarmax.description = This is the binding for SolarMax power inverters, particularly the MT Series
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax_it.properties b/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax_it.properties
index 88acbf8bb..4e0cb3805 100644
--- a/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax_it.properties
+++ b/bundles/org.openhab.binding.solarmax/src/main/resources/OH-INF/i18n/solarmax_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.solarmax.name = Binding SolarMax
-binding.solarmax.description = Questo è il binding per gli inverter di potenza SolarMax, in particolare la serie MT
+addon.solarmax.name = Binding SolarMax
+addon.solarmax.description = Questo è il binding per gli inverter di potenza SolarMax, in particolare la serie MT
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.solarwatt/src/main/resources/OH-INF/i18n/solarwatt.properties b/bundles/org.openhab.binding.solarwatt/src/main/resources/OH-INF/i18n/solarwatt.properties
index 530b2a106..d9e3a1bbf 100644
--- a/bundles/org.openhab.binding.solarwatt/src/main/resources/OH-INF/i18n/solarwatt.properties
+++ b/bundles/org.openhab.binding.solarwatt/src/main/resources/OH-INF/i18n/solarwatt.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.solarwatt.name = Solarwatt Binding
-binding.solarwatt.description = This is the binding for Solarwatt Energymanager.
+addon.solarwatt.name = Solarwatt Binding
+addon.solarwatt.description = This is the binding for Solarwatt Energymanager.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.somfymylink/src/main/resources/OH-INF/i18n/somfymylink.properties b/bundles/org.openhab.binding.somfymylink/src/main/resources/OH-INF/i18n/somfymylink.properties
index 7970e75d1..bb045bfe5 100644
--- a/bundles/org.openhab.binding.somfymylink/src/main/resources/OH-INF/i18n/somfymylink.properties
+++ b/bundles/org.openhab.binding.somfymylink/src/main/resources/OH-INF/i18n/somfymylink.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.somfymylink.name = Somfy MyLink Binding
-binding.somfymylink.description = This is the binding for Somfy MyLink.
+addon.somfymylink.name = Somfy MyLink Binding
+addon.somfymylink.description = This is the binding for Somfy MyLink.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
index 3647f8dbc..5b6906dfd 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/resources/OH-INF/i18n/somfytahoma.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.somfytahoma.name = SomfyTahoma Binding
-binding.somfytahoma.description = This is the binding for Somfy Tahoma and Somfy Connexoon home automation systems and for any other system based on the OverKiz API.
+addon.somfytahoma.name = SomfyTahoma Binding
+addon.somfytahoma.description = This is the binding for Somfy Tahoma and Somfy Connexoon home automation systems and for any other system based on the OverKiz API.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo.properties b/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo.properties
index d5aa54476..10ab0b8ac 100644
--- a/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo.properties
+++ b/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo.properties
@@ -1,6 +1,6 @@
-# binding
-binding.somneo.name = Somneo Binding
-binding.somneo.description = This is the binding for Philips Somneo devices.
+# add-on
+addon.somneo.name = Somneo Binding
+addon.somneo.description = This is the binding for Philips Somneo devices.
 
 # thing types
 thing-type.somneo.hf367x.label = Philips Somneo Light
diff --git a/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_de.properties b/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_de.properties
index bef485750..4b909e758 100644
--- a/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_de.properties
+++ b/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.somneo.name = Somneo Binding
-binding.somneo.description = Dieses Binding integriert Philips Somneo Geräte.
+# add-on
+addon.somneo.name = Somneo Binding
+addon.somneo.description = Dieses Binding integriert Philips Somneo Geräte.
 
 # thing types
 thing-type.somneo.hf367x.label = Philips Somneo Light
diff --git a/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_it.properties b/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_it.properties
index c2773fc27..21c668438 100644
--- a/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_it.properties
+++ b/bundles/org.openhab.binding.somneo/src/main/resources/OH-INF/i18n/somneo_it.properties
@@ -1,6 +1,6 @@
-# binding
-binding.somneo.name = Binding Somneo
-binding.somneo.description = Questo è il binding per i dispositivi Philips Somneo.
+# add-on
+addon.somneo.name = Binding Somneo
+addon.somneo.description = Questo è il binding per i dispositivi Philips Somneo.
 
 # thing types
 thing-type.somneo.hf367x.label = Luce Philips Somneo
diff --git a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen.properties b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen.properties
index d7687f617..48cb6622b 100644
--- a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen.properties
+++ b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sonnen.name = Sonnen Binding
-binding.sonnen.description = This binding communicates with a solar battery from sonnen.
+addon.sonnen.name = Sonnen Binding
+addon.sonnen.description = This binding communicates with a solar battery from sonnen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen_fr.properties b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen_fr.properties
index 5db66b7d3..8948e7456 100644
--- a/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen_fr.properties
+++ b/bundles/org.openhab.binding.sonnen/src/main/resources/OH-INF/i18n/sonnen_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sonnen.name = Extension Sonnen
-binding.sonnen.description = Cette extension communique avec une batterie solaire Sonnen.
+addon.sonnen.name = Extension Sonnen
+addon.sonnen.description = Cette extension communique avec une batterie solaire Sonnen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties
index 5d5045058..97429e562 100644
--- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties
+++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties
@@ -1,14 +1,14 @@
-# binding
+# add-on
 
-binding.sonos.name = Sonos Binding
-binding.sonos.description = This is the binding for the Sonos multi-room audio system.
+addon.sonos.name = Sonos Binding
+addon.sonos.description = This is the binding for the Sonos multi-room audio system.
 
-# binding config
+# add-on config
 
-binding.config.sonos.callbackUrl.label = Callback URL
-binding.config.sonos.callbackUrl.description = URL to use for playing notification sounds, e.g. http://192.168.0.2:8080
-binding.config.sonos.opmlUrl.label = OPML Service URL
-binding.config.sonos.opmlUrl.description = URL for the OPML/tunein.com service
+addon.config.sonos.callbackUrl.label = Callback URL
+addon.config.sonos.callbackUrl.description = URL to use for playing notification sounds, e.g. http://192.168.0.2:8080
+addon.config.sonos.opmlUrl.label = OPML Service URL
+addon.config.sonos.opmlUrl.description = URL for the OPML/tunein.com service
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_de.properties b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_de.properties
index 9506a4632..ecfa07f28 100644
--- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_de.properties
+++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_de.properties
@@ -1,14 +1,14 @@
-# binding
+# add-on
 
-binding.sonos.name = Sonos Binding
-binding.sonos.description = Dieses Binding integriert das Home Sound System von Sonos. Durch dieses können Sonos Speaker und Gruppen gesteuert werden.
+addon.sonos.name = Sonos Binding
+addon.sonos.description = Dieses Binding integriert das Home Sound System von Sonos. Durch dieses können Sonos Speaker und Gruppen gesteuert werden.
 
-# binding config
+# add-on config
 
-binding.config.sonos.callbackUrl.label = Callback URL
-binding.config.sonos.callbackUrl.description = URL zum Abspielen von Benachrichtigungen (z.B. http\://192.168.0.2\:8080).
-binding.config.sonos.opmlUrl.label = OPML Service URL
-binding.config.sonos.opmlUrl.description = URL für den OPML/tunein.com Service.
+addon.config.sonos.callbackUrl.label = Callback URL
+addon.config.sonos.callbackUrl.description = URL zum Abspielen von Benachrichtigungen (z.B. http\://192.168.0.2\:8080).
+addon.config.sonos.opmlUrl.label = OPML Service URL
+addon.config.sonos.opmlUrl.description = URL für den OPML/tunein.com Service.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_fr.properties b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_fr.properties
index 61161a116..d01de3145 100644
--- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_fr.properties
+++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_fr.properties
@@ -1,14 +1,14 @@
-# binding
+# add-on
 
-binding.sonos.name = Extension Sonos
-binding.sonos.description = Il s'agit de l'extension pour le système audio multiroom Sonos.
+addon.sonos.name = Extension Sonos
+addon.sonos.description = Il s'agit de l'extension pour le système audio multiroom Sonos.
 
-# binding config
+# add-on config
 
-binding.config.sonos.callbackUrl.label = URL callback
-binding.config.sonos.callbackUrl.description = URL à utiliser pour les notifications sonores, par ex. http\://192.168.0.2\:8080
-binding.config.sonos.opmlUrl.label = URL service OPML
-binding.config.sonos.opmlUrl.description = URL pour le service OPML/tunein.com
+addon.config.sonos.callbackUrl.label = URL callback
+addon.config.sonos.callbackUrl.description = URL à utiliser pour les notifications sonores, par ex. http\://192.168.0.2\:8080
+addon.config.sonos.opmlUrl.label = URL service OPML
+addon.config.sonos.opmlUrl.description = URL pour le service OPML/tunein.com
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_it.properties b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_it.properties
index 41524e454..0c7e18ef0 100644
--- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_it.properties
+++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos_it.properties
@@ -1,14 +1,14 @@
-# binding
+# add-on
 
-binding.sonos.name = Binding Sonos
-binding.sonos.description = Questo è il binding per il sistema audio multi-stanza Sonos.
+addon.sonos.name = Binding Sonos
+addon.sonos.description = Questo è il binding per il sistema audio multi-stanza Sonos.
 
-# binding config
+# add-on config
 
-binding.config.sonos.callbackUrl.label = URL di callback
-binding.config.sonos.callbackUrl.description = URL da usare per riprodurre suoni di notifica, ad esempio http\://192.168.0.2\:8080
-binding.config.sonos.opmlUrl.label = URL Servizio OPML
-binding.config.sonos.opmlUrl.description = URL per il servizio OPML/tunein.com
+addon.config.sonos.callbackUrl.label = URL di callback
+addon.config.sonos.callbackUrl.description = URL da usare per riprodurre suoni di notifica, ad esempio http\://192.168.0.2\:8080
+addon.config.sonos.opmlUrl.label = URL Servizio OPML
+addon.config.sonos.opmlUrl.description = URL per il servizio OPML/tunein.com
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio.properties b/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio.properties
index 1202a96cc..f7de12f23 100644
--- a/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio.properties
+++ b/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sonyaudio.name = SonyAudio Binding
-binding.sonyaudio.description = This is the binding for SonyAudio products (Receivers and wireless speakers).
+addon.sonyaudio.name = SonyAudio Binding
+addon.sonyaudio.description = This is the binding for SonyAudio products (Receivers and wireless speakers).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio_de.properties b/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio_de.properties
index fe2ee1d20..4e6838f4b 100644
--- a/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio_de.properties
+++ b/bundles/org.openhab.binding.sonyaudio/src/main/resources/OH-INF/i18n/sonyaudio_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sonyaudio.name = SonyAudio Binding
-binding.sonyaudio.description = Das Binding unterstützt Sony Audio-Produkte (Receiver und kabellose Lautsprecher).
+addon.sonyaudio.name = SonyAudio Binding
+addon.sonyaudio.description = Das Binding unterstützt Sony Audio-Produkte (Receiver und kabellose Lautsprecher).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector.properties b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector.properties
index db98523a9..008804989 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector.properties
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sonyprojector.name = SonyProjector Binding
-binding.sonyprojector.description = The SonyProjector binding controls a Sony projector through Ethernet (PJ Talk) or serial.
+addon.sonyprojector.name = SonyProjector Binding
+addon.sonyprojector.description = The SonyProjector binding controls a Sony projector through Ethernet (PJ Talk) or serial.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties
index b1c23b96a..9f284c099 100644
--- a/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties
+++ b/bundles/org.openhab.binding.sonyprojector/src/main/resources/OH-INF/i18n/sonyprojector_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.sonyprojector.name = Extension Projecteur Sony
-binding.sonyprojector.description = L'extension Projecteur Sony permet de contrôler un projecteur Sony par connexion Ethernet (PJ Talk) ou série.
+addon.sonyprojector.name = Extension Projecteur Sony
+addon.sonyprojector.description = L'extension Projecteur Sony permet de contrôler un projecteur Sony par connexion Ethernet (PJ Talk) ou série.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/i18n/souliss.properties b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/i18n/souliss.properties
index e426cf86f..3c252bec8 100644
--- a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/i18n/souliss.properties
+++ b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/i18n/souliss.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.souliss.name = Souliss Binding
-binding.souliss.description = This is the binding for Souliss. The Arduino based SmartHome..
+addon.souliss.name = Souliss Binding
+addon.souliss.description = This is the binding for Souliss. The Arduino based SmartHome..
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.squeezebox/src/main/resources/OH-INF/i18n/squeezebox.properties b/bundles/org.openhab.binding.squeezebox/src/main/resources/OH-INF/i18n/squeezebox.properties
index 1ef09d716..e7f1c00a7 100644
--- a/bundles/org.openhab.binding.squeezebox/src/main/resources/OH-INF/i18n/squeezebox.properties
+++ b/bundles/org.openhab.binding.squeezebox/src/main/resources/OH-INF/i18n/squeezebox.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.squeezebox.name = SqueezeBox Binding
-binding.squeezebox.description = This is the binding for the Logitech Squeeze Server and Players.
+addon.squeezebox.name = SqueezeBox Binding
+addon.squeezebox.description = This is the binding for the Logitech Squeeze Server and Players.
 
-# binding config
+# add-on config
 
-binding.config.squeezebox.callbackUrl.label = Callback URL
-binding.config.squeezebox.callbackUrl.description = URL to use for playing notification sounds, e.g. http://192.168.0.2:8080
+addon.config.squeezebox.callbackUrl.label = Callback URL
+addon.config.squeezebox.callbackUrl.description = URL to use for playing notification sounds, e.g. http://192.168.0.2:8080
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare.properties b/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare.properties
index c6548f4d9..fdf0ef955 100644
--- a/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare.properties
+++ b/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare.properties
@@ -1,5 +1,5 @@
-binding.surepetcare.name = Sure Petcare Binding
-binding.surepetcare.description = This binding interacts with the Sure Petcare Connect range of cat/pet flaps and feeders
+addon.surepetcare.name = Sure Petcare Binding
+addon.surepetcare.description = This binding interacts with the Sure Petcare Connect range of cat/pet flaps and feeders
 
 # bridge-types
 thing-type.surepetcare.bridge.label = Sure Petcare API Bridge
diff --git a/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare_de.properties b/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare_de.properties
index 68512c7d0..9645ec717 100644
--- a/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare_de.properties
+++ b/bundles/org.openhab.binding.surepetcare/src/main/resources/OH-INF/i18n/surepetcare_de.properties
@@ -1,5 +1,5 @@
-binding.surepetcare.name = Sure Petcare Binding
-binding.surepetcare.description = Dieses Binding stellt eine Verbindung mit der Sure Petcare API her.
+addon.surepetcare.name = Sure Petcare Binding
+addon.surepetcare.description = Dieses Binding stellt eine Verbindung mit der Sure Petcare API her.
 
 # bridge-types
 thing-type.surepetcare.bridge.label = Sure Petcare API Konto
diff --git a/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer.properties b/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer.properties
index 27a85fd1f..91bf1d787 100644
--- a/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer.properties
+++ b/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.synopanalyzer.name = Synop Analyzer Binding
-binding.synopanalyzer.description = This is the binding to download and interpret Synop messages
+addon.synopanalyzer.name = Synop Analyzer Binding
+addon.synopanalyzer.description = This is the binding to download and interpret Synop messages
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer_fr.properties b/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer_fr.properties
index 7598b270e..5a4bbcd6b 100644
--- a/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer_fr.properties
+++ b/bundles/org.openhab.binding.synopanalyzer/src/main/resources/OH-INF/i18n/synopanalyzer_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.synopanalyzer.name = Extension Synop Analyzer
-binding.synopanalyzer.description = Cette extension permet de télécharger et interpréter les messages SYNOP.
+addon.synopanalyzer.name = Extension Synop Analyzer
+addon.synopanalyzer.description = Cette extension permet de télécharger et interpréter les messages SYNOP.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties
index dc184f6a5..3cfbf63da 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties
+++ b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.systeminfo.name = Systeminfo Binding
-binding.systeminfo.description = This binding provides information about the operating system and the hardware.
+addon.systeminfo.name = Systeminfo Binding
+addon.systeminfo.description = This binding provides information about the operating system and the hardware.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_de.properties b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_de.properties
index 69beb53ee..7fe9b8484 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_de.properties
+++ b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.systeminfo.name = Systeminfo Binding
-binding.systeminfo.description = Dieses Binding stellt Informationen über das Betriebssystem und die Hardware bereit.
+addon.systeminfo.name = Systeminfo Binding
+addon.systeminfo.description = Dieses Binding stellt Informationen über das Betriebssystem und die Hardware bereit.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties
index e92d1ad17..000839988 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties
+++ b/bundles/org.openhab.binding.systeminfo/src/main/resources/OH-INF/i18n/systeminfo_nl.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.systeminfo.name = Systeminfo Binding
-binding.systeminfo.description = Deze binding biedt informatie over het besturingssysteem en de hardware.
+addon.systeminfo.name = Systeminfo Binding
+addon.systeminfo.description = Deze binding biedt informatie over het besturingssysteem en de hardware.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/i18n/tacmi.properties b/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/i18n/tacmi.properties
index 58c33d221..30e4a4aaf 100644
--- a/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/i18n/tacmi.properties
+++ b/bundles/org.openhab.binding.tacmi/src/main/resources/OH-INF/i18n/tacmi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tacmi.name = TA C.M.I. Binding
-binding.tacmi.description = This is the binding for TA C.M.I.
+addon.tacmi.name = TA C.M.I. Binding
+addon.tacmi.description = This is the binding for TA C.M.I.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado.properties b/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado.properties
index f79431c95..948481443 100644
--- a/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado.properties
+++ b/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tado.name = tado° Binding
-binding.tado.description = Binding for tado° devices
+addon.tado.name = tado° Binding
+addon.tado.description = Binding for tado° devices
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_de.properties b/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_de.properties
index ab001cc5b..06550853e 100644
--- a/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_de.properties
+++ b/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tado.name = tado° Binding
-binding.tado.description = Bindung für tado°-Geräte
+addon.tado.name = tado° Binding
+addon.tado.description = Bindung für tado°-Geräte
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_it.properties b/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_it.properties
index aa8466510..849ec13d5 100644
--- a/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_it.properties
+++ b/bundles/org.openhab.binding.tado/src/main/resources/OH-INF/i18n/tado_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tado.name = Binding tado°
-binding.tado.description = Binding per i device tado°
+addon.tado.name = Binding tado°
+addon.tado.description = Binding per i device tado°
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig.properties b/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig.properties
index 466dd001d..3125a6984 100644
--- a/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig.properties
+++ b/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tankerkoenig.name = Tankerkönig Binding
-binding.tankerkoenig.description = The Tankerkönig Binding allows to poll fuel prices of German gas stations by using the Tankerkoenig.de API.
+addon.tankerkoenig.name = Tankerkönig Binding
+addon.tankerkoenig.description = The Tankerkönig Binding allows to poll fuel prices of German gas stations by using the Tankerkoenig.de API.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig_de.properties b/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig_de.properties
index d0155d5ef..74f35cce8 100644
--- a/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig_de.properties
+++ b/bundles/org.openhab.binding.tankerkoenig/src/main/resources/OH-INF/i18n/tankerkoenig_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tankerkoenig.name = Tankerkönig Binding
-binding.tankerkoenig.description = Das Tankerkönig Binding ermöglicht es Spritpreise von deutschen Tankstellen abzurufen.
+addon.tankerkoenig.name = Tankerkönig Binding
+addon.tankerkoenig.description = Das Tankerkönig Binding ermöglicht es Spritpreise von deutschen Tankstellen abzurufen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties
index 1fc39a16f..784f9e610 100644
--- a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties
+++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tapocontrol.name = TapoControl Binding
-binding.tapocontrol.description = Control your TAPO-SmartHome Devices
+addon.tapocontrol.name = TapoControl Binding
+addon.tapocontrol.description = Control your TAPO-SmartHome Devices
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram.properties b/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram.properties
index f4146f2ba..f351f5a30 100644
--- a/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram.properties
+++ b/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.telegram.name = Telegram Binding
-binding.telegram.description = This is the binding for Telegram. It allows to send and receive messages.
+addon.telegram.name = Telegram Binding
+addon.telegram.description = This is the binding for Telegram. It allows to send and receive messages.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram_de.properties b/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram_de.properties
index 0d595c5c8..67762179b 100644
--- a/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram_de.properties
+++ b/bundles/org.openhab.binding.telegram/src/main/resources/OH-INF/i18n/telegram_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.telegram.name = Telegram Binding
-binding.telegram.description = Dies ist die Bindung für Telegramm, mit der Nachrichten gesendet und empfangen werden können.
+addon.telegram.name = Telegram Binding
+addon.telegram.description = Dies ist die Bindung für Telegramm, mit der Nachrichten gesendet und empfangen werden können.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo.properties b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo.properties
index 1ff23b276..61c562b59 100644
--- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo.properties
+++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.teleinfo.name = Teleinfo Binding
-binding.teleinfo.description = The Teleinfo binding decodes the electrical statistics from an ENEDIS/ERDF Electricity Meter
+addon.teleinfo.name = Teleinfo Binding
+addon.teleinfo.description = The Teleinfo binding decodes the electrical statistics from an ENEDIS/ERDF Electricity Meter
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo_fr.properties b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo_fr.properties
index f8b336696..7b7b9ce2e 100644
--- a/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo_fr.properties
+++ b/bundles/org.openhab.binding.teleinfo/src/main/resources/OH-INF/i18n/teleinfo_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.teleinfo.name = Extension Téléinfo
-binding.teleinfo.description = L'extension Téléinfo décode les informations provenant des compteurs ENEDIS via le protocole de TéléInformation Compteur
+addon.teleinfo.name = Extension Téléinfo
+addon.teleinfo.description = L'extension Téléinfo décode les informations provenant des compteurs ENEDIS via le protocole de TéléInformation Compteur
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/i18n/tellstick.properties b/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/i18n/tellstick.properties
index 05c082f81..df1c54b8c 100644
--- a/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/i18n/tellstick.properties
+++ b/bundles/org.openhab.binding.tellstick/src/main/resources/OH-INF/i18n/tellstick.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tellstick.name = Tellstick Binding
-binding.tellstick.description = This is the binding for Telldus Tellstick Basic, Duo, .Net and Z-Net Lite.
+addon.tellstick.name = Tellstick Binding
+addon.tellstick.description = This is the binding for Telldus Tellstick Basic, Duo, .Net and Z-Net Lite.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tesla/src/main/resources/OH-INF/i18n/tesla.properties b/bundles/org.openhab.binding.tesla/src/main/resources/OH-INF/i18n/tesla.properties
index f42d75bd7..0be5965cb 100644
--- a/bundles/org.openhab.binding.tesla/src/main/resources/OH-INF/i18n/tesla.properties
+++ b/bundles/org.openhab.binding.tesla/src/main/resources/OH-INF/i18n/tesla.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tesla.name = Tesla Binding
-binding.tesla.description = This is the binding for Tesla Electric Vehicles.
+addon.tesla.name = Tesla Binding
+addon.tesla.description = This is the binding for Tesla Electric Vehicles.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tibber/src/main/resources/OH-INF/i18n/tibber.properties b/bundles/org.openhab.binding.tibber/src/main/resources/OH-INF/i18n/tibber.properties
index eed2a6704..ce2963d31 100644
--- a/bundles/org.openhab.binding.tibber/src/main/resources/OH-INF/i18n/tibber.properties
+++ b/bundles/org.openhab.binding.tibber/src/main/resources/OH-INF/i18n/tibber.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tibber.name = Tibber Binding
-binding.tibber.description = This binding retrieves price and consumption data from Tibber API using queries and live subscription
+addon.tibber.name = Tibber Binding
+addon.tibber.description = This binding retrieves price and consumption data from Tibber API using queries and live subscription
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tivo/src/main/resources/OH-INF/i18n/tivo.properties b/bundles/org.openhab.binding.tivo/src/main/resources/OH-INF/i18n/tivo.properties
index f696c68be..a5393bc60 100644
--- a/bundles/org.openhab.binding.tivo/src/main/resources/OH-INF/i18n/tivo.properties
+++ b/bundles/org.openhab.binding.tivo/src/main/resources/OH-INF/i18n/tivo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tivo.name = TiVo DVR Binding
-binding.tivo.description = Controls TiVo DVRs that support the TiVo TCP Control Protocol v1.1
+addon.tivo.name = TiVo DVR Binding
+addon.tivo.description = Controls TiVo DVRs that support the TiVo TCP Control Protocol v1.1
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/i18n/touchwand.properties b/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/i18n/touchwand.properties
index 0425dfafe..e248239b5 100644
--- a/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/i18n/touchwand.properties
+++ b/bundles/org.openhab.binding.touchwand/src/main/resources/OH-INF/i18n/touchwand.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.touchwand.name = TouchWand Binding
-binding.touchwand.description = Connect to TouchWand Wanderfull™ Hub and communicate with units connected to the controller.
+addon.touchwand.name = TouchWand Binding
+addon.touchwand.description = Connect to TouchWand Wanderfull™ Hub and communicate with units connected to the controller.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter.properties b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter.properties
index 2421030f5..c4d1242eb 100644
--- a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter.properties
+++ b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tplinkrouter.name = TpLinkRouter Binding
-binding.tplinkrouter.description = This is the binding for controlling a TP-Link router with telnet.
+addon.tplinkrouter.name = TpLinkRouter Binding
+addon.tplinkrouter.description = This is the binding for controlling a TP-Link router with telnet.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_fr.properties b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_fr.properties
index 51e4c93cb..092dbfae8 100644
--- a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_fr.properties
+++ b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tplinkrouter.name = Extension TpLinkRouter
-binding.tplinkrouter.description = Il s'agit de l'extension pour contrôler un routeur TP-Link avec telnet.
+addon.tplinkrouter.name = Extension TpLinkRouter
+addon.tplinkrouter.description = Il s'agit de l'extension pour contrôler un routeur TP-Link avec telnet.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_it.properties b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_it.properties
index ef06fb4e9..e57d288eb 100644
--- a/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_it.properties
+++ b/bundles/org.openhab.binding.tplinkrouter/src/main/resources/OH-INF/i18n/tplinkrouter_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tplinkrouter.name = Gestore router TP-Link
-binding.tplinkrouter.description = Questa è il gestore per controllare un router TP-Link via telnet.
+addon.tplinkrouter.name = Gestore router TP-Link
+addon.tplinkrouter.description = Questa è il gestore per controllare un router TP-Link via telnet.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/i18n/tplinksmarthome.properties b/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/i18n/tplinksmarthome.properties
index 90f527a75..11086ca80 100644
--- a/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/i18n/tplinksmarthome.properties
+++ b/bundles/org.openhab.binding.tplinksmarthome/src/main/resources/OH-INF/i18n/tplinksmarthome.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tplinksmarthome.name = TP-Link Smart Home Binding
-binding.tplinksmarthome.description = This binding integrates the TP-Link Wi-Fi Smart Home devices.
+addon.tplinksmarthome.name = TP-Link Smart Home Binding
+addon.tplinksmarthome.description = This binding integrates the TP-Link Wi-Fi Smart Home devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064.properties b/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064.properties
index ed7d11ae1..5979a8203 100644
--- a/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064.properties
+++ b/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tr064.name = TR-064 Binding
-binding.tr064.description = This is the binding for TR-064 device support.
+addon.tr064.name = TR-064 Binding
+addon.tr064.description = This is the binding for TR-064 device support.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064_de.properties b/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064_de.properties
index 732968a55..80cfc96ab 100644
--- a/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064_de.properties
+++ b/bundles/org.openhab.binding.tr064/src/main/resources/OH-INF/i18n/tr064_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tr064.name = TR-064 Binding
-binding.tr064.description = Binding zur Unterstützung von Geräten, die auf Basis das TR-064 Protokolls angebunden werden können.
+addon.tr064.name = TR-064 Binding
+addon.tr064.description = Binding zur Unterstützung von Geräten, die auf Basis das TR-064 Protokolls angebunden werden können.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri.properties b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri.properties
index e9929d665..8a525bd50 100644
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri.properties
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tradfri.name = TRÅDFRI Binding
-binding.tradfri.description = This binding supports IKEA TRÅDFRI lighting devices through the IKEA gateway.
+addon.tradfri.name = TRÅDFRI Binding
+addon.tradfri.description = This binding supports IKEA TRÅDFRI lighting devices through the IKEA gateway.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties
index 01e8addf6..1d63c7220 100644
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tradfri.name = TRÅDFRI Binding
-binding.tradfri.description = Dieses Binding unterstützt IKEA TRÅDFRI Geräte über das IKEA TRÅDFRI Gateway.
+addon.tradfri.name = TRÅDFRI Binding
+addon.tradfri.description = Dieses Binding unterstützt IKEA TRÅDFRI Geräte über das IKEA TRÅDFRI Gateway.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fi.properties b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fi.properties
index c73f20d2a..60ba8cdb9 100644
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fi.properties
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tradfri.name = TRÅDFRI-lisäosa
-binding.tradfri.description = Tämä lisäosa tulee IKEA TRÅDFRI-valaisimia IKEA-yhdyskäytävän kautta.
+addon.tradfri.name = TRÅDFRI-lisäosa
+addon.tradfri.description = Tämä lisäosa tulee IKEA TRÅDFRI-valaisimia IKEA-yhdyskäytävän kautta.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fr.properties b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fr.properties
index d7b667116..039fcfe03 100644
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fr.properties
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tradfri.name = Extension TRÅDFRI
-binding.tradfri.description = Cette extension apporte le support des appareils IKEA de la gamme TRÅDFRI par l’intermédiaire de la passerelle IKEA.
+addon.tradfri.name = Extension TRÅDFRI
+addon.tradfri.description = Cette extension apporte le support des appareils IKEA de la gamme TRÅDFRI par l’intermédiaire de la passerelle IKEA.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_it.properties b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_it.properties
index 977b7cc73..47b34d2b8 100644
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_it.properties
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.tradfri.name = Binding TRÅDFRI
-binding.tradfri.description = Questo binding supporta i dispositivi luce IKEA TRÅDFRI usando il gateway IKEA.
+addon.tradfri.name = Binding TRÅDFRI
+addon.tradfri.description = Questo binding supporta i dispositivi luce IKEA TRÅDFRI usando il gateway IKEA.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter.properties b/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter.properties
index 1dc20882d..161cccf2a 100644
--- a/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter.properties
+++ b/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.twitter.name = Twitter Binding
-binding.twitter.description = Supports adding Thing for getting the Last Tweet. Send Tweets and Pictures with Actions.
+addon.twitter.name = Twitter Binding
+addon.twitter.description = Supports adding Thing for getting the Last Tweet. Send Tweets and Pictures with Actions.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter_fr.properties b/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter_fr.properties
index 79e426aa6..06d82693e 100644
--- a/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter_fr.properties
+++ b/bundles/org.openhab.binding.twitter/src/main/resources/OH-INF/i18n/twitter_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.twitter.name = Extension Twitter
-binding.twitter.description = Cette extension permet d'obtenir le dernier Tweet ou d'envoyer des Tweets et des images depuis vos règles d'automatisation.
+addon.twitter.name = Extension Twitter
+addon.twitter.description = Cette extension permet d'obtenir le dernier Tweet ou d'envoyer des Tweets et des images depuis vos règles d'automatisation.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties
index ba4ec2ee6..b4ed105ef 100644
--- a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties
+++ b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.unifi.name = UniFi Binding
-binding.unifi.description = The UniFi binding integrates the UniFi controller from Ubiquiti Networks to facilitate tracking of Wi-Fi clients.
+addon.unifi.name = UniFi Binding
+addon.unifi.description = The UniFi binding integrates the UniFi controller from Ubiquiti Networks to facilitate tracking of Wi-Fi clients.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_de.properties b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_de.properties
index 103fc4ef2..233ef359b 100644
--- a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_de.properties
+++ b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.unifi.name = UniFi Binding
-binding.unifi.description = Das UniFi-Binding integriert den UniFi-Controller von Ubiquiti Networks zur Überwachung von Wi-Fi-Clients.
+addon.unifi.name = UniFi Binding
+addon.unifi.description = Das UniFi-Binding integriert den UniFi-Controller von Ubiquiti Networks zur Überwachung von Wi-Fi-Clients.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_hu.properties b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_hu.properties
index 0989838cf..f3b3ad83b 100644
--- a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_hu.properties
+++ b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_hu.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.unifi.name = UniFi kötés
-binding.unifi.description = A UniFi kötés lehetővé teszi a UniFi vezérlő kapcsolódásával a Wifi ügyfelek nyomon követését.
+addon.unifi.name = UniFi kötés
+addon.unifi.description = A UniFi kötés lehetővé teszi a UniFi vezérlő kapcsolódásával a Wifi ügyfelek nyomon követését.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_nl.properties b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_nl.properties
index e7ada4673..798935bd4 100644
--- a/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_nl.properties
+++ b/bundles/org.openhab.binding.unifi/src/main/resources/OH-INF/i18n/unifi_nl.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.unifi.name = UniFi Binding
-binding.unifi.description = De UniFi-binding integreert de UniFi-controller van Ubiquiti Networks om het volgen van Wi-Fi-cliënten te vergemakkelijken.
+addon.unifi.name = UniFi Binding
+addon.unifi.description = De UniFi-binding integreert de UniFi-controller van Ubiquiti Networks om het volgen van Wi-Fi-cliënten te vergemakkelijken.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/i18n/unifiedremote.properties b/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/i18n/unifiedremote.properties
index dc2450a46..a839665f9 100644
--- a/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/i18n/unifiedremote.properties
+++ b/bundles/org.openhab.binding.unifiedremote/src/main/resources/OH-INF/i18n/unifiedremote.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.unifiedremote.name = Unified Remote Binding
-binding.unifiedremote.description = This is the binding for Unified Remote Server (https://www.unifiedremote.com/).
+addon.unifiedremote.name = Unified Remote Binding
+addon.unifiedremote.description = This is the binding for Unified Remote Server (https://www.unifiedremote.com/).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/i18n/upb.properties b/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/i18n/upb.properties
index 385144f37..c2f67b40b 100644
--- a/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/i18n/upb.properties
+++ b/bundles/org.openhab.binding.upb/src/main/resources/OH-INF/i18n/upb.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.upb.name = UPB Binding
-binding.upb.description = The Universal Powerline Bus (UPB) binding reads and writes messages to and from a UPB modem
+addon.upb.name = UPB Binding
+addon.upb.description = The Universal Powerline Bus (UPB) binding reads and writes messages to and from a UPB modem
 
-# binding config
+# add-on config
 
-binding.config.upb.networkId.label = Default Network ID for Devices
-binding.config.upb.networkId.description = The ID of the primary UPB network. May be overridden on a per-device basis.
+addon.config.upb.networkId.label = Default Network ID for Devices
+addon.config.upb.networkId.description = The ID of the primary UPB network. May be overridden on a per-device basis.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol.properties b/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol.properties
index e80d03ce8..aed094ee2 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol.properties
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.upnpcontrol.name = UPnP Control Binding
-binding.upnpcontrol.description = This binding acts as a UPnP Control Point that can query media server content directories and serve content to media renderers.
+addon.upnpcontrol.name = UPnP Control Binding
+addon.upnpcontrol.description = This binding acts as a UPnP Control Point that can query media server content directories and serve content to media renderers.
 
-# binding config
+# add-on config
 
-binding.config.upnpcontrol.path.label = Storage Path
-binding.config.upnpcontrol.path.description = Folder path for playlists and favourites. If not set, it will default to $OPENHAB_USERDATA/upnpcontrol. The folder will be created on first use when it does not exist.
+addon.config.upnpcontrol.path.label = Storage Path
+addon.config.upnpcontrol.path.description = Folder path for playlists and favourites. If not set, it will default to $OPENHAB_USERDATA/upnpcontrol. The folder will be created on first use when it does not exist.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties b/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties
index 1038317c5..696fd6e12 100644
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/resources/OH-INF/i18n/upnpcontrol_nl.properties
@@ -1,12 +1,12 @@
-# binding
+# add-on
 
-binding.upnpcontrol.name = UPnP Control Binding
-binding.upnpcontrol.description = Deze binding fungeert als een UPnP Control Point dat media content directories kan opvragen en inhoud kan aanbieden aan media spelers.
+addon.upnpcontrol.name = UPnP Control Binding
+addon.upnpcontrol.description = Deze binding fungeert als een UPnP Control Point dat media content directories kan opvragen en inhoud kan aanbieden aan media spelers.
 
-# binding config
+# add-on config
 
-binding.config.upnpcontrol.path.label = Opslagpad
-binding.config.upnpcontrol.path.description = Pad naar de map voor afspeellijsten en favorieten. Indien niet ingesteld, wordt het standaard ingesteld op $OPENHAB_USERDATA/upnpcontrol. De map wordt gemaakt bij het eerste gebruik wanneer deze niet bestaat.
+addon.config.upnpcontrol.path.label = Opslagpad
+addon.config.upnpcontrol.path.description = Pad naar de map voor afspeellijsten en favorieten. Indien niet ingesteld, wordt het standaard ingesteld op $OPENHAB_USERDATA/upnpcontrol. De map wordt gemaakt bij het eerste gebruik wanneer deze niet bestaat.
 
 # thing types
 
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 50fe6c51c..e0457e634 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,4 +1,4 @@
-# binding
+# add-on
 
 bindingDescription = This is the binding for Somfy Universal RTS Interface II (URTSI II).
 bindingLabel = Somfy URTSI II Binding
diff --git a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi_de.properties b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi_de.properties
index bd8df8e36..80d6014a5 100644
--- a/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi_de.properties
+++ b/bundles/org.openhab.binding.urtsi/src/main/resources/OH-INF/i18n/urtsi_de.properties
@@ -1,4 +1,4 @@
-# binding
+# add-on
 
 bindingDescription = Dies ist das Binding für Somfy Universal RTS Interface II (URTSI II).
 bindingLabel = Somfy URTSI II Binding
diff --git a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv.properties b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv.properties
index 4ea583777..5f943dd32 100644
--- a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv.properties
+++ b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.valloxmv.name = ValloxMV Binding
-binding.valloxmv.description = Binding for online interface of Vallox ventilation unit
+addon.valloxmv.name = ValloxMV Binding
+addon.valloxmv.description = Binding for online interface of Vallox ventilation unit
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_de.properties b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_de.properties
index a66229398..df46a88e6 100644
--- a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_de.properties
+++ b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.valloxmv.name = Vallox Lüftungsanlagen
-binding.valloxmv.description = Binding für das Online-Interface von Vallox Lüftungsanlagen
+# add-on
+addon.valloxmv.name = Vallox Lüftungsanlagen
+addon.valloxmv.description = Binding für das Online-Interface von Vallox Lüftungsanlagen
 
 # thing types
 thing-type.valloxmv.valloxmv.label = Vallox Lüftungsanlage
diff --git a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_fi.properties b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_fi.properties
index 4f82c04c8..2441c4e10 100644
--- a/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_fi.properties
+++ b/bundles/org.openhab.binding.valloxmv/src/main/resources/OH-INF/i18n/valloxmv_fi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.valloxmv.name = ValloxMV -lisäosa
-binding.valloxmv.description = Valloxin ilmanvaihtokoneen verkkokäyttöliittymän lisäosa
+addon.valloxmv.name = ValloxMV -lisäosa
+addon.valloxmv.description = Valloxin ilmanvaihtokoneen verkkokäyttöliittymän lisäosa
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/i18n/vdr.properties b/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/i18n/vdr.properties
index afb331287..1afbe43bb 100644
--- a/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/i18n/vdr.properties
+++ b/bundles/org.openhab.binding.vdr/src/main/resources/OH-INF/i18n/vdr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vdr.name = VDR Binding
-binding.vdr.description = The Video Disk Recorder (VDR) binding allows to control your own Video Disk Recorder (https://www.tvdr.de).
+addon.vdr.name = VDR Binding
+addon.vdr.description = The Video Disk Recorder (VDR) binding allows to control your own Video Disk Recorder (https://www.tvdr.de).
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/i18n/vektiva.properties b/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/i18n/vektiva.properties
index f43ad190b..e6f82f0fe 100644
--- a/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/i18n/vektiva.properties
+++ b/bundles/org.openhab.binding.vektiva/src/main/resources/OH-INF/i18n/vektiva.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vektiva.name = Vektiva Binding
-binding.vektiva.description = This is the binding for Vektiva products controlled by local API.
+addon.vektiva.name = Vektiva Binding
+addon.vektiva.description = This is the binding for Vektiva products controlled by local API.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/i18n/velbus.properties b/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/i18n/velbus.properties
index 6010701df..5fb7cab2e 100644
--- a/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/i18n/velbus.properties
+++ b/bundles/org.openhab.binding.velbus/src/main/resources/OH-INF/i18n/velbus.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.velbus.name = Velbus Binding
-binding.velbus.description = This is the binding for Velbus.
+addon.velbus.name = Velbus Binding
+addon.velbus.description = This is the binding for Velbus.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux.properties b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux.properties
index fbab532d2..af96075ca 100644
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux.properties
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux.properties
@@ -1,8 +1,8 @@
 #
-# Binding descriptions
+# add-on descriptions
 #
-binding.velux.name = Velux Binding
-binding.velux.description = 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.
+addon.velux.name = Velux Binding
+addon.velux.description = 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.
 #
 # Bridge Thing types descriptions
 #
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_da.properties b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_da.properties
index 013b2e4ce..80a9c94b5 100644
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_da.properties
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_da.properties
@@ -1,8 +1,8 @@
 #
-# Binding descriptions
+# add-on descriptions
 #
-binding.velux.name = Velux-binding
-binding.velux.description = En binding til Velux KLF200 Bridge. Velux Binding interagerer via en Velux Bridge med de forskellige Velux-enheder, såsom styring af vinduesåbnere, skodder og andre. F.eks. Kan en KLF200 fungere som interface mellem HomeAutomation og VELUX INTEGRA-produkter med trådløs tilslutning baseret på io-homecontrol-standarden.
+addon.velux.name = Velux-binding
+addon.velux.description = En binding til Velux KLF200 Bridge. Velux Binding interagerer via en Velux Bridge med de forskellige Velux-enheder, såsom styring af vinduesåbnere, skodder og andre. F.eks. Kan en KLF200 fungere som interface mellem HomeAutomation og VELUX INTEGRA-produkter med trådløs tilslutning baseret på io-homecontrol-standarden.
 #
 # Bridge Thing typer beskrivelser
 #
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_de.properties b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_de.properties
index 0ba4692ad..6749dceec 100644
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_de.properties
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_de.properties
@@ -1,8 +1,8 @@
 #
-# Binding descriptions
+# add-on descriptions
 #
-binding.velux.name = Velux Binding
-binding.velux.description = Dieses Binding integriert io-homecontrol-Geräte, wie Rolläden und Fenster, mittels dem Velux KLF200 Kopplungselement.
+addon.velux.name = Velux Binding
+addon.velux.description = Dieses Binding integriert io-homecontrol-Geräte, wie Rolläden und Fenster, mittels dem Velux KLF200 Kopplungselement.
 #
 # Bridge Thing types descriptions
 #
diff --git a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_nl.properties b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_nl.properties
index 879c37ccf..4e8be8ba2 100644
--- a/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_nl.properties
+++ b/bundles/org.openhab.binding.velux/src/main/resources/OH-INF/i18n/velux_nl.properties
@@ -1,8 +1,8 @@
 #
-# Binding descriptions
+# add-on descriptions
 #
-binding.velux.name = Velux Binding
-binding.velux.description = Een binding voor de Velux KLF200 Bridge. De Velux-binding werkt via een Velux Bridge samen met de verschillende Velux-apparaten, zoals het bedienen van vensteropeners, rolluiken en andere. Een KLF200 kan bijvoorbeeld fungeren als interface tussen de HomeAutomation en de VELUX INTEGRA-producten met draadloze connectiviteit op basis van de io-homecontrol-standaard.
+addon.velux.name = Velux Binding
+addon.velux.description = Een binding voor de Velux KLF200 Bridge. De Velux-binding werkt via een Velux Bridge samen met de verschillende Velux-apparaten, zoals het bedienen van vensteropeners, rolluiken en andere. Een KLF200 kan bijvoorbeeld fungeren als interface tussen de HomeAutomation en de VELUX INTEGRA-producten met draadloze connectiviteit op basis van de io-homecontrol-standaard.
 #
 # Bridge Thing types descriptions
 #
diff --git a/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/i18n/venstarthermostat.properties b/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/i18n/venstarthermostat.properties
index e4bd2256d..a82212389 100644
--- a/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/i18n/venstarthermostat.properties
+++ b/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/i18n/venstarthermostat.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.venstarthermostat.name = Venstar Thermostats
-binding.venstarthermostat.description = This is a binding for Venstar Thermostats.
+addon.venstarthermostat.name = Venstar Thermostats
+addon.venstarthermostat.description = This is a binding for Venstar Thermostats.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/i18n/ventaair.properties b/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/i18n/ventaair.properties
index ee3786073..6f7de6cf7 100644
--- a/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/i18n/ventaair.properties
+++ b/bundles/org.openhab.binding.ventaair/src/main/resources/OH-INF/i18n/ventaair.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.ventaair.name = VentaAir Binding
-binding.ventaair.description = This is the binding for Venta Air - Air cleaning and humidifying devices
+addon.ventaair.name = VentaAir Binding
+addon.ventaair.description = This is the binding for Venta Air - Air cleaning and humidifying devices
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/i18n/verisure.properties b/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/i18n/verisure.properties
index 0f9e87588..96388bbc3 100644
--- a/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/i18n/verisure.properties
+++ b/bundles/org.openhab.binding.verisure/src/main/resources/OH-INF/i18n/verisure.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.verisure.name = Verisure Binding
-binding.verisure.description = This is the binding for Verisure Alarm System.
+addon.verisure.name = Verisure Binding
+addon.verisure.description = This is the binding for Verisure Alarm System.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync.properties b/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync.properties
index e50653275..240a2cf0e 100644
--- a/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync.properties
+++ b/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vesync.name = VeSync Binding
-binding.vesync.description = This is the binding for the VeSync products. Currently, this supports the Levoit branded Air Purifiers and Humidifiers using the v2 protocol.
+addon.vesync.name = VeSync Binding
+addon.vesync.description = This is the binding for the VeSync products. Currently, this supports the Levoit branded Air Purifiers and Humidifiers using the v2 protocol.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync_it.properties b/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync_it.properties
index a4e9c0eb7..b36fb7a65 100644
--- a/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync_it.properties
+++ b/bundles/org.openhab.binding.vesync/src/main/resources/OH-INF/i18n/vesync_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vesync.name = Binding VeSync
-binding.vesync.description = Questo è il binding per i prodotti VeSync. Attualmente, questo supporta i Purificatori e Umidificatori ad Aria Levoit che usano il protocollo v2.
+addon.vesync.name = Binding VeSync
+addon.vesync.description = Questo è il binding per i prodotti VeSync. Attualmente, questo supporta i Purificatori e Umidificatori ad Aria Levoit che usano il protocollo v2.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues.properties b/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues.properties
index 85aee6f27..93fd31615 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues.properties
+++ b/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vigicrues.name = VigiCrues Binding
-binding.vigicrues.description = Retrieves rivers levels and alerts in France
+addon.vigicrues.name = VigiCrues Binding
+addon.vigicrues.description = Retrieves rivers levels and alerts in France
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues_fr.properties b/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues_fr.properties
index af8ad05b6..fcdf12c1b 100644
--- a/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues_fr.properties
+++ b/bundles/org.openhab.binding.vigicrues/src/main/resources/OH-INF/i18n/vigicrues_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vigicrues.name = Extension VigiCrues
-binding.vigicrues.description = Cette extension récupère les niveaux et alertes des cours d'eau en France.
+addon.vigicrues.name = Extension VigiCrues
+addon.vigicrues.description = Cette extension récupère les niveaux et alertes des cours d'eau en France.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
index e92394721..0f426f1b6 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vitotronic.name = Vitotronic Binding
-binding.vitotronic.description = This is the binding for Vitotronic.
+addon.vitotronic.name = Vitotronic Binding
+addon.vitotronic.description = This is the binding for Vitotronic.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.vizio/src/main/resources/OH-INF/i18n/vizio.properties b/bundles/org.openhab.binding.vizio/src/main/resources/OH-INF/i18n/vizio.properties
index c26e2a261..14273f1b3 100644
--- a/bundles/org.openhab.binding.vizio/src/main/resources/OH-INF/i18n/vizio.properties
+++ b/bundles/org.openhab.binding.vizio/src/main/resources/OH-INF/i18n/vizio.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.vizio.name = Vizio Binding
-binding.vizio.description = Controls Vizio TVs w/SmartCast API (2016+ Models)
+addon.vizio.name = Vizio Binding
+addon.vizio.description = Controls Vizio TVs w/SmartCast API (2016+ Models)
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall.properties b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall.properties
index dac533293..69f635124 100644
--- a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall.properties
+++ b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.volvooncall.name = VolvoOnCall Binding
-binding.volvooncall.description = This binding enables the access to VolvoOnCall services.
+addon.volvooncall.name = VolvoOnCall Binding
+addon.volvooncall.description = This binding enables the access to VolvoOnCall services.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_de.properties b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_de.properties
index d27e79f10..5e2f69913 100644
--- a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_de.properties
+++ b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.volvooncall.name = VolvoOnCall Binding
-binding.volvooncall.description = Diese Bindung ermöglicht den Zugang zu VolvoOnCall-Dienstleistungen.
+addon.volvooncall.name = VolvoOnCall Binding
+addon.volvooncall.description = Diese Bindung ermöglicht den Zugang zu VolvoOnCall-Dienstleistungen.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_fr.properties b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_fr.properties
index d3a0c0c05..14feeb1ad 100644
--- a/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_fr.properties
+++ b/bundles/org.openhab.binding.volvooncall/src/main/resources/OH-INF/i18n/volvooncall_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.volvooncall.name = Extension VolvoOnCall
-binding.volvooncall.description = Cette extension fournit l'accès aux services de Volvo On Call.
+addon.volvooncall.name = Extension VolvoOnCall
+addon.volvooncall.description = Cette extension fournit l'accès aux services de Volvo On Call.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/i18n/warmup.properties b/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/i18n/warmup.properties
index 3028eceac..627203350 100644
--- a/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/i18n/warmup.properties
+++ b/bundles/org.openhab.binding.warmup/src/main/resources/OH-INF/i18n/warmup.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.warmup.name = Warmup Binding
-binding.warmup.description = This is the binding for a Warmup 4iE Thermostat primarily used for controlling underfloor heating.
+addon.warmup.name = Warmup Binding
+addon.warmup.description = This is the binding for a Warmup 4iE Thermostat primarily used for controlling underfloor heating.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany.properties b/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany.properties
index e95ca293b..550cdcc97 100644
--- a/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany.properties
+++ b/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.weathercompany.name = Weather Company Binding
-binding.weathercompany.description = This is the binding for the Weather Company weather forecast API.
+addon.weathercompany.name = Weather Company Binding
+addon.weathercompany.description = This is the binding for the Weather Company weather forecast API.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany_fr.properties b/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany_fr.properties
index d1bb30f7c..6de560668 100644
--- a/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany_fr.properties
+++ b/bundles/org.openhab.binding.weathercompany/src/main/resources/OH-INF/i18n/weathercompany_fr.properties
@@ -1,6 +1,6 @@
-# binding
-binding.weathercompany.name = Extension Weather Company
-binding.weathercompany.description = Prévisions météo de The Weather Company
+# add-on
+addon.weathercompany.name = Extension Weather Company
+addon.weathercompany.description = Prévisions météo de The Weather Company
 
 # thing types
 thing-type.weathercompany.weather-forecast.label = Météo
diff --git a/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground.properties b/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground.properties
index c9a30882a..b389884c9 100644
--- a/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground.properties
+++ b/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.weatherunderground.name = WeatherUnderground Binding
-binding.weatherunderground.description = The Weather Underground Binding requests the Weather Underground Service to show weather data.
+addon.weatherunderground.name = WeatherUnderground Binding
+addon.weatherunderground.description = The Weather Underground Binding requests the Weather Underground Service to show weather data.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground_fr.properties b/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground_fr.properties
index 6e334d959..424f613ce 100644
--- a/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground_fr.properties
+++ b/bundles/org.openhab.binding.weatherunderground/src/main/resources/OH-INF/i18n/weatherunderground_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.weatherunderground.name = Extension WeatherUnderground
-binding.weatherunderground.description = L'extension Weather Underground interroge le service Weather Underground pour récupérer des données météo.
+addon.weatherunderground.name = Extension WeatherUnderground
+addon.weatherunderground.description = L'extension Weather Underground interroge le service Weather Underground pour récupérer des données météo.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams.properties b/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams.properties
index ee0486a22..d0639da56 100644
--- a/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams.properties
+++ b/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.webexteams.name = WebexTeams Binding
-binding.webexteams.description = This is the binding for WebexTeams. Send messages with actions.
+addon.webexteams.name = WebexTeams Binding
+addon.webexteams.description = This is the binding for WebexTeams. Send messages with actions.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_fr.properties b/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_fr.properties
index 5a9903cbd..6990fc3d8 100644
--- a/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_fr.properties
+++ b/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.webexteams.name = Extension WebexTeams
-binding.webexteams.description = Il s'agit de l'extension pour WebexTeams. Envoyez des messages avec des actions.
+addon.webexteams.name = Extension WebexTeams
+addon.webexteams.description = Il s'agit de l'extension pour WebexTeams. Envoyez des messages avec des actions.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_it.properties b/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_it.properties
index 08261e1c9..672f007de 100644
--- a/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_it.properties
+++ b/bundles/org.openhab.binding.webexteams/src/main/resources/OH-INF/i18n/webexteams_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.webexteams.name = Binding WebexTeams
-binding.webexteams.description = Questo è il binding per WebexTeams. Invia messaggi con azioni.
+addon.webexteams.name = Binding WebexTeams
+addon.webexteams.description = Questo è il binding per WebexTeams. Invia messaggi con azioni.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/i18n/webthing.properties b/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/i18n/webthing.properties
index 2bca6cbac..3ec7262f9 100644
--- a/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/i18n/webthing.properties
+++ b/bundles/org.openhab.binding.webthing/src/main/resources/OH-INF/i18n/webthing.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.webthing.name = WebThing Binding
-binding.webthing.description = The WebThing binding supports an interface to remote devices implementing the Web Thing API.
+addon.webthing.name = WebThing Binding
+addon.webthing.description = The WebThing binding supports an interface to remote devices implementing the Web Thing API.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties
index 0ee306b6e..875f2cc97 100644
--- a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wemo.name = WeMo Binding
-binding.wemo.description = The WeMo binding integrates Belkin WeMo devices.
+addon.wemo.name = WeMo Binding
+addon.wemo.description = The WeMo binding integrates Belkin WeMo devices.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo_de.properties b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo_de.properties
index 747cdcf8f..9ed99140a 100644
--- a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo_de.properties
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wemo.name = WeMo Binding
-binding.wemo.description = Das WeMo Binding integriert Belkin WeMo-Geräte.
+addon.wemo.name = WeMo Binding
+addon.wemo.description = Das WeMo Binding integriert Belkin WeMo-Geräte.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled.properties b/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled.properties
index d2a6f3fb0..cd9f0933a 100644
--- a/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled.properties
+++ b/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wifiled.name = WiFi LED Binding
-binding.wifiled.description = Binding for WiFi LED devices. These are known as Magic Home RGBW LED, UFO LED, LED NET controller etc.
+addon.wifiled.name = WiFi LED Binding
+addon.wifiled.description = Binding for WiFi LED devices. These are known as Magic Home RGBW LED, UFO LED, LED NET controller etc.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled_de.properties b/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled_de.properties
index 151cbfb8c..131733db3 100644
--- a/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled_de.properties
+++ b/bundles/org.openhab.binding.wifiled/src/main/resources/OH-INF/i18n/wifiled_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.wifiled.name = WiFi LED Binding
-binding.wifiled.description = Binding für WiFi LED Geräte. Diese werden u.a. als Magic Home RGBW LED, UFO LED, LED NET controller etc.vertrieben.
+# add-on
+addon.wifiled.name = WiFi LED Binding
+addon.wifiled.description = Binding für WiFi LED Geräte. Diese werden u.a. als Magic Home RGBW LED, UFO LED, LED NET controller etc.vertrieben.
 
 # thing types
 thing-type.wifiled.wifiled.label = WiFi LED
diff --git a/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale.properties b/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale.properties
index e2b38a1a0..f7e795c08 100644
--- a/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale.properties
+++ b/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.windcentrale.name = Windcentrale Binding
-binding.windcentrale.description = Binding for Windcentrale windmills
+addon.windcentrale.name = Windcentrale Binding
+addon.windcentrale.description = Binding for Windcentrale windmills
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale_nl.properties b/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale_nl.properties
index 6eebdff11..da938e5a8 100644
--- a/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale_nl.properties
+++ b/bundles/org.openhab.binding.windcentrale/src/main/resources/OH-INF/i18n/windcentrale_nl.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.windcentrale.name = Windcentrale Binding
-binding.windcentrale.description = Binding voor Windcentrale windmolens
+addon.windcentrale.name = Windcentrale Binding
+addon.windcentrale.description = Binding voor Windcentrale windmolens
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/i18n/wlanthermo.properties b/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/i18n/wlanthermo.properties
index 895b67d71..5bbbd4477 100644
--- a/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/i18n/wlanthermo.properties
+++ b/bundles/org.openhab.binding.wlanthermo/src/main/resources/OH-INF/i18n/wlanthermo.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wlanthermo.name = WlanThermo Binding
-binding.wlanthermo.description = This is the binding for WlanThermo, ref. https://wlanthermo.de/
+addon.wlanthermo.name = WlanThermo Binding
+addon.wlanthermo.description = This is the binding for WlanThermo, ref. https://wlanthermo.de/
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled.properties b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled.properties
index 7ee2ae86c..61b442fcf 100644
--- a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled.properties
+++ b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wled.name = WLED Binding
-binding.wled.description = This is the binding for WLED
+addon.wled.name = WLED Binding
+addon.wled.description = This is the binding for WLED
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled_it.properties b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled_it.properties
index cc24a495d..545d0725f 100644
--- a/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled_it.properties
+++ b/bundles/org.openhab.binding.wled/src/main/resources/OH-INF/i18n/wled_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wled.name = Binding WLEF
-binding.wled.description = Questo è il binding per WLED
+addon.wled.name = Binding WLEF
+addon.wled.description = Questo è il binding per WLED
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties
index 6ecd18ed9..9cfd738f1 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/resources/OH-INF/i18n/wolfsmartset.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wolfsmartset.name = WolfSmartset Binding
-binding.wolfsmartset.description = This is the binding for WolfSmartset smart systems.
+addon.wolfsmartset.name = WolfSmartset Binding
+addon.wolfsmartset.description = This is the binding for WolfSmartset smart systems.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver.properties b/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver.properties
index 33a6ab416..db1a1691b 100644
--- a/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver.properties
+++ b/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wundergroundupdatereceiver.name = Wunderground Update Receiver Binding
-binding.wundergroundupdatereceiver.description = This binding enables acting as a receiver of updates from devices that post measurements to https://rtupdate.wunderground.com/weatherstation/updateweatherstation.php.
+addon.wundergroundupdatereceiver.name = Wunderground Update Receiver Binding
+addon.wundergroundupdatereceiver.description = This binding enables acting as a receiver of updates from devices that post measurements to https://rtupdate.wunderground.com/weatherstation/updateweatherstation.php.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver_da.properties b/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver_da.properties
index 0c892641f..b512ec4b7 100644
--- a/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver_da.properties
+++ b/bundles/org.openhab.binding.wundergroundupdatereceiver/src/main/resources/OH-INF/i18n/wundergroundupdatereceiver_da.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.wundergroundupdatereceiver.name = Wunderground Update Receiver Binding
-binding.wundergroundupdatereceiver.description = Denne binding gør det muligt at modtage opdateringer fra enheder som sender målinger til https\://rtupdate.wunderground.com/weatherstation/updateweatherstation.php.
+addon.wundergroundupdatereceiver.name = Wunderground Update Receiver Binding
+addon.wundergroundupdatereceiver.description = Denne binding gør det muligt at modtage opdateringer fra enheder som sender målinger til https\://rtupdate.wunderground.com/weatherstation/updateweatherstation.php.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv.properties b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv.properties
index dc3181c55..bef390226 100644
--- a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv.properties
+++ b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.xmltv.name = XmlTV Binding
-binding.xmltv.description = This is the binding for reading and parsing XmlTV files
+addon.xmltv.name = XmlTV Binding
+addon.xmltv.description = This is the binding for reading and parsing XmlTV files
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fi.properties b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fi.properties
index 58eacd046..65f33e7ef 100644
--- a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fi.properties
+++ b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fi.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.xmltv.name = XmlTV -lisäosa
-binding.xmltv.description = Tällä lisäosalla tulkitaan XmlTV-tiedostoja
+addon.xmltv.name = XmlTV -lisäosa
+addon.xmltv.description = Tällä lisäosalla tulkitaan XmlTV-tiedostoja
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fr.properties b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fr.properties
index 05315257b..e783221a1 100644
--- a/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fr.properties
+++ b/bundles/org.openhab.binding.xmltv/src/main/resources/OH-INF/i18n/xmltv_fr.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.xmltv.name = Extension XmlTV
-binding.xmltv.description = Cette extension permet de lire et analyser les fichiers de programmes au format XmlTV.
+addon.xmltv.name = Extension XmlTV
+addon.xmltv.description = Cette extension permet de lire et analyser les fichiers de programmes au format XmlTV.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/i18n/xmppclient.properties b/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/i18n/xmppclient.properties
index 70efda676..1635cbe75 100644
--- a/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/i18n/xmppclient.properties
+++ b/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/i18n/xmppclient.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.xmppclient.name = XMPPClient Binding
-binding.xmppclient.description = This is the binding for XMPP (Jabber) notifications.
+addon.xmppclient.name = XMPPClient Binding
+addon.xmppclient.description = This is the binding for XMPP (Jabber) notifications.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties
index 6772e14e5..9c6439ee0 100644
--- a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties
+++ b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yamahamusiccast.name = Yamaha Musiccast Binding
-binding.yamahamusiccast.description = This is the binding for Yamaha Musiccast
+addon.yamahamusiccast.name = Yamaha Musiccast Binding
+addon.yamahamusiccast.description = This is the binding for Yamaha Musiccast
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_de.properties b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_de.properties
index 074d81b0f..f25ac9852 100644
--- a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_de.properties
+++ b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_de.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yamahamusiccast.name = Yamaha MusicCast Bindung
-binding.yamahamusiccast.description = Dies ist das Binding für Yamaha MusicCast
+addon.yamahamusiccast.name = Yamaha MusicCast Bindung
+addon.yamahamusiccast.description = Dies ist das Binding für Yamaha MusicCast
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_it.properties b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_it.properties
index d80335e34..0169192db 100644
--- a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_it.properties
+++ b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yamahamusiccast.name = Binding Yamaha Musiccast
-binding.yamahamusiccast.description = Questo è il binding per Yamaha Musiccast
+addon.yamahamusiccast.name = Binding Yamaha Musiccast
+addon.yamahamusiccast.description = Questo è il binding per Yamaha Musiccast
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties b/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties
index 97ee720b7..65e3d86c9 100644
--- a/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties
+++ b/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yamahareceiver.name = YamahaReceiver Binding
-binding.yamahareceiver.description = For all network enabled Yamaha receivers.
+addon.yamahareceiver.name = YamahaReceiver Binding
+addon.yamahareceiver.description = For all network enabled Yamaha receivers.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight.properties b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight.properties
index e95c9e145..81e923a73 100644
--- a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight.properties
+++ b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yeelight.name = Yeelight Binding
-binding.yeelight.description = This is the binding for Yeelight products.
+addon.yeelight.name = Yeelight Binding
+addon.yeelight.description = This is the binding for Yeelight products.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight_it.properties b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight_it.properties
index 6f42cba5a..d4712eed5 100644
--- a/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight_it.properties
+++ b/bundles/org.openhab.binding.yeelight/src/main/resources/OH-INF/i18n/yeelight_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yeelight.name = Binding Yeelight
-binding.yeelight.description = Questo è il binding per prodotti Yeelight.
+addon.yeelight.name = Binding Yeelight
+addon.yeelight.description = Questo è il binding per prodotti Yeelight.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote.properties b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote.properties
index 78feab72a..a15f415be 100644
--- a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote.properties
+++ b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yioremote.name = YIOremote Binding
-binding.yioremote.description = This is the binding for YIOremote.
+addon.yioremote.name = YIOremote Binding
+addon.yioremote.description = This is the binding for YIOremote.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_de.properties b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_de.properties
index 338c49afc..b9a12f848 100644
--- a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_de.properties
+++ b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.yioremote.name = YIO Remote Binding
-binding.yioremote.description = Dieses Addon steuert eine YIO Dock / Remote-Kombination
+# add-on
+addon.yioremote.name = YIO Remote Binding
+addon.yioremote.description = Dieses Addon steuert eine YIO Dock / Remote-Kombination
 
 # thing types
 thing-type.yioremote.yioremotedock.label = YIO Remote Dock
diff --git a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_it.properties b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_it.properties
index c411d9f03..376bfe6b0 100644
--- a/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_it.properties
+++ b/bundles/org.openhab.binding.yioremote/src/main/resources/OH-INF/i18n/yioremote_it.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.yioremote.name = Binding YIOremote
-binding.yioremote.description = Questo è il binding per YIOremote.
+addon.yioremote.name = Binding YIOremote
+addon.yioremote.description = Questo è il binding per YIOremote.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.zoneminder/src/main/resources/OH-INF/i18n/zoneminder.properties b/bundles/org.openhab.binding.zoneminder/src/main/resources/OH-INF/i18n/zoneminder.properties
index 650f596b6..2b97d89ab 100644
--- a/bundles/org.openhab.binding.zoneminder/src/main/resources/OH-INF/i18n/zoneminder.properties
+++ b/bundles/org.openhab.binding.zoneminder/src/main/resources/OH-INF/i18n/zoneminder.properties
@@ -1,7 +1,7 @@
-# binding
+# add-on
 
-binding.zoneminder.name = ZoneMinder Binding
-binding.zoneminder.description = Binding for ZoneMinder video surveillance system
+addon.zoneminder.name = ZoneMinder Binding
+addon.zoneminder.description = Binding for ZoneMinder video surveillance system
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway.properties b/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway.properties
index 3c43577f9..2ca37a4ce 100644
--- a/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway.properties
+++ b/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway.properties
@@ -1,6 +1,6 @@
-# binding
-binding.zway.name = Z-Way Binding
-binding.zway.description = Z-Way is a home automation software to configure and control a Z-Wave network. The ZAutomation interface provides all Z-Wave devices and handles incoming commands. The Z-Way Binding uses this HTTP interface to load all device and make them available during the discovery process.<br> Currently only a continuous polling is available!
+# add-on
+addon.zway.name = Z-Way Binding
+addon.zway.description = Z-Way is a home automation software to configure and control a Z-Wave network. The ZAutomation interface provides all Z-Wave devices and handles incoming commands. The Z-Way Binding uses this HTTP interface to load all device and make them available during the discovery process.<br> Currently only a continuous polling is available!
 
 # thing types
 thing-type.zway.zwayServer.label = Z-Way Server
diff --git a/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway_de.properties b/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway_de.properties
index efe18a7f0..c96400a1b 100644
--- a/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway_de.properties
+++ b/bundles/org.openhab.binding.zway/src/main/resources/OH-INF/i18n/zway_de.properties
@@ -1,6 +1,6 @@
-# binding
-binding.zway.name = Z-Way Binding
-binding.zway.description = Das Z-Way-System ist ein Softwarepaket für den Z-Wave Funkstandard. Das System besteht im wesentlichen aus einer Firmware für Z-Wave Transceiver, einer Kommunikations- und einer Automatisierungskomponente zur Steuerung und Konfiguration des Netzwerks. Das Z-Way Binding nutzt die HTTP-Schnittstelle um alle Geräte zu laden und im Discovery-Prozess zur Verfügung zu stellen.<br>Aktuell wird nur Polling zum Aktualisieren der Gerätezustände verwendet\!
+# add-on
+addon.zway.name = Z-Way Binding
+addon.zway.description = Das Z-Way-System ist ein Softwarepaket für den Z-Wave Funkstandard. Das System besteht im wesentlichen aus einer Firmware für Z-Wave Transceiver, einer Kommunikations- und einer Automatisierungskomponente zur Steuerung und Konfiguration des Netzwerks. Das Z-Way Binding nutzt die HTTP-Schnittstelle um alle Geräte zu laden und im Discovery-Prozess zur Verfügung zu stellen.<br>Aktuell wird nur Polling zum Aktualisieren der Gerätezustände verwendet\!
 
 # thing types
 thing-type.zway.zwayServer.label = Z-Way Server