From 5ea482d01fd1c10e0dc39da493728446f2d85d75 Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Tue, 12 May 2020 19:04:41 +0200
Subject: [PATCH 01/11] Moderator: disable screen sharing

---
 app/src/RoomClient.js                         | 36 ++++++++++++++++++-
 app/src/actions/peerActions.js                |  7 ++++
 .../MeetingDrawer/ParticipantList/ListPeer.js | 27 ++++++++++++++
 app/src/reducers/peers.js                     |  6 ++++
 app/src/translations/en.json                  |  3 +-
 server/lib/Room.js                            | 19 ++++++++++
 6 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 2217d65..71c530b 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1432,6 +1432,26 @@ export default class RoomClient
 			peerActions.setStopPeerVideoInProgress(peerId, false));
 	}
 
+	async stopPeerScreenSharing(peerId)
+	{
+		logger.debug('stopPeerScreenSharing() [peerId:"%s"]', peerId);
+
+		store.dispatch(
+			peerActions.setStopPeerScreenSharingInProgress(peerId, true));
+
+		try
+		{
+			await this.sendRequest('moderator:stopScreenSharing', { peerId });
+		}
+		catch (error)
+		{
+			logger.error('stopPeerScreenSharing() failed: %o', error);
+		}
+
+		store.dispatch(
+			peerActions.setStopPeerScreenSharingInProgress(peerId, false));
+	}
+
 	async muteAllPeers()
 	{
 		logger.debug('muteAllPeers()');
@@ -2592,7 +2612,6 @@ export default class RoomClient
 					case 'moderator:stopVideo':
 					{
 						this.disableWebcam();
-						this.disableScreenSharing();
 
 						store.dispatch(requestActions.notify(
 							{
@@ -2605,6 +2624,21 @@ export default class RoomClient
 						break;
 					}
 
+					case 'moderator:stopScreenSharing':
+					{
+						this.disableScreenSharing();
+
+						store.dispatch(requestActions.notify(
+							{
+								text : intl.formatMessage({
+									id             : 'moderator.muteScreenSharingModerator',
+									defaultMessage : 'Moderator stopped your screen sharing'
+								})
+							}));
+
+						break;
+					}
+
 					case 'moderator:kick':
 					{
 						// Need some feedback
diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index 5672b47..8a67371 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -86,3 +86,10 @@ export const setStopPeerVideoInProgress = (peerId, flag) =>
 		type    : 'STOP_PEER_VIDEO_IN_PROGRESS',
 		payload : { peerId, flag }
 	});
+	
+export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
+({
+	type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
+	payload : { peerId, flag }
+});
+
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
index 7aa5181..b375c6f 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
@@ -306,6 +306,33 @@ const ListPeer = (props) =>
 					</IconButton>
 				</Tooltip>
 			}
+			{ isModerator && screenConsumer && 
+				<Tooltip
+					title={intl.formatMessage({
+						id             : 'tooltip.muteScreenSharing',
+						defaultMessage : 'Mute participant screen share globally'
+					})}
+					placement='bottom'
+				>
+					<IconButton
+						className={classes.buttons}
+						style={{ color: green[500] }}
+						disabled={!isModerator || peer.stopPeerScreenSharingInProgress}
+						onClick={(e) =>
+						{
+							e.stopPropagation();
+
+							roomClient.stopPeerScreenSharing(peer.id);
+						}}
+					>
+						{ !screenConsumer.remotelyPaused ?
+							<ScreenIcon />
+							:
+							<ScreenOffIcon />
+						}
+					</IconButton>
+				</Tooltip>
+			}
 			{children}
 		</div>
 	);
diff --git a/app/src/reducers/peers.js b/app/src/reducers/peers.js
index 32d6fef..8e6a7f7 100644
--- a/app/src/reducers/peers.js
+++ b/app/src/reducers/peers.js
@@ -82,6 +82,11 @@ const peer = (state = initialState, action) =>
 				stopPeerVideoInProgress : action.payload.flag
 			};
 
+		case 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS':
+			return {
+				...state,
+				stopPeerScreenSharingInProgress : action.payload.flag
+			};
 		default:
 			return state;
 	}
@@ -118,6 +123,7 @@ const peers = (state = initialState, action) =>
 		case 'REMOVE_PEER_ROLE':
 		case 'STOP_PEER_AUDIO_IN_PROGRESS':
 		case 'STOP_PEER_VIDEO_IN_PROGRESS':
+		case 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS':
 		{
 			const oldPeer = state[action.payload.peerId];
 
diff --git a/app/src/translations/en.json b/app/src/translations/en.json
index 344d660..d667fa4 100644
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@@ -183,5 +183,6 @@
 	"moderator.clearChat": "Moderator cleared the chat",
 	"moderator.clearFiles": "Moderator cleared the files",
 	"moderator.muteAudio": "Moderator muted your audio",
-	"moderator.muteVideo": "Moderator muted your video"
+	"moderator.muteVideo": "Moderator muted your video",
+	"moderator.muteScreenSharing": "Moderator muted your screen sharing"
 }
\ No newline at end of file
diff --git a/server/lib/Room.js b/server/lib/Room.js
index 74accc4..0610ffe 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -1441,6 +1441,25 @@ class Room extends EventEmitter
 				break;
 			}
 
