diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx
index 37cd342d198d4683a0d8d0df79687a9142942b82..3602f33a625a184b04068b8f11fbb8c8d49c2d0f 100644
--- a/bigbluebutton-html5/imports/startup/client/intl.jsx
+++ b/bigbluebutton-html5/imports/startup/client/intl.jsx
@@ -34,7 +34,7 @@ class IntlStartup extends Component {
   componentWillUpdate(nextProps) {
     if (!this.state.fetching
       && this.state.normalizedLocale
-      && nextProps.locale !== this.state.normalizedLocale) {
+      && nextProps.locale.toLowerCase() !== this.state.normalizedLocale.toLowerCase()) {
       this.fetchLocalizedMessages(nextProps.locale);
     }
   }
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
index 2ea198e23dbd45a708a44d53120e409a42fe2bcf..a8775055adc6242857ab8784d264f285e9f7f9df 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
@@ -117,14 +117,6 @@ class ApplicationMenu extends BaseMenu {
     this.handleUpdateSettings('application', obj.settings);
   }
 
-  // Adjust the locale format to be able to display the locale names properly in the client
-  formatLocale(locale) {
-    return locale
-      .split('-')
-      .map((val, idx) => (idx == 1 ? val.toUpperCase() : val))
-      .join('_');
-  }
-
   render() {
     const { availableLocales, intl } = this.props;
     const { isLargestFontSize, isSmallestFontSize } = this.state;
diff --git a/bigbluebutton-html5/private/locales/de.json b/bigbluebutton-html5/private/locales/de.json
index b7a1218f7a8fc4b0048404bee047a55b71c0b755..294b61f0f2aea2f22298ce0d88b48d1aa510b362 100644
--- a/bigbluebutton-html5/private/locales/de.json
+++ b/bigbluebutton-html5/private/locales/de.json
@@ -97,6 +97,8 @@
     "app.navBar.settingsDropdown.exitFullscreenDesc": "Vollbildmodus beenden",
     "app.navBar.settingsDropdown.hotkeysLabel": "Tastaturkürzel",
     "app.navBar.settingsDropdown.hotkeysDesc": "Liste verfügbarer Tastaturkürzel",
+    "app.navBar.settingsDropdown.helpLabel": "Hilfe",
+    "app.navBar.settingsDropdown.helpDesc": "Verlinkt zu den Videoanleitungen",
     "app.navBar.userListToggleBtnLabel": "Teilnehmerliste umschalten",
     "app.navBar.toggleUserList.ariaLabel": "Teilnehmer/Nachrichten-Umschalter",
     "app.navBar.toggleUserList.newMessages": "mit Benachrichtigung für neue Nachrichten",
@@ -126,8 +128,8 @@
     "app.actionsBar.raiseLabel": "Hand heben",
     "app.actionsBar.label": "Aktionsleiste",
     "app.submenu.application.applicationSectionTitle": "Anwendung",
-    "app.submenu.application.audioNotifyLabel": "Audiobenachrichtigungen für Chat",
-    "app.submenu.application.pushNotifyLabel": "Push-Benachrichtigungen für Chat",
+    "app.submenu.application.audioAlertLabel": "Audiowarnungen für Chat",
+    "app.submenu.application.pushAlertLabel": "Popupwarnungen für Chat",
     "app.submenu.application.fontSizeControlLabel": "Schriftgröße",
     "app.submenu.application.increaseFontBtnLabel": "Schriftgröße erhöhen",
     "app.submenu.application.decreaseFontBtnLabel": "Schriftgröße verringern",
@@ -320,6 +322,7 @@
     "app.video.joinVideo": "Webcam freigeben",
     "app.video.leaveVideo": "Webcam stoppen",
     "app.video.iceCandidateError": "Fehler beim Hinzufügen vom ice candidate",
+    "app.video.iceConnectionStateError": "Fehler 1107: ICE Ãœbertragung fehlgeschlagen",
     "app.video.permissionError": "Fehler bei Freigabe der Webcam. Bitte Berechtigungen prüfen",
     "app.video.sharingError": "Fehler bei Freigabe der Webcam",
     "app.video.notFoundError": "Konnte keine Webcam finden. Stellen Sie sicher, dass sie angeschlossen ist",
diff --git a/bigbluebutton-html5/private/locales/es_ES.json b/bigbluebutton-html5/private/locales/es_ES.json
index 65b630baf85c8892ab5786d947ad49df704b28c6..91c9a9370cbee1044dae7d52077bc0522103aba8 100644
--- a/bigbluebutton-html5/private/locales/es_ES.json
+++ b/bigbluebutton-html5/private/locales/es_ES.json
@@ -84,8 +84,6 @@
     "app.actionsBar.raiseLabel": "Alzar",
     "app.actionsBar.label": "Barra de acciones",
     "app.submenu.application.applicationSectionTitle": "Aplicación",
-    "app.submenu.application.audioNotifyLabel": "Notificación de audio para el chat",
-    "app.submenu.application.pushNotifyLabel": "Empujar notificaciones para el chat",
     "app.submenu.application.fontSizeControlLabel": "Tamaño de fuente",
     "app.submenu.application.increaseFontBtnLabel": "Incrementar tamaño de fuente",
     "app.submenu.application.decreaseFontBtnLabel": "Reducir tamaño de fuente",
diff --git a/bigbluebutton-html5/private/locales/fa_IR.json b/bigbluebutton-html5/private/locales/fa_IR.json
index 047323fec22b8469a943103ad65f540b15f545a5..4136ce2d4c1f7786e942c26c490eaaa35b9d6b2f 100644
--- a/bigbluebutton-html5/private/locales/fa_IR.json
+++ b/bigbluebutton-html5/private/locales/fa_IR.json
@@ -126,8 +126,6 @@
     "app.actionsBar.raiseLabel": "اجازه گرفتن از استاد",
     "app.actionsBar.label": "منوی امکانات",
     "app.submenu.application.applicationSectionTitle": "نرم افزار",
-    "app.submenu.application.audioNotifyLabel": "گزینه های صوتی برای گفتگو",
-    "app.submenu.application.pushNotifyLabel": "نوتیفیکیشن چت",
     "app.submenu.application.fontSizeControlLabel": "اندازه متن",
     "app.submenu.application.increaseFontBtnLabel": "افزایش اندازه متن نرم افزار",
     "app.submenu.application.decreaseFontBtnLabel": "کاهش اندازه متن نرم افزار",
@@ -200,7 +198,6 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "توقف اشتراک گذاری تصویر کامپیوتر شما با دیگران",
     "app.actionsBar.actionsDropdown.startRecording": "شروع ضبط کلاس",
     "app.actionsBar.actionsDropdown.stopRecording": "توقف ضبط کلاس",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "تنظیم حالت شما",
     "app.actionsBar.emojiMenu.awayLabel": "عدم حضور در کلاس",
     "app.actionsBar.emojiMenu.awayDesc": "تغییر وضعیت شما به عدم حضور در کلاس",
     "app.actionsBar.emojiMenu.raiseHandLabel": "اجازه گرفتن از استاد",
diff --git a/bigbluebutton-html5/private/locales/fr.json b/bigbluebutton-html5/private/locales/fr.json
index 4196a593edb919614bd90a8378f8adeac91a645f..3503d3841a9c160890ce2e32322bc50a7e5150f2 100644
--- a/bigbluebutton-html5/private/locales/fr.json
+++ b/bigbluebutton-html5/private/locales/fr.json
@@ -126,8 +126,6 @@
     "app.actionsBar.raiseLabel": "Lever la main",
     "app.actionsBar.label": "Barre d'actions",
     "app.submenu.application.applicationSectionTitle": "Application",
-    "app.submenu.application.audioNotifyLabel": "Notifications audio pour la discussion",
-    "app.submenu.application.pushNotifyLabel": "Pousser les notifications de la discussion",
     "app.submenu.application.fontSizeControlLabel": "Taille des caractères",
     "app.submenu.application.increaseFontBtnLabel": "Augmenter la Taille de la Police",
     "app.submenu.application.decreaseFontBtnLabel": "Diminuer la Taille de la Police",
@@ -200,7 +198,6 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Cesser de partager votre écran avec",
     "app.actionsBar.actionsDropdown.startRecording": "Commencer à enregistrer",
     "app.actionsBar.actionsDropdown.stopRecording": "Arrêter d'enregistrer",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Définir un statut",
     "app.actionsBar.emojiMenu.awayLabel": "Éloigné",
     "app.actionsBar.emojiMenu.awayDesc": "Passer votre état à éloigné",
     "app.actionsBar.emojiMenu.raiseHandLabel": "Lever la main",
diff --git a/bigbluebutton-html5/private/locales/id.json b/bigbluebutton-html5/private/locales/id.json
index 427b46af95449f39fe9cf5d5ed5185c71e55070a..d2a85c265e5a1293f6b0b15f25aca6774b804448 100644
--- a/bigbluebutton-html5/private/locales/id.json
+++ b/bigbluebutton-html5/private/locales/id.json
@@ -96,8 +96,6 @@
     "app.actionsBar.camOffLabel": "Kamera Off",
     "app.actionsBar.raiseLabel": "Naikan",
     "app.submenu.application.applicationSectionTitle": "Aplikasi",
-    "app.submenu.application.audioNotifyLabel": "Notifikasi audio untuk Chat",
-    "app.submenu.application.pushNotifyLabel": "Notifikasi otomatis untuk Chat",
     "app.submenu.application.fontSizeControlLabel": "Ukuran Huruf",
     "app.submenu.application.increaseFontBtnLabel": "Besarkan Ukuran Huruf Aplikasi",
     "app.submenu.application.decreaseFontBtnLabel": "Kecilkan Ukuran Huruf Aplikasi",
diff --git a/bigbluebutton-html5/private/locales/ja.json b/bigbluebutton-html5/private/locales/ja.json
index b41d221c4782ac544d425cc37c94b3cb20e64783..43a6025d427cb8894d0846379fd0f62aee6aac6f 100644
--- a/bigbluebutton-html5/private/locales/ja.json
+++ b/bigbluebutton-html5/private/locales/ja.json
@@ -122,8 +122,6 @@
     "app.actionsBar.raiseLabel": "手をあげる",
     "app.actionsBar.label": "アクションメニュー",
     "app.submenu.application.applicationSectionTitle": "アプリケーション",
-    "app.submenu.application.audioNotifyLabel": "チャットの音声通知",
-    "app.submenu.application.pushNotifyLabel": "チャットのプッシュ通知",
     "app.submenu.application.fontSizeControlLabel": "フォントサイズ",
     "app.submenu.application.increaseFontBtnLabel": "アプリケーションのフォントサイズを大きくする",
     "app.submenu.application.decreaseFontBtnLabel": "アプリケーションのフォントサイズを小さくする",
@@ -196,7 +194,6 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "との画面共有を止める",
     "app.actionsBar.actionsDropdown.startRecording": "録画開始",
     "app.actionsBar.actionsDropdown.stopRecording": "録画停止",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "ステータスを設定する",
     "app.actionsBar.emojiMenu.awayLabel": "不在",
     "app.actionsBar.emojiMenu.awayDesc": "スタータスを「不在」にする",
     "app.actionsBar.emojiMenu.raiseHandLabel": "挙手",
diff --git a/bigbluebutton-html5/private/locales/ja_JP.json b/bigbluebutton-html5/private/locales/ja_JP.json
index b41d221c4782ac544d425cc37c94b3cb20e64783..43a6025d427cb8894d0846379fd0f62aee6aac6f 100644
--- a/bigbluebutton-html5/private/locales/ja_JP.json
+++ b/bigbluebutton-html5/private/locales/ja_JP.json
@@ -122,8 +122,6 @@
     "app.actionsBar.raiseLabel": "手をあげる",
     "app.actionsBar.label": "アクションメニュー",
     "app.submenu.application.applicationSectionTitle": "アプリケーション",
-    "app.submenu.application.audioNotifyLabel": "チャットの音声通知",
-    "app.submenu.application.pushNotifyLabel": "チャットのプッシュ通知",
     "app.submenu.application.fontSizeControlLabel": "フォントサイズ",
     "app.submenu.application.increaseFontBtnLabel": "アプリケーションのフォントサイズを大きくする",
     "app.submenu.application.decreaseFontBtnLabel": "アプリケーションのフォントサイズを小さくする",
@@ -196,7 +194,6 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "との画面共有を止める",
     "app.actionsBar.actionsDropdown.startRecording": "録画開始",
     "app.actionsBar.actionsDropdown.stopRecording": "録画停止",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "ステータスを設定する",
     "app.actionsBar.emojiMenu.awayLabel": "不在",
     "app.actionsBar.emojiMenu.awayDesc": "スタータスを「不在」にする",
     "app.actionsBar.emojiMenu.raiseHandLabel": "挙手",
diff --git a/bigbluebutton-html5/private/locales/km.json b/bigbluebutton-html5/private/locales/km.json
index 1aa8193acc51ac6578402f06b5eaf3517910aa26..3239abcaa143d599a0c35c8c96404518e403fadd 100644
--- a/bigbluebutton-html5/private/locales/km.json
+++ b/bigbluebutton-html5/private/locales/km.json
@@ -86,8 +86,6 @@
     "app.actionsBar.raiseLabel": "លើកដៃ",
     "app.actionsBar.label": "របារ​សកម្មភាព",
     "app.submenu.application.applicationSectionTitle": "កម្មវិធី",
-    "app.submenu.application.audioNotifyLabel": "ការ​ជូន​ដំណឹង​ជា​សម្លេង​សម្រាប់​ការ​ជជែក",
-    "app.submenu.application.pushNotifyLabel": "ការ​ជូន​ដំណឹង​ដែល​លេច​ឡើង​សម្រាប់​ការ​ជជែក",
     "app.submenu.application.fontSizeControlLabel": "ទំហំ​អក្សរ​",
     "app.submenu.application.increaseFontBtnLabel": "បង្កើន​ទំហំ​អក្សរ​ក្នុង​កម្មវិធី",
     "app.submenu.application.decreaseFontBtnLabel": "បន្ថយ​ទំហំ​អក្សរ​ក្នុង​កម្មវិធី",
diff --git a/bigbluebutton-html5/private/locales/pt_BR.json b/bigbluebutton-html5/private/locales/pt_BR.json
index 4b152d27499e37033569eca16871dc55676f6523..ae8ae20035844c8ea05a64214e30b355c116aa8b 100644
--- a/bigbluebutton-html5/private/locales/pt_BR.json
+++ b/bigbluebutton-html5/private/locales/pt_BR.json
@@ -59,7 +59,7 @@
     "app.presentation.presentationToolbar.zoomDesc": "Alterar o nível de zoom da apresentação",
     "app.presentation.presentationToolbar.goToSlide": "Slide {0}",
     "app.presentationUploder.title": "Apresentação",
-    "app.presentationUploder.message": "Como apresentador no BigBlueButton, você tem a capacidade de carregar qualquer documento do Office ou arquivo PDF. Para melhores resultados, recomendamos que se carregue arquivos em PDF.",
+    "app.presentationUploder.message": "Como apresentador, você tem a capacidade de carregar qualquer documento do Office ou arquivo PDF. Para melhores resultados, recomendamos que se carregue arquivos em PDF.",
     "app.presentationUploder.confirmLabel": "Iniciar",
     "app.presentationUploder.confirmDesc": "Salve as alterações e inicie a apresentação",
     "app.presentationUploder.dismissLabel": "Cancelar",
@@ -97,6 +97,8 @@
     "app.navBar.settingsDropdown.exitFullscreenDesc": "Sair do modo de tela cheia",
     "app.navBar.settingsDropdown.hotkeysLabel": "Atalhos de teclado",
     "app.navBar.settingsDropdown.hotkeysDesc": "Lista de atalhos disponíveis",
+    "app.navBar.settingsDropdown.helpLabel": "Ajuda",
+    "app.navBar.settingsDropdown.helpDesc": "Vídeo tutoriais",
     "app.navBar.userListToggleBtnLabel": "Alternar lista de usuários",
     "app.navBar.toggleUserList.ariaLabel": "Alternar Usuários e Mensagens",
     "app.navBar.toggleUserList.newMessages": "com notificação para novas mensagens",
@@ -126,8 +128,6 @@
     "app.actionsBar.raiseLabel": "Levantar a mão",
     "app.actionsBar.label": "Barra de ações",
     "app.submenu.application.applicationSectionTitle": "Aplicação",
-    "app.submenu.application.audioNotifyLabel": "Notificações de áudio para o bate-papo",
-    "app.submenu.application.pushNotifyLabel": "Notificações para o bate-papo",
     "app.submenu.application.fontSizeControlLabel": "Tamanho da fonte",
     "app.submenu.application.increaseFontBtnLabel": "Aumentar o tamanho da fonte da aplicação",
     "app.submenu.application.decreaseFontBtnLabel": "Diminuir o tamanho da fonte da aplicação",
@@ -262,7 +262,7 @@
     "app.audioModal.echoTestTitle": "Este é um teste privado de áudio. Fale algumas palavras. Você consegue ouvir sua voz?",
     "app.audioModal.settingsTitle": "Alterar as configurações de áudio",
     "app.audioModal.helpTitle": "Houve um problema com seus dispositivos de mídia",
-    "app.audioModal.helpText": "Você autorizou o BigBlueButton a acessar seu microfone? Observe que uma caixa de diálogo deve abrir assim que você tentar participar da conferência de áudio, pedindo as permissões de acesso aos dispositivos de mídia, por favor conceda essa permissão de acesso para participar da conferência. Se isso não funcionar, tente alterar a permissão do microfone nas configurações do seu navegador.",
+    "app.audioModal.helpText": "Você autorizou o acesso ao seu microfone? Observe que uma caixa de diálogo deve abrir assim que você tentar participar da conferência de áudio, pedindo as permissões de acesso aos dispositivos de mídia, por favor conceda essa permissão de acesso para participar da conferência. Se isso não funcionar, tente alterar a permissão do microfone nas configurações do seu navegador.",
     "app.audioModal.connecting": "Conectando",
     "app.audioModal.connectingEchoTest": "Conectando ao teste de áudio",
     "app.audioManager.joinedAudio": "Você se juntou à conferência de áudio",
diff --git a/bigbluebutton-html5/private/locales/ru_RU.json b/bigbluebutton-html5/private/locales/ru_RU.json
index ea7ce626272e42482d6518e0e6c472126a6c14ac..eb533f56578f899ec3bf12dd4c8e8abc170264e4 100644
--- a/bigbluebutton-html5/private/locales/ru_RU.json
+++ b/bigbluebutton-html5/private/locales/ru_RU.json
@@ -37,6 +37,8 @@
     "app.userList.menu.muteUserAudio.label": "Выключить микрофон пользователя",
     "app.userList.menu.unmuteUserAudio.label": "Включить микрофон пользователя",
     "app.userList.userAriaLabel": "{0} {1} {2}  Статус {3}",
+    "app.userList.menu.promoteUser.label": "Повысить до модератора",
+    "app.userList.menu.demoteUser.label": "Понизить до зрителя",
     "app.media.label": "Медиа",
     "app.media.screenshare.start": "Демонстрация экрана началась",
     "app.media.screenshare.end": "Демонстрация экрана закончилась",
@@ -95,6 +97,8 @@
     "app.navBar.settingsDropdown.exitFullscreenDesc": "Выйти из полноэкранного режима",
     "app.navBar.settingsDropdown.hotkeysLabel": "Быстрые клавиши",
     "app.navBar.settingsDropdown.hotkeysDesc": "Список доступных быстрых клавиш",
+    "app.navBar.settingsDropdown.helpLabel": "Помощь",
+    "app.navBar.settingsDropdown.helpDesc": "Ссылки на видеоуроки",
     "app.navBar.userListToggleBtnLabel": "Включить/выключить список пользователей",
     "app.navBar.toggleUserList.ariaLabel": "Включить/выключить Пользователей и Сообщения",
     "app.navBar.toggleUserList.newMessages": "с уведомлением о новых сообщениях",
@@ -124,8 +128,8 @@
     "app.actionsBar.raiseLabel": "Поднять",
     "app.actionsBar.label": "Панель действий",
     "app.submenu.application.applicationSectionTitle": "Приложение",
-    "app.submenu.application.audioNotifyLabel": "Звуковые уведомления чата",
-    "app.submenu.application.pushNotifyLabel": "Push-уведомления для чата",
+    "app.submenu.application.audioAlertLabel": "Звуковые оповещения для чата",
+    "app.submenu.application.pushAlertLabel": "Всплывающие оповещения для чата",
     "app.submenu.application.fontSizeControlLabel": "Размер шрифта",
     "app.submenu.application.increaseFontBtnLabel": "Увеличить шрифт приложения",
     "app.submenu.application.decreaseFontBtnLabel": "Уменьшить шрифт приложения",
@@ -234,12 +238,14 @@
     "app.audioNotification.audioFailedMessage": "Не удалось установить аудио-соединение",
     "app.audioNotification.mediaFailedMessage": "Ошибка getUserMicMedia, разрешены только безопасные источники",
     "app.audioNotification.closeLabel": "Закрыть",
+    "app.audioNotificaion.reconnectingAsListenOnly": "Микрофон доступен только модератору, вы будете присоединены в режиме прослушивания",
     "app.breakoutJoinConfirmation.title": "Присоединиться к комнате групповой работы",
     "app.breakoutJoinConfirmation.message": "Вы хотите присоединиться к ",
     "app.breakoutJoinConfirmation.confirmLabel": "Присоединиться",
     "app.breakoutJoinConfirmation.confirmDesc": "Присоединяет вас к конференции",
     "app.breakoutJoinConfirmation.dismissLabel": "Отмена",
     "app.breakoutJoinConfirmation.dismissDesc": "Закрывает и отклоняет присоединение к конференции",
+    "app.breakoutJoinConfirmation.freeJoinMessage": "Выберите конференцию, к которой хотите подключиться",
     "app.breakoutTimeRemainingMessage": "Оставшееся время конференции: {0}",
     "app.breakoutWillCloseMessage": "Время вышло. Комната групповой работы скоро закроется.",
     "app.calculatingBreakoutTimeRemaining": "Подсчёт оставшегося времени...",
diff --git a/bigbluebutton-html5/private/locales/tr_TR.json b/bigbluebutton-html5/private/locales/tr_TR.json
index 22b7b63ab73d68512b044fa655e5e83f3b728b57..42bd9a8ba97ecd2812193316ca898cdf7386d0fc 100644
--- a/bigbluebutton-html5/private/locales/tr_TR.json
+++ b/bigbluebutton-html5/private/locales/tr_TR.json
@@ -121,8 +121,6 @@
     "app.actionsBar.raiseLabel": "El Kaldır",
     "app.actionsBar.label": "Eylem Çubuğu",
     "app.submenu.application.applicationSectionTitle": "Uygulama",
-    "app.submenu.application.audioNotifyLabel": "Sohbet sesli bildirimleri",
-    "app.submenu.application.pushNotifyLabel": "Sohbet anlık bildirimleri",
     "app.submenu.application.fontSizeControlLabel": "Yazı büyüklüğü",
     "app.submenu.application.increaseFontBtnLabel": "Uygulama Yazı Büyüklüğünü Artır",
     "app.submenu.application.decreaseFontBtnLabel": "Uygulama Yazı Büyüklüğünü Azalt",
@@ -195,7 +193,6 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Ekran genişliği paylaşımını sonlandır",
     "app.actionsBar.actionsDropdown.startRecording": "Kaydı başlat",
     "app.actionsBar.actionsDropdown.stopRecording": "Kaydı durdur",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Durum Belirt",
     "app.actionsBar.emojiMenu.awayLabel": "Dışarıda",
     "app.actionsBar.emojiMenu.awayDesc": "Durumunu dışarıda yap",
     "app.actionsBar.emojiMenu.raiseHandLabel": "El Kaldır",
diff --git a/bigbluebutton-html5/private/locales/uk_UA.json b/bigbluebutton-html5/private/locales/uk_UA.json
index 51cafc940f77d74d0ab57a5ae42c898fb3badd14..c41d86330e8b62ef12bdde4c3aeac71a1bc444f5 100644
--- a/bigbluebutton-html5/private/locales/uk_UA.json
+++ b/bigbluebutton-html5/private/locales/uk_UA.json
@@ -124,8 +124,6 @@
     "app.actionsBar.raiseLabel": "Підняти",
     "app.actionsBar.label": "Панель дій",
     "app.submenu.application.applicationSectionTitle": "Застосунок",
-    "app.submenu.application.audioNotifyLabel": "Аудіо сповіщення чату",
-    "app.submenu.application.pushNotifyLabel": "Push-сповіщення для чату",
     "app.submenu.application.fontSizeControlLabel": "Розмір шрифту",
     "app.submenu.application.increaseFontBtnLabel": "Збільшити шрифт застосунку",
     "app.submenu.application.decreaseFontBtnLabel": "Зменшити шрифт застосунку",
@@ -198,7 +196,6 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Зупинити демонстрацію екрану",
     "app.actionsBar.actionsDropdown.startRecording": "Почати запис",
     "app.actionsBar.actionsDropdown.stopRecording": "Зупинити запис",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "Встановити статус",
     "app.actionsBar.emojiMenu.awayLabel": "Відійшов",
     "app.actionsBar.emojiMenu.awayDesc": "Змінює ваш статус на \"Відійшов\"",
     "app.actionsBar.emojiMenu.raiseHandLabel": "Підняти руку",
diff --git a/bigbluebutton-html5/private/locales/zh_CN.json b/bigbluebutton-html5/private/locales/zh_CN.json
index fe09c30e61f26995a3deb3e43786653e15a8f46d..339bc296fa9f15ff7da06c6c17d2d4d9c8950194 100644
--- a/bigbluebutton-html5/private/locales/zh_CN.json
+++ b/bigbluebutton-html5/private/locales/zh_CN.json
@@ -124,8 +124,6 @@
     "app.actionsBar.raiseLabel": "举手",
     "app.actionsBar.label": "操作栏",
     "app.submenu.application.applicationSectionTitle": "应用",
-    "app.submenu.application.audioNotifyLabel": "聊天声音提醒",
-    "app.submenu.application.pushNotifyLabel": "聊天推送提醒",
     "app.submenu.application.fontSizeControlLabel": "字号",
     "app.submenu.application.increaseFontBtnLabel": "增大界面字号",
     "app.submenu.application.decreaseFontBtnLabel": "减小界面字号",
@@ -198,7 +196,6 @@
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "停止分享您的桌面演示给",
     "app.actionsBar.actionsDropdown.startRecording": "开始录制",
     "app.actionsBar.actionsDropdown.stopRecording": "停止录制",
-    "app.actionsBar.emojiMenu.statusTriggerLabel": "设置状态",
     "app.actionsBar.emojiMenu.awayLabel": "离开",
     "app.actionsBar.emojiMenu.awayDesc": "更改您的状态为离开",
     "app.actionsBar.emojiMenu.raiseHandLabel": "举手",