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 14c140686..7e3d429e3 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
@@ -76,6 +76,8 @@ channel-type.sonos.alarmrunning.label = Alarm Is Running
channel-type.sonos.alarmrunning.description = Set to ON if the alarm was triggered
channel-type.sonos.bass.label = Bass
channel-type.sonos.bass.description = Set or get the bass level adjustment
+channel-type.sonos.batterycharging.label = Battery Charging
+channel-type.sonos.batterycharging.description = Indicator set to ON when the battery is charging
channel-type.sonos.clearqueue.label = Clear Queue
channel-type.sonos.clearqueue.description = Suppress all songs from the current queue
channel-type.sonos.codec.label = Codec
@@ -109,14 +111,20 @@ channel-type.sonos.heightlevel.label = Height Level
channel-type.sonos.heightlevel.description = Set or get the height level adjustment
channel-type.sonos.led.label = Led
channel-type.sonos.led.description = Set or get the status of the white led on the front of the Sonos device
+channel-type.sonos.linein.label = Line-in Connected
+channel-type.sonos.linein.description = Indicator set to ON when the line-in of the Sonos device is connected
channel-type.sonos.localcoordinator.label = Local Coordinator
channel-type.sonos.localcoordinator.description = Indicator set to ON if this Sonos device is the Zone Group Coordinator
channel-type.sonos.loudness.label = Loudness
channel-type.sonos.loudness.description = Enable or disable the loudness
+channel-type.sonos.microphone.label = Microphone
+channel-type.sonos.microphone.description = Indicator set to ON when the microphone is enabled
channel-type.sonos.nightmode.label = Night Mode
channel-type.sonos.nightmode.description = Enable or disable the night mode feature
channel-type.sonos.notificationsound.label = Notification Sound
channel-type.sonos.notificationsound.description = Play a notification sound by a given URI
+channel-type.sonos.playlinein.label = Play Line-in
+channel-type.sonos.playlinein.description = Play the line-in of the the Sonos device corresponding to the given UIN
channel-type.sonos.playlist.label = Play Playlist
channel-type.sonos.playlist.description = Play the given playlist. The playlist has to be predefined in the Sonos Controller app
channel-type.sonos.playqueue.label = Play Queue
@@ -162,36 +170,28 @@ channel-type.sonos.state.state.option.PAUSED_PLAYBACK = Paused
channel-type.sonos.state.state.option.TRANSITIONING = Transitioning
channel-type.sonos.stop.label = Stop
channel-type.sonos.stop.description = Stop the Sonos device. ON if the player is stopped.
-channel-type.sonos.treble.label = Treble
-channel-type.sonos.treble.description = Set or get the treble level adjustment
channel-type.sonos.subwoofer.label = Subwoofer
channel-type.sonos.subwoofer.description = Enable or disable the subwoofer
channel-type.sonos.subwoofergain.label = Subwoofer Gain
channel-type.sonos.subwoofergain.description = Set or get the subwoofer gain adjustment
channel-type.sonos.surround.label = Surround Audio
channel-type.sonos.surround.description = Enable or disable the surround audio
+channel-type.sonos.surroundmusiclevel.label = Surround Music Level
+channel-type.sonos.surroundmusiclevel.description = Set or get the surround level adjustment for music
channel-type.sonos.surroundmusicmode.label = Surround Music Mode
channel-type.sonos.surroundmusicmode.description = Set or get the surround playback mode for music
channel-type.sonos.surroundmusicmode.state.option.0 = Ambient
channel-type.sonos.surroundmusicmode.state.option.1 = Full
-channel-type.sonos.surroundmusiclevel.label = Surround Music Level
-channel-type.sonos.surroundmusiclevel.description = Set or get the surround level adjustment for music
channel-type.sonos.surroundtvlevel.label = Surround TV Level
channel-type.sonos.surroundtvlevel.description = Set or get the surround level adjustment for TV
+channel-type.sonos.treble.label = Treble
+channel-type.sonos.treble.description = Set or get the treble level adjustment
channel-type.sonos.tuneinstationid.label = TuneIn Station Id
channel-type.sonos.tuneinstationid.description = Provide the current TuneIn station id or play the TuneIn radio given by its station id
channel-type.sonos.zonegroupid.label = Zone Group ID
channel-type.sonos.zonegroupid.description = Id of the Zone Group the Sonos device belongs to
channel-type.sonos.zonename.label = Zone Name
channel-type.sonos.zonename.description = Name of the Zone Group associated to the Sonos device
-channel-type.sonos.linein.label = Line-in Connected
-channel-type.sonos.linein.description = Indicator set to ON when the line-in of the Sonos device is connected
-channel-type.sonos.playlinein.label = Play Line-in
-channel-type.sonos.playlinein.description = Play the line-in of the the Sonos device corresponding to the given UIN
-channel-type.sonos.batterycharging.label = Battery Charging
-channel-type.sonos.batterycharging.description = Indicator set to ON when the battery is charging
-channel-type.sonos.microphone.label = Microphone
-channel-type.sonos.microphone.description = Indicator set to ON when the microphone is enabled
# thing status descriptions
diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
index 69e92c50b..9b6c6d531 100644
--- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
@@ -8,7 +8,7 @@
String
- Add the given Zone Player to the group of this Zone Player
+ Add the given Sonos device to the group of this Sonos device
@@ -129,13 +129,13 @@
Switch
- Set or get the status of the white led on the front of the Zone Player
+ Set or get the status of the white led on the front of the Sonos deviceSwitch
- Indicator set to ON if this Zone Player is the Zone Group Coordinator
+ Indicator set to ON if this Sonos device is the Zone Group Coordinator
@@ -184,8 +184,8 @@
Switch
- Put all Zone Players in one group, and stream audio from the line-in from the Zone Player that triggered
- the command
+ Put all Sonos devices in one group, and stream audio from the line-in from the Sonos device that
+ triggered the command
@@ -197,7 +197,7 @@
String
- Remove the given Zone Player from the group of this Zone Player
+ Remove the given Sonos device from the group of this Sonos device
@@ -216,25 +216,25 @@
Switch
- Restore the state of the Zone Player
+ Restore the state of the Sonos deviceSwitch
- Restore the state of all the Zone Players
+ Restore the state of all the Sonos devicesSwitch
- Save the state of the Zone Player
+ Save the state of the Sonos deviceSwitch
- Save the state of all the Zone Players
+ Save the state of all the Sonos devices
@@ -266,14 +266,14 @@
Switch
- Make the Zone Player leave its group and become a standalone Zone Player
+ Make the Sonos device leave its group and become a standalone playerString
- The State channel contains state of the Zone Player, e.g. PLAYING, STOPPED,...
+ The State channel contains state of the Sonos device, e.g. PLAYING, STOPPED,...
@@ -287,7 +287,7 @@
Switch
- Stop the Zone Player. ON if the player is stopped.
+ Stop the Sonos device. ON if the player is stopped.
@@ -351,14 +351,14 @@
String
- Id of the Zone Group the Zone Player belongs to
+ Id of the Zone Group the Sonos device belongs toString
- Name of the Zone Group associated to the Zone Player
+ Name of the Zone Group associated to the Sonos device
@@ -366,14 +366,14 @@
Switch
- Indicator set to ON when the line-in of the Zone Player is connected
+ Indicator set to ON when the line-in of the Sonos device is connectedString
- Play the line-in of the the Zone Player corresponding to the given UIN
+ Play the line-in of the the Sonos device corresponding to the given UIN