+			case 'moderator:stopScreenSharing':
+			{
+				if (!this._hasPermission(peer, MODERATE_ROOM))
+					throw new Error('peer not authorized');
+
+				const { peerId } = request.data;
+
+				const stopVideoPeer = this._peers[peerId];
+
+				if (!stopVideoPeer)
+					throw new Error(`peer with id "${peerId}" not found`);
+
+				this._notification(stopVideoPeer.socket, 'moderator:stopScreenSharing');
+
+				cb();
+
+				break;
+			}
+
 			case 'moderator:closeMeeting':
 			{
 				if (!this._hasPermission(peer, MODERATE_ROOM))

From b8c0a8450d5b6baedb656248fc9d72087c26f855 Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Tue, 12 May 2020 19:31:51 +0200
Subject: [PATCH 02/11] Lint fix

---
 app/src/actions/peerActions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index 8a67371..b40d486 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -88,8 +88,8 @@ export const setStopPeerVideoInProgress = (peerId, flag) =>
 	});
 	
 export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
-({
-	type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
-	payload : { peerId, flag }
-});
+	({
+		type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
+		payload : { peerId, flag }
+	});
 

From cbbfd1b26fb671c59bfe5c31a80cc8c9130be84c Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Tue, 12 May 2020 19:04:41 +0200
Subject: [PATCH 03/11] Moderator: disable screen sharing

---
 app/src/RoomClient.js                         | 36 ++++++++++++++++++-
 app/src/actions/peerActions.js                |  7 ++++
 .../MeetingDrawer/ParticipantList/ListPeer.js | 27 ++++++++++++++
 app/src/reducers/peers.js                     |  6 ++++
 app/src/translations/en.json                  |  3 +-
 server/lib/Room.js                            | 19 ++++++++++
 6 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 3d63d26..bb16d82 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1442,6 +1442,26 @@ export default class RoomClient
 			peerActions.setStopPeerVideoInProgress(peerId, false));
 	}
 
+	async stopPeerScreenSharing(peerId)
+	{
+		logger.debug('stopPeerScreenSharing() [peerId:"%s"]', peerId);
+
+		store.dispatch(
+			peerActions.setStopPeerScreenSharingInProgress(peerId, true));
+
+		try
+		{
+			await this.sendRequest('moderator:stopScreenSharing', { peerId });
+		}
+		catch (error)
+		{
+			logger.error('stopPeerScreenSharing() failed: %o', error);
+		}
+
+		store.dispatch(
+			peerActions.setStopPeerScreenSharingInProgress(peerId, false));
+	}
+
 	async muteAllPeers()
 	{
 		logger.debug('muteAllPeers()');
@@ -2602,7 +2622,6 @@ export default class RoomClient
 					case 'moderator:stopVideo':
 					{
 						this.disableWebcam();
-						this.disableScreenSharing();
 
 						store.dispatch(requestActions.notify(
 							{
@@ -2615,6 +2634,21 @@ export default class RoomClient
 						break;
 					}
 
+					case 'moderator:stopScreenSharing':
+					{
+						this.disableScreenSharing();
+
+						store.dispatch(requestActions.notify(
+							{
+								text : intl.formatMessage({
+									id             : 'moderator.muteScreenSharingModerator',
+									defaultMessage : 'Moderator stopped your screen sharing'
+								})
+							}));
+
+						break;
+					}
+
 					case 'moderator:kick':
 					{
 						// Need some feedback
diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index 5672b47..8a67371 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -86,3 +86,10 @@ export const setStopPeerVideoInProgress = (peerId, flag) =>
 		type    : 'STOP_PEER_VIDEO_IN_PROGRESS',
 		payload : { peerId, flag }
 	});
+	
+export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
+({
+	type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
+	payload : { peerId, flag }
+});
+
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
index 0ca5d89..5d11998 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
@@ -306,6 +306,33 @@ const ListPeer = (props) =>
 					</IconButton>
 				</Tooltip>
 			}
+			{ isModerator && screenConsumer && 
+				<Tooltip
+					title={intl.formatMessage({
+						id             : 'tooltip.muteScreenSharing',
+						defaultMessage : 'Mute participant screen share globally'
+					})}
+					placement='bottom'
+				>
+					<IconButton
+						className={classes.buttons}
+						style={{ color: green[500] }}
+						disabled={!isModerator || peer.stopPeerScreenSharingInProgress}
+						onClick={(e) =>
+						{
+							e.stopPropagation();
+
+							roomClient.stopPeerScreenSharing(peer.id);
+						}}
+					>
+						{ !screenConsumer.remotelyPaused ?
+							<ScreenIcon />
+							:
+							<ScreenOffIcon />
+						}
+					</IconButton>
+				</Tooltip>
+			}
 			{children}
 		</div>
 	);
diff --git a/app/src/reducers/peers.js b/app/src/reducers/peers.js
index 32d6fef..8e6a7f7 100644
--- a/app/src/reducers/peers.js
+++ b/app/src/reducers/peers.js
@@ -82,6 +82,11 @@ const peer = (state = initialState, action) =>
 				stopPeerVideoInProgress : action.payload.flag
 			};
 
+		case 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS':
+			return {
+				...state,
+				stopPeerScreenSharingInProgress : action.payload.flag
+			};
 		default:
 			return state;
 	}
@@ -118,6 +123,7 @@ const peers = (state = initialState, action) =>
 		case 'REMOVE_PEER_ROLE':
 		case 'STOP_PEER_AUDIO_IN_PROGRESS':
 		case 'STOP_PEER_VIDEO_IN_PROGRESS':
