Merge branch 'apply-tags-from-items-file' of https://github.com/andrewfg/openhab-core into apply-tags-from-items-file

Author: andrewfg

bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/DefaultSystemChannels.properties

@@ -54,7 +54,7 @@ channel-type.system.electric-current.label = Electric Current
 channel-type.system.electric-current.description = Current electric current
 channel-type.system.electric-voltage.label = Electric Voltage
 channel-type.system.electric-voltage.description = Current electric voltage
-channel-type.system.electrical-energy.label = Electrical Energy
-channel-type.system.electrical-energy.description = Current electrical energy
+channel-type.system.electric-energy.label = Electric Energy
+channel-type.system.electric-energy.description = Current electric energy
 channel-type.system.uv-index.label = UV Index
 channel-type.system.uv-index.description = Current UV index

bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/DefaultSystemChannels_da.properties

@@ -54,7 +54,7 @@ channel-type.system.electric-current.label = Elektrisk strøm
 channel-type.system.electric-current.description = Aktuel elektrisk strøm
 channel-type.system.electric-voltage.label = Elektrisk spænding
 channel-type.system.electric-voltage.description = Aktuel elektrisk spænding
-channel-type.system.electrical-energy.label = Elektrisk energi
-channel-type.system.electrical-energy.description = Aktuel elektrisk energi
+channel-type.system.electric-energy.label = Elektrisk energi
+channel-type.system.electric-energy.description = Aktuel elektrisk energi
 channel-type.system.uv-index.label = UV-indeks
 channel-type.system.uv-index.description = Aktuelt UV-indeks

bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/DefaultSystemChannels_de.properties

@@ -54,7 +54,7 @@ channel-type.system.electric-current.label = Elektrische Stromstärke
 channel-type.system.electric-current.description = Zeigt die aktuelle elektrische Stromstärke an.
 channel-type.system.electric-voltage.label = Elektrische Spannung
 channel-type.system.electric-voltage.description = Zeigt die aktuelle elektrische Spannung an.
-channel-type.system.electrical-energy.label = Elektrische Energie
-channel-type.system.electrical-energy.description = Zeigt die aktuelle elektrische Energy an.
+channel-type.system.electric-energy.label = Elektrische Energie
+channel-type.system.electric-energy.description = Zeigt die aktuelle elektrische Energie an.
 channel-type.system.uv-index.label = UV-Index
 channel-type.system.uv-index.description = Aktueller UV-Index