+		case 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS':
 		{
 			const oldPeer = state[action.payload.peerId];
 
diff --git a/app/src/translations/en.json b/app/src/translations/en.json
index 6237516..e56fc8f 100644
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@@ -187,5 +187,6 @@
 	"moderator.clearChat": "Moderator cleared the chat",
 	"moderator.clearFiles": "Moderator cleared the files",
 	"moderator.muteAudio": "Moderator muted your audio",
-	"moderator.muteVideo": "Moderator muted your video"
+	"moderator.muteVideo": "Moderator muted your video",
+	"moderator.muteScreenSharing": "Moderator muted your screen sharing"
 }
\ No newline at end of file
diff --git a/server/lib/Room.js b/server/lib/Room.js
index 74accc4..0610ffe 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -1441,6 +1441,25 @@ class Room extends EventEmitter
 				break;
 			}
 
+			case 'moderator:stopScreenSharing':
+			{
+				if (!this._hasPermission(peer, MODERATE_ROOM))
+					throw new Error('peer not authorized');
+
+				const { peerId } = request.data;
+
+				const stopVideoPeer = this._peers[peerId];
+
+				if (!stopVideoPeer)
+					throw new Error(`peer with id "${peerId}" not found`);
+
+				this._notification(stopVideoPeer.socket, 'moderator:stopScreenSharing');
+
+				cb();
+
+				break;
+			}
+
 			case 'moderator:closeMeeting':
 			{
 				if (!this._hasPermission(peer, MODERATE_ROOM))

From 69244bdf1263b4b6e547b09a36356b110d3b3527 Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Tue, 12 May 2020 19:31:51 +0200
Subject: [PATCH 04/11] Lint fix

---
 app/src/actions/peerActions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index 8a67371..b40d486 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -88,8 +88,8 @@ export const setStopPeerVideoInProgress = (peerId, flag) =>
 	});
 	
 export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
-({
-	type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
-	payload : { peerId, flag }
-});
+	({
+		type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
+		payload : { peerId, flag }
+	});
 

From f54ed84edb3080c3d941c6ef1092bc7e49bf0621 Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Wed, 13 May 2020 10:42:03 +0200
Subject: [PATCH 05/11] Moderator: Mute all screen sharing

---
 app/src/RoomClient.js                         | 20 +++++++++++++++++++
 app/src/actions/roomActions.js                |  6 ++++++
 .../ParticipantList/ListModerator.js          | 16 +++++++++++++++
 .../MeetingDrawer/ParticipantList/ListPeer.js |  2 +-
 app/src/reducers/room.js                      |  3 +++
 server/lib/Room.js                            | 13 ++++++++++++
 6 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index bb16d82..4883595 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1502,6 +1502,26 @@ export default class RoomClient
 			roomActions.setStopAllVideoInProgress(false));
 	}
 
+	async stopAllPeerScreenSharing()
+	{
+		logger.debug('stopAllPeerScreenSharing()');
+
+		store.dispatch(
+			roomActions.setStopAllScreenSharingInProgress(true));
+
+		try
+		{
+			await this.sendRequest('moderator:stopAllScreenSharing');
+		}
+		catch (error)
+		{
+			logger.error('stopAllPeerScreenSharing() failed: %o', error);
+		}
+
+		store.dispatch(
+			roomActions.setStopAllScreenSharingInProgress(false));
+	}
+
 	async closeMeeting()
 	{
 		logger.debug('closeMeeting()');
diff --git a/app/src/actions/roomActions.js b/app/src/actions/roomActions.js
index 5ae45e3..a73e18a 100644
--- a/app/src/actions/roomActions.js
+++ b/app/src/actions/roomActions.js
@@ -164,6 +164,12 @@ export const setStopAllVideoInProgress = (flag) =>
 		payload : { flag }
 	});
 
+export const setStopAllScreenSharingInProgress = (flag) =>
+	({
+		type    : 'STOP_ALL_SCREEN_SHARING_IN_PROGRESS',
+		payload : { flag }
+	});
+
 export const setCloseMeetingInProgress = (flag) =>
 	({
 		type    : 'CLOSE_MEETING_IN_PROGRESS',
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js b/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js
index c10506a..2fff283 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js
@@ -63,6 +63,22 @@ const ListModerator = (props) =>
 				/>
 			</Button>
 			<div className={classes.divider} />
+			<Button
+				aria-label={intl.formatMessage({
+					id             : 'room.stopAllScreenSharing',
+					defaultMessage : 'Stop all screen sharing'
+				})}
+				variant='contained'
+				color='secondary'
+				disabled={room.stopAllScreenSharingInProgress}
+				onClick={() => roomClient.stopAllPeerScreenSharing()}
+			>
+				<FormattedMessage
+					id='room.stopAllScreenSharing'
+					defaultMessage='Stop all screen sharing'
+				/>
+			</Button>
+			<div className={classes.divider} />
 			<Button
 				aria-label={intl.formatMessage({
 					id             : 'room.closeMeeting',
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
index 5d11998..697a43b 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
@@ -309,7 +309,7 @@ const ListPeer = (props) =>
 			{ isModerator && screenConsumer && 
 				<Tooltip
 					title={intl.formatMessage({
-						id             : 'tooltip.muteScreenSharing',
+						id             : 'tooltip.muteScreenSharingModerator',
 						defaultMessage : 'Mute participant screen share globally'
 					})}
 					placement='bottom'
diff --git a/app/src/reducers/room.js b/app/src/reducers/room.js
index d784219..193e8e0 100644
--- a/app/src/reducers/room.js
+++ b/app/src/reducers/room.js
@@ -226,6 +226,9 @@ const room = (state = initialState, action) =>
 		case 'STOP_ALL_VIDEO_IN_PROGRESS':
 			return { ...state, stopAllVideoInProgress: action.payload.flag };
 
+		case 'STOP_ALL_SCREEN_SHARING_IN_PROGRESS':
+			return { ...state, stopAllScreenSharingInProgress: action.payload.flag };
+
 		case 'CLOSE_MEETING_IN_PROGRESS':
 			return { ...state, closeMeetingInProgress: action.payload.flag };
 
diff --git a/server/lib/Room.js b/server/lib/Room.js
index 0610ffe..f110327 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -1441,6 +1441,19 @@ class Room extends EventEmitter
 				break;
 			}
 
+			case 'moderator:stopAllScreenSharing':
+			{
+				if (!this._hasPermission(peer, MODERATE_ROOM))
+					throw new Error('peer not authorized');
+
+				// Spread to others
+				this._notification(peer.socket, 'moderator:stopScreenSharing', null, true);
+
+				cb();
+
+				break;
+			}
+
 			case 'moderator:stopScreenSharing':
 			{
 				if (!this._hasPermission(peer, MODERATE_ROOM))

From ff096f993db9609d95d387d942ae5ef06e9795db Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Tue, 12 May 2020 19:04:41 +0200
Subject: [PATCH 06/11] Moderator: disable screen sharing

---
 app/src/RoomClient.js                         | 36 ++++++++++++++++++-
 app/src/actions/peerActions.js                |  7 ++++
 .../MeetingDrawer/ParticipantList/ListPeer.js | 27 ++++++++++++++
 app/src/reducers/peers.js                     |  6 ++++
 app/src/translations/en.json                  |  3 +-
 server/lib/Room.js                            | 19 ++++++++++
 6 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 5086107..ccd9d6e 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1448,6 +1448,26 @@ export default class RoomClient
 			peerActions.setStopPeerVideoInProgress(peerId, false));
 	}
 
+	async stopPeerScreenSharing(peerId)
+	{
+		logger.debug('stopPeerScreenSharing() [peerId:"%s"]', peerId);
+
+		store.dispatch(
+			peerActions.setStopPeerScreenSharingInProgress(peerId, true));
+
+		try
+		{
+			await this.sendRequest('moderator:stopScreenSharing', { peerId });
+		}
+		catch (error)
+		{
+			logger.error('stopPeerScreenSharing() failed: %o', error);
+		}
+
+		store.dispatch(
+			peerActions.setStopPeerScreenSharingInProgress(peerId, false));
+	}
+
 	async muteAllPeers()
 	{
 		logger.debug('muteAllPeers()');
@@ -2608,7 +2628,6 @@ export default class RoomClient
 					case 'moderator:stopVideo':
 					{
 						this.disableWebcam();
-						this.disableScreenSharing();
 
 						store.dispatch(requestActions.notify(
 							{
@@ -2621,6 +2640,21 @@ export default class RoomClient
 						break;
 					}
 
+					case 'moderator:stopScreenSharing':
+					{
+						this.disableScreenSharing();
+
+						store.dispatch(requestActions.notify(
+							{
+								text : intl.formatMessage({
+									id             : 'moderator.muteScreenSharingModerator',
+									defaultMessage : 'Moderator stopped your screen sharing'
+								})
+							}));
+
+						break;
+					}
+
 					case 'moderator:kick':
 					{
 						// Need some feedback
diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index 5672b47..8a67371 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -86,3 +86,10 @@ export const setStopPeerVideoInProgress = (peerId, flag) =>
 		type    : 'STOP_PEER_VIDEO_IN_PROGRESS',
 		payload : { peerId, flag }
 	});
+	
+export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
+({
+	type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
+	payload : { peerId, flag }
+});
+
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
index 0ca5d89..5d11998 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
@@ -306,6 +306,33 @@ const ListPeer = (props) =>
 					</IconButton>
 				</Tooltip>
 			}
+			{ isModerator && screenConsumer && 
+				<Tooltip
+					title={intl.formatMessage({
+						id             : 'tooltip.muteScreenSharing',
+						defaultMessage : 'Mute participant screen share globally'
+					})}
+					placement='bottom'
+				>
+					<IconButton
+						className={classes.buttons}
+						style={{ color: green[500] }}
+						disabled={!isModerator || peer.stopPeerScreenSharingInProgress}
+						onClick={(e) =>
+						{
+							e.stopPropagation();
+
+							roomClient.stopPeerScreenSharing(peer.id);
+						}}
+					>
+						{ !screenConsumer.remotelyPaused ?
+							<ScreenIcon />
+							:
+							<ScreenOffIcon />
+						}
+					</IconButton>
+				</Tooltip>
+			}
 			{children}
 		</div>
 	);
diff --git a/app/src/reducers/peers.js b/app/src/reducers/peers.js
index 32d6fef..8e6a7f7 100644
--- a/app/src/reducers/peers.js
+++ b/app/src/reducers/peers.js
@@ -82,6 +82,11 @@ const peer = (state = initialState, action) =>
 				stopPeerVideoInProgress : action.payload.flag
 			};
 
+		case 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS':
+			return {
+				...state,
+				stopPeerScreenSharingInProgress : action.payload.flag
+			};
 		default:
 			return state;
 	}
@@ -118,6 +123,7 @@ const peers = (state = initialState, action) =>
 		case 'REMOVE_PEER_ROLE':
 		case 'STOP_PEER_AUDIO_IN_PROGRESS':
 		case 'STOP_PEER_VIDEO_IN_PROGRESS':
+		case 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS':
 		{
 			const oldPeer = state[action.payload.peerId];
 
diff --git a/app/src/translations/en.json b/app/src/translations/en.json
index ec6c612..1c9fdb2 100644
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@@ -187,5 +187,6 @@
 	"moderator.clearChat": "Moderator cleared the chat",
 	"moderator.clearFiles": "Moderator cleared the files",
 	"moderator.muteAudio": "Moderator muted your audio",
-	"moderator.muteVideo": "Moderator muted your video"
+	"moderator.muteVideo": "Moderator muted your video",
+	"moderator.muteScreenSharing": "Moderator muted your screen sharing"
 }
diff --git a/server/lib/Room.js b/server/lib/Room.js
index 74accc4..0610ffe 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -1441,6 +1441,25 @@ class Room extends EventEmitter
 				break;
 			}
 
+			case 'moderator:stopScreenSharing':
+			{
+				if (!this._hasPermission(peer, MODERATE_ROOM))
+					throw new Error('peer not authorized');
+
+				const { peerId } = request.data;
+
+				const stopVideoPeer = this._peers[peerId];
+
+				if (!stopVideoPeer)
+					throw new Error(`peer with id "${peerId}" not found`);
+
+				this._notification(stopVideoPeer.socket, 'moderator:stopScreenSharing');
+
+				cb();
+
+				break;
+			}
+
 			case 'moderator:closeMeeting':
 			{
 				if (!this._hasPermission(peer, MODERATE_ROOM))

From e1f5f804b0882dc3c46556ca736f007186baa964 Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Tue, 12 May 2020 19:31:51 +0200
Subject: [PATCH 07/11] Lint fix

---
 app/src/actions/peerActions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index 8a67371..b40d486 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -88,8 +88,8 @@ export const setStopPeerVideoInProgress = (peerId, flag) =>
 	});
 	
 export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
-({
-	type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
-	payload : { peerId, flag }
-});
+	({
+		type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
+		payload : { peerId, flag }
+	});
 

From 13c38cecfd569a0d113b09d762659f0a45973043 Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Wed, 13 May 2020 10:42:03 +0200
Subject: [PATCH 08/11] Moderator: Mute all screen sharing

---
 app/src/RoomClient.js                         | 20 +++++++++++++++++++
 app/src/actions/roomActions.js                |  6 ++++++
 .../ParticipantList/ListModerator.js          | 16 +++++++++++++++
 .../MeetingDrawer/ParticipantList/ListPeer.js |  2 +-
 app/src/reducers/room.js                      |  3 +++
 server/lib/Room.js                            | 13 ++++++++++++
 6 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index ccd9d6e..a936a14 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -1508,6 +1508,26 @@ export default class RoomClient
 			roomActions.setStopAllVideoInProgress(false));
 	}
 
+	async stopAllPeerScreenSharing()
+	{
+		logger.debug('stopAllPeerScreenSharing()');
+
+		store.dispatch(
+			roomActions.setStopAllScreenSharingInProgress(true));
+
+		try
+		{
+			await this.sendRequest('moderator:stopAllScreenSharing');
+		}
+		catch (error)
+		{
+			logger.error('stopAllPeerScreenSharing() failed: %o', error);
+		}
+
+		store.dispatch(
+			roomActions.setStopAllScreenSharingInProgress(false));
+	}
+
 	async closeMeeting()
 	{
 		logger.debug('closeMeeting()');
diff --git a/app/src/actions/roomActions.js b/app/src/actions/roomActions.js
index 5ae45e3..a73e18a 100644
--- a/app/src/actions/roomActions.js
+++ b/app/src/actions/roomActions.js
@@ -164,6 +164,12 @@ export const setStopAllVideoInProgress = (flag) =>
 		payload : { flag }
 	});
 
+export const setStopAllScreenSharingInProgress = (flag) =>
+	({
+		type    : 'STOP_ALL_SCREEN_SHARING_IN_PROGRESS',
+		payload : { flag }
+	});
+
 export const setCloseMeetingInProgress = (flag) =>
 	({
 		type    : 'CLOSE_MEETING_IN_PROGRESS',
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js b/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js
index c10506a..2fff283 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListModerator.js
@@ -63,6 +63,22 @@ const ListModerator = (props) =>
 				/>
 			</Button>
 			<div className={classes.divider} />
+			<Button
+				aria-label={intl.formatMessage({
+					id             : 'room.stopAllScreenSharing',
+					defaultMessage : 'Stop all screen sharing'
+				})}
+				variant='contained'
+				color='secondary'
+				disabled={room.stopAllScreenSharingInProgress}
+				onClick={() => roomClient.stopAllPeerScreenSharing()}
+			>
+				<FormattedMessage
+					id='room.stopAllScreenSharing'
+					defaultMessage='Stop all screen sharing'
+				/>
+			</Button>
+			<div className={classes.divider} />
 			<Button
 				aria-label={intl.formatMessage({
 					id             : 'room.closeMeeting',
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
index 5d11998..697a43b 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
@@ -309,7 +309,7 @@ const ListPeer = (props) =>
 			{ isModerator && screenConsumer && 
 				<Tooltip
 					title={intl.formatMessage({
-						id             : 'tooltip.muteScreenSharing',
+						id             : 'tooltip.muteScreenSharingModerator',
 						defaultMessage : 'Mute participant screen share globally'
 					})}
 					placement='bottom'
diff --git a/app/src/reducers/room.js b/app/src/reducers/room.js
index d784219..193e8e0 100644
--- a/app/src/reducers/room.js
+++ b/app/src/reducers/room.js
@@ -226,6 +226,9 @@ const room = (state = initialState, action) =>
 		case 'STOP_ALL_VIDEO_IN_PROGRESS':
 			return { ...state, stopAllVideoInProgress: action.payload.flag };
 
+		case 'STOP_ALL_SCREEN_SHARING_IN_PROGRESS':
+			return { ...state, stopAllScreenSharingInProgress: action.payload.flag };
+
 		case 'CLOSE_MEETING_IN_PROGRESS':
 			return { ...state, closeMeetingInProgress: action.payload.flag };
 
diff --git a/server/lib/Room.js b/server/lib/Room.js
index 0610ffe..f110327 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -1441,6 +1441,19 @@ class Room extends EventEmitter
 				break;
 			}
 
+			case 'moderator:stopAllScreenSharing':
+			{
+				if (!this._hasPermission(peer, MODERATE_ROOM))
+					throw new Error('peer not authorized');
+
+				// Spread to others
+				this._notification(peer.socket, 'moderator:stopScreenSharing', null, true);
+
+				cb();
+
+				break;
+			}
+
 			case 'moderator:stopScreenSharing':
 			{
 				if (!this._hasPermission(peer, MODERATE_ROOM))

From 3a62abb7c3f1ac332f031a4e47a184ecdf8cf60e Mon Sep 17 00:00:00 2001
From: Luca <laky1694@gmail.com>
Date: Tue, 12 May 2020 19:04:41 +0200
Subject: [PATCH 09/11] Moderator: disable screen sharing

---
 app/src/actions/peerActions.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index b40d486..c390f06 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -92,4 +92,3 @@ export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
 		type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
 		payload : { peerId, flag }
 	});
-

From 2877ff2981d2935d248b08cf41e5b2d4b8f3a996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@majd.eu>
Date: Mon, 18 May 2020 11:30:23 +0200
Subject: [PATCH 10/11] Remove end of line spaces

---
 app/src/actions/peerActions.js                               | 2 +-
 app/src/components/MeetingDrawer/ParticipantList/ListPeer.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js
index c390f06..1a1e2d3 100644
--- a/app/src/actions/peerActions.js
+++ b/app/src/actions/peerActions.js
@@ -86,7 +86,7 @@ export const setStopPeerVideoInProgress = (peerId, flag) =>
 		type    : 'STOP_PEER_VIDEO_IN_PROGRESS',
 		payload : { peerId, flag }
 	});
-	
+
 export const setStopPeerScreenSharingInProgress = (peerId, flag) =>
 	({
 		type    : 'STOP_PEER_SCREEN_SHARING_IN_PROGRESS',
diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
index 697a43b..b11f631 100644
--- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
+++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
@@ -306,7 +306,7 @@ const ListPeer = (props) =>
 					</IconButton>
 				</Tooltip>
 			}
-			{ isModerator && screenConsumer && 
+			{ isModerator && screenConsumer &&
 				<Tooltip
 					title={intl.formatMessage({
 						id             : 'tooltip.muteScreenSharingModerator',

From 4ab7d7c95d63ba64d55a19e2d09de6e7ae2f66a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@majd.eu>
Date: Mon, 18 May 2020 13:41:32 +0200
Subject: [PATCH 11/11] Fix and add missing translations

---
 app/src/translations/cn.json | 4 +++-
 app/src/translations/cs.json | 6 ++++--
 app/src/translations/de.json | 4 +++-
 app/src/translations/dk.json | 4 +++-
 app/src/translations/el.json | 4 +++-
 app/src/translations/en.json | 3 ++-
 app/src/translations/es.json | 4 +++-
 app/src/translations/fr.json | 4 +++-
 app/src/translations/hr.json | 4 +++-
 app/src/translations/hu.json | 6 ++++--
 app/src/translations/it.json | 6 ++++--
 app/src/translations/lv.json | 4 +++-
 app/src/translations/nb.json | 4 +++-
 app/src/translations/pl.json | 4 +++-
 app/src/translations/pt.json | 4 +++-
 app/src/translations/ro.json | 4 +++-
 app/src/translations/tr.json | 4 +++-
 app/src/translations/tw.json | 6 ++++--
 app/src/translations/uk.json | 6 ++++--
 19 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/app/src/translations/cn.json b/app/src/translations/cn.json
index 2e4338c..c5f79e4 100644
--- a/app/src/translations/cn.json
+++ b/app/src/translations/cn.json
@@ -88,6 +88,7 @@
 	"tooltip.muteParticipantAudioModerator": null,
 	"tooltip.muteParticipantVideoModerator": null,
 	"tooltip.muteScreenSharingModerator": null,
+	"room.stopAllScreenSharing": null,
 
 	"label.roomName": "房间名称",
 	"label.chooseRoomButton": "继续",
@@ -187,5 +188,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
 }
\ No newline at end of file
diff --git a/app/src/translations/cs.json b/app/src/translations/cs.json
index b76dc3b..c1ea569 100644
--- a/app/src/translations/cs.json
+++ b/app/src/translations/cs.json
@@ -63,6 +63,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -186,5 +187,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
-}
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
+}
\ No newline at end of file
diff --git a/app/src/translations/de.json b/app/src/translations/de.json
index e0cf1da..9339d4f 100644
--- a/app/src/translations/de.json
+++ b/app/src/translations/de.json
@@ -64,6 +64,7 @@
 	"room.about": "Über",
 	"room.shortcutKeys": "Tastaturkürzel",
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": "Du bist stummgeschaltet. Halte die SPACE-Taste um zu sprechen",
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": "Moderator hat Chat gelöscht",
 	"moderator.clearFiles": "Moderator hat geteilte Dateiliste gelöscht",
 	"moderator.muteAudio": "Moderator hat dich stummgeschaltet",
-	"moderator.muteVideo": "Moderator hat dein Video gestoppt"
+	"moderator.muteVideo": "Moderator hat dein Video gestoppt",
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/dk.json b/app/src/translations/dk.json
index 0236280..edeb619 100644
--- a/app/src/translations/dk.json
+++ b/app/src/translations/dk.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/el.json b/app/src/translations/el.json
index 25df1a7..6807831 100644
--- a/app/src/translations/el.json
+++ b/app/src/translations/el.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
 }
\ No newline at end of file
diff --git a/app/src/translations/en.json b/app/src/translations/en.json
index 1c9fdb2..30c21d7 100644
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@@ -64,6 +64,7 @@
 	"room.about": "About",
 	"room.shortcutKeys": "Shortcut Keys",
 	"room.browsePeersSpotlight": "Browse participants into Spotlight",
+	"room.stopAllScreenSharing": "Stop all screen sharing",
 
 	"me.mutedPTT": "You are muted, hold down SPACE-BAR to talk",
 
@@ -189,4 +190,4 @@
 	"moderator.muteAudio": "Moderator muted your audio",
 	"moderator.muteVideo": "Moderator muted your video",
 	"moderator.muteScreenSharing": "Moderator muted your screen sharing"
-}
+}
\ No newline at end of file
diff --git a/app/src/translations/es.json b/app/src/translations/es.json
index 8075ff5..4e0c12a 100644
--- a/app/src/translations/es.json
+++ b/app/src/translations/es.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/fr.json b/app/src/translations/fr.json
index ea87e99..0f2ac0b 100644
--- a/app/src/translations/fr.json
+++ b/app/src/translations/fr.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -186,5 +187,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/hr.json b/app/src/translations/hr.json
index 1e9bce1..59873d4 100644
--- a/app/src/translations/hr.json
+++ b/app/src/translations/hr.json
@@ -64,6 +64,7 @@
 	"room.about": "O programu",
 	"room.shortcutKeys": "Prečaci",
 	"room.browsePeersSpotlight": "Pretražite sudionike u središtu pažnje",
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": "Utišani ste, pritisnite i držite SPACE tipku za razgovor",
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": "Moderator je izbrisao razgovor",
 	"moderator.clearFiles": "Moderator je izbrisao datoteke",
 	"moderator.muteAudio": "Moderator je utišao tvoj zvuk",
-	"moderator.muteVideo": "Moderator je zaustavio tvoj video"
+	"moderator.muteVideo": "Moderator je zaustavio tvoj video",
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/hu.json b/app/src/translations/hu.json
index 58d485a..d525aff 100644
--- a/app/src/translations/hu.json
+++ b/app/src/translations/hu.json
@@ -63,7 +63,8 @@
 	"room.help": "Segítség",
 	"room.about": "Névjegy",
 	"room.shortcutKeys": "Billentyűparancsok",
-	"room.browsePeersSpotlight": null,
+	"room.browsePeersSpotlight": "Résztvevők böngészése",
+	"room.stopAllScreenSharing": "Minden képernyőmegosztás leállítása",
 
 	"me.mutedPTT": "Némítva vagy, ha beszélnél nyomd le a szóköz billentyűt",
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": "A moderátor kiürítette a chat történelmet",
 	"moderator.clearFiles": "A moderátor kiürítette a file megosztás történelmet",
 	"moderator.muteAudio": "A moderátor elnémította a hangod",
-	"moderator.muteVideo": "A moderátor elnémította a videód"
+	"moderator.muteVideo": "A moderátor elnémította a videód",
+	"moderator.muteScreenSharing": "A moderátor leállította képernyőmegosztásod"
 }
diff --git a/app/src/translations/it.json b/app/src/translations/it.json
index 243eaca..02b53e7 100644
--- a/app/src/translations/it.json
+++ b/app/src/translations/it.json
@@ -64,7 +64,8 @@
 	"room.about": "Informazioni su",
 	"room.shortcutKeys": "Scorciatoie da tastiera",
 	"room.browsePeersSpotlight": null,
-
+	"room.stopAllScreenSharing": null,
+	
 	"me.mutedPTT": "Sei mutato, tieni premuto SPAZIO per parlare",
 
 	"roles.gotRole": "Hai ottenuto il ruolo: {role}",
@@ -187,5 +188,6 @@
 	"moderator.clearChat": "Il moderatore ha pulito la chat",
 	"moderator.clearFiles": "Il moderatore ha pulito i file",
 	"moderator.muteAudio": "Il moderatore ha mutato il tuo audio",
-	"moderator.muteVideo": "Il moderatore ha fermato il tuo video"
+	"moderator.muteVideo": "Il moderatore ha fermato il tuo video",
+	"moderator.muteScreenSharing": null
 }
\ No newline at end of file
diff --git a/app/src/translations/lv.json b/app/src/translations/lv.json
index 824e26b..62ee61e 100644
--- a/app/src/translations/lv.json
+++ b/app/src/translations/lv.json
@@ -63,6 +63,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": "Jūs esat noklusināts. Turiet taustiņu SPACE-BAR, lai runātu",
 
@@ -181,5 +182,6 @@
 	"moderator.clearChat": "Moderators nodzēsa tērziņus",
 	"moderator.clearFiles": "Moderators notīrīja failus",
 	"moderator.muteAudio": "Moderators noklusināja jūsu mikrofonu",
-	"moderator.muteVideo": "Moderators atslēdza jūsu kameru"
+	"moderator.muteVideo": "Moderators atslēdza jūsu kameru",
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/nb.json b/app/src/translations/nb.json
index 10f387a..5bafeb6 100644
--- a/app/src/translations/nb.json
+++ b/app/src/translations/nb.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": "Du er dempet, hold nede SPACE for å snakke",
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": "Moderator tømte chatten",
 	"moderator.clearFiles": "Moderator fjernet filer",
 	"moderator.muteAudio": "Moderator mutet lyden din",
-	"moderator.muteVideo": "Moderator mutet videoen din"
+	"moderator.muteVideo": "Moderator mutet videoen din",
+	"moderator.muteScreenSharing": null	
 }
\ No newline at end of file
diff --git a/app/src/translations/pl.json b/app/src/translations/pl.json
index 948a62d..7612f99 100644
--- a/app/src/translations/pl.json
+++ b/app/src/translations/pl.json
@@ -64,6 +64,7 @@
 	"room.about": "O pogramie",
 	"room.shortcutKeys": "Skróty klawiaturowe",
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": "Masz wyciszony mikrofon, przytrzymaj spację aby mówić",
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": "Moderator wyczyścił chat",
 	"moderator.clearFiles": "Moderator wyczyścił pliki",
 	"moderator.muteAudio": "Moderator wyciszył audio",
-	"moderator.muteVideo": "Moderator wyciszył twoje video"
+	"moderator.muteVideo": "Moderator wyciszył twoje video",
+	"moderator.muteScreenSharing": null
 }
\ No newline at end of file
diff --git a/app/src/translations/pt.json b/app/src/translations/pt.json
index b354e65..a2a3310 100644
--- a/app/src/translations/pt.json
+++ b/app/src/translations/pt.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/ro.json b/app/src/translations/ro.json
index d718998..7161bd4 100644
--- a/app/src/translations/ro.json
+++ b/app/src/translations/ro.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/tr.json b/app/src/translations/tr.json
index 8647707..1876bab 100644
--- a/app/src/translations/tr.json
+++ b/app/src/translations/tr.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -179,5 +180,6 @@
 	"devices.screenSharingError": "Ekranınıza erişilirken bir hata oluştu",
 
 	"devices.cameraDisconnected": "Kamera bağlı değil",
-	"devices.cameraError": "Kameranıza erişilirken bir hata oluştu"
+	"devices.cameraError": "Kameranıza erişilirken bir hata oluştu",
+	"moderator.muteScreenSharing": null
 }
diff --git a/app/src/translations/tw.json b/app/src/translations/tw.json
index 83f0c02..99c32d7 100644
--- a/app/src/translations/tw.json
+++ b/app/src/translations/tw.json
@@ -63,7 +63,8 @@
 	"room.help": "幫助",
 	"room.about": "關於",
 	"room.shortcutKeys": "鍵盤快速鍵",
-	
+	"room.stopAllScreenSharing": null,
+
 	"me.mutedPTT": "您已靜音，請按下 空白鍵 來說話",
 
 	"roles.gotRole": "您已取得身份: {role}",
@@ -186,5 +187,6 @@
 	"moderator.clearChat": "管理員清除了聊天",
 	"moderator.clearFiles": "管理員清除了所有檔案",
 	"moderator.muteAudio": "您已被管理員靜音",
-	"moderator.muteVideo": "您的視訊已被管理員關閉"
+	"moderator.muteVideo": "您的視訊已被管理員關閉",
+	"moderator.muteScreenSharing": null
 }
\ No newline at end of file
diff --git a/app/src/translations/uk.json b/app/src/translations/uk.json
index dce9425..2ee6774 100644
--- a/app/src/translations/uk.json
+++ b/app/src/translations/uk.json
@@ -64,6 +64,7 @@
 	"room.about": null,
 	"room.shortcutKeys": null,
 	"room.browsePeersSpotlight": null,
+	"room.stopAllScreenSharing": null,
 
 	"me.mutedPTT": null,
 
@@ -187,5 +188,6 @@
 	"moderator.clearChat": null,
 	"moderator.clearFiles": null,
 	"moderator.muteAudio": null,
-	"moderator.muteVideo": null
-} 
\ No newline at end of file
+	"moderator.muteVideo": null,
+	"moderator.muteScreenSharing": null
+}
\ No newline at end of file