diff --git a/i18n/de.json b/i18n/de.json
index c18908f83c..f1ecd14642 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -199,6 +199,10 @@
     "id": "api.channel.delete_channel.permissions.app_error",
     "translation": "Sie haben nicht die erforderichen Zugriffsrechte"
   },
+  {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
   {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "Die Anzahl der Channels konnte aus der Datenbank nicht ermittelt werden"
@@ -573,15 +577,15 @@
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+    "translation": "Das Emoji kann nicht erstellt werden. Ein anderes Emoji mit dem selben Namen existiert bereits."
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum file size."
+    "translation": "Das Emoji kann nicht erstellt werden. Das Bild überschreitet die zulässige maximale Dateigröße."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+    "translation": "Keine passenden Berechtigungen um das Emoji zu erstellen."
   },
   {
     "id": "api.emoji.create.too_large.app_error",
@@ -589,7 +593,7 @@
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+    "translation": "Keine passenden Berechtigungen um das Emoji zu löschen."
   },
   {
     "id": "api.emoji.disabled.app_error",
@@ -597,11 +601,11 @@
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "Unable to decode image file for emoji."
+    "translation": "Die Bilddatei für das Emoji kann nicht dekodiert werden."
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "Unable to read image file for emoji."
+    "translation": "Die Bilddatei für das Emoji kann nicht gelesen werden."
   },
   {
     "id": "api.emoji.init.debug",
@@ -613,11 +617,11 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+    "translation": "Das Emoji kann nicht erstellt werden. Die Datei muss vom Typ PNG, JPEG oder GIF sein."
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+    "translation": "Das Emoji kann nicht erstellt werden. Das Bild überschreitet die maximalen Maße."
   },
   {
     "id": "api.export.json.app_error",
@@ -1609,7 +1613,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
+    "translation": "Mit dieser E-Mail-Adresse ist bereits ein Account verknüpft, der nicht die Anmeldemethode {{.Service}} verwendet. Bitte verwenden Sie {{.Auth}} zum anmelden."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -2369,11 +2373,11 @@
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "Unable to attach emoji data to request"
+    "translation": "Das Bild kann der Anfrage nicht beigefügt werden "
   },
   {
     "id": "model.client.create_emoji.image.app_error",
-    "translation": "Unable to attach image to request"
+    "translation": "Das Bild kann der Anfrage nicht beigefügt werden "
   },
   {
     "id": "model.client.create_emoji.writer.app_error",
@@ -2565,11 +2569,11 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "Ungültige root ID"
+    "translation": "Ungültige Emoji ID"
   },
   {
     "id": "model.emoji.name.app_error",
-    "translation": "Name muss 2 oder mehr Kleinbuchstaben haben"
+    "translation": "Der Name darf aus 1 bis 64 Kleinbuchstaben bestehen"
   },
   {
     "id": "model.emoji.update_at.app_error",
@@ -3273,27 +3277,27 @@
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "Wir konnten die Nachricht nicht löschen"
+    "translation": "Wir konnten das Emoji nicht löschen"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "We couldn’t find the emoji to delete"
+    "translation": "Wir konnten das zu löschende Emoji nicht finden"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "Wir konnten die Nachricht nicht finden"
+    "translation": "Wir konnten das Emoji nicht abrufen"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "Wir konnten die Nachricht nicht finden"
+    "translation": "Wir konnten das Emoji nicht abrufen"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "Wir konnten die Nachricht nicht finden"
+    "translation": "Wir konnten das Emoji nicht abrufen"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "Wir konnten die Nachricht nicht speichern"
+    "translation": "Wir konnten das Emoji nicht speichern "
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -3815,6 +3819,10 @@
     "id": "store.sql_user.update_auth_data.app_error",
     "translation": "Wir konnten die Authentifikationsdaten nicht aktualisieren"
   },
+  {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "Es konnte failed_attempts nicht aktualisiert werden"
diff --git a/i18n/en.json b/i18n/en.json
index 62cf3a38b0..792e12969a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3815,14 +3815,14 @@
     "id": "store.sql_user.update.username_taken.app_error",
     "translation": "This username is already taken. Please choose another."
   },
-  {
-    "id": "store.sql_user.update_auth_data.email_exists.app_error",
-    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
-  },
   {
     "id": "store.sql_user.update_auth_data.app_error",
     "translation": "We couldn't update the auth data"
   },
+  {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "We couldn't update the failed_attempts"
diff --git a/i18n/es.json b/i18n/es.json
index a3df51c6fb..2471198397 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -199,6 +199,10 @@
     "id": "api.channel.delete_channel.permissions.app_error",
     "translation": "No tienes los permisos apropiados"
   },
+  {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "No hay ningún canal con channel_id={{.ChannelId}} en el equipo con team_id={{.TeamId}}"
+  },
   {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "No se puede obtener el contador del canal desde la base de datos"
@@ -3815,6 +3819,10 @@
     "id": "store.sql_user.update_auth_data.app_error",
     "translation": "No pudimos actualizar la data de autorización"
   },
+  {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "No se puede cambiar la cuenta a {{.Servicio}}. Ya existe una cuenta con el correo electrónico {{.Email}}."
+  },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "No pudimos actualizar el campo failed_attempts"
diff --git a/i18n/fr.json b/i18n/fr.json
index 0cae56cd1a..a4f71c8bda 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -199,6 +199,10 @@
     "id": "api.channel.delete_channel.permissions.app_error",
     "translation": "Vous n'avez pas les permissions nécessaires"
   },
+  {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
   {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "Impossible d'obtenir le nombre de canaux depuis la base de données"
@@ -3815,6 +3819,10 @@
     "id": "store.sql_user.update_auth_data.app_error",
     "translation": "Nous n'avons pas pu mettre à jour les données d'authentification"
   },
+  {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "Nous n'avons pas pu mettre à jour failed_attempts"
diff --git a/i18n/ja.json b/i18n/ja.json
index b48aad9325..31f54a879f 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -199,6 +199,10 @@
     "id": "api.channel.delete_channel.permissions.app_error",
     "translation": "あなたには必要な権限が付与されていません"
   },
+  {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
   {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "データベースからチャンネル数を取得できませんでした"
@@ -3815,6 +3819,10 @@
     "id": "store.sql_user.update_auth_data.app_error",
     "translation": "認証データを更新できませんでした"
   },
+  {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "failed_attemptsを更新できませんでした"
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 52268bf359..fc96fe55fd 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -199,6 +199,10 @@
     "id": "api.channel.delete_channel.permissions.app_error",
     "translation": "Você não tem a permissão apropriada"
   },
+  {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
   {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "Não é possível obter o número de canais do banco de dados"
@@ -301,7 +305,7 @@
   },
   {
     "id": "api.command.disabled.app_error",
-    "translation": "Os comandos foram desabilitados para o administrador do sistema."
+    "translation": "Os comandos foram desabilitados pelo administrador do sistema."
   },
   {
     "id": "api.command.duplicate_trigger.app_error",
@@ -573,39 +577,39 @@
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+    "translation": "Não foi possível criar o emoji. Outro emoji com o mesmo nome já existe."
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum file size."
+    "translation": "Não foi possível criar o emoji. Imagem excede o tamanho máximo do arquivo."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "Permissões inadequadas para deletar o comando"
+    "translation": "Permissões inadequadas para criar emoji."
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Unable to create emoji. Could not understand request."
+    "translation": "Não foi possível criar o emoji. A requisição não foi entendida."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Permissões inadequadas para deletar o comando"
+    "translation": "Permissões inadequadas para deletar emoji."
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "Os comandos foram desabilitados para o administrador do sistema."
+    "translation": "Emoji personalizado foi desabilitados pelo o administrador do sistema."
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "Unable to decode image file for emoji."
+    "translation": "Não foi possível decodificar arquivo de imagem para emoji."
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "Unable to read image file for emoji."
+    "translation": "Não foi possível ler arquivo de imagem para emoji."
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Inicializando post api routes"
+    "translation": "Inicializando emoji api routes"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -613,11 +617,11 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+    "translation": "Não foi possível criar o emoji. Arquivo precisa ser um PNG, JPEG ou GIF."
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+    "translation": "Não foi possível criar o emoji. A imagem excede as dimensões máximas."
   },
   {
     "id": "api.export.json.app_error",
@@ -1609,7 +1613,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
+    "translation": "Já existe uma conta associada a esse endereço de e-mail usando um método de login diferente de {{.Service}}. Por favor faça login usando {{.Auth}}."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -2369,15 +2373,15 @@
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "Unable to attach emoji data to request"
+    "translation": "Não é possível anexar dados emoji ao pedido"
   },
   {
     "id": "model.client.create_emoji.image.app_error",
-    "translation": "Unable to attach image to request"
+    "translation": "Não é possível anexar a imagem ao pedido"
   },
   {
     "id": "model.client.create_emoji.writer.app_error",
-    "translation": "Unable to write request"
+    "translation": "Não foi possível escrever o pedido"
   },
   {
     "id": "model.client.login.app_error",
@@ -2565,11 +2569,11 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "Id raiz inválida"
+    "translation": "Id do emoji inválido"
   },
   {
     "id": "model.emoji.name.app_error",
-    "translation": "Nome deve ter 2 ou mais caracteres alfanuméricos em minúsculas"
+    "translation": "Nome deve ter de 1 a 64 caracteres alfanuméricos minusculos"
   },
   {
     "id": "model.emoji.update_at.app_error",
@@ -3273,27 +3277,27 @@
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "Não foi possível deletar o post"
+    "translation": "Não foi possível deletar o emoji"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "We couldn’t find the emoji to delete"
+    "translation": "Não foi possível encontrar o emoji para deletar"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "Não foi obter o post"
+    "translation": "Não foi obter o emoji"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "Não foi obter o post"
+    "translation": "Não foi obter o emoji"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "Não foi obter o post"
+    "translation": "Não foi obter o emoji"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "Não foi possível salvar o Post"
+    "translation": "Não foi possível salvar o emoji"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -3815,6 +3819,10 @@
     "id": "store.sql_user.update_auth_data.app_error",
     "translation": "Não foi possível atualizar os dados de autenticação"
   },
+  {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "Não foi possível atualizar o failed_attempts"
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index bea813f002..33583a9365 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -125,13 +125,13 @@
   "admin.connectionSecurityTitle": "Verbindungssicherheit:",
   "admin.connectionSecurityTls": "TLS",
   "admin.connectionSecurityTlsDescription": "Verschlüsselt die Kommunikation zwischen Mattermost und Ihrem E-Mail-Server.",
-  "admin.customization.customEmoji": "Custom Emoji",
-  "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in chat messages.",
-  "admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:",
-  "admin.customization.restrictCustomEmojiCreationAll": "Allow everyone to create custom emoji",
-  "admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.",
-  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow system admins to create custom emoji",
-  "admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:",
+  "admin.customization.customEmoji": "Benutzerdefinierte Emoji",
+  "admin.customization.enableCustomEmojiDesc": "Ermögliche Benutzern eigene Emoji zu erstellen und in Chat Nachrichten zu verwenden.",
+  "admin.customization.enableCustomEmojiTitle": "Eigene Emoji ermöglichen",
+  "admin.customization.restrictCustomEmojiCreationAll": "Erlaube jedem eigene Emoji zu erstellen",
+  "admin.customization.restrictCustomEmojiCreationDesc": "Beschränke die Erstellung eigener Emoji auf bestimmte Benutzer.",
+  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Erlaube nur Systemadministratoren die Erstellung eigener Emoji",
+  "admin.customization.restrictCustomEmojiCreationTitle": "Beschränke Erstellung eigener Emoji:",
   "admin.email.agreeHPNS": " Ich verstehe und akzeptiere <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">die Bedingungen</a> des Mattermost Hosted Push Notification Service Terms of Service und die <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Datenschutzerklärung</a>.",
   "admin.email.allowEmailSignInDescription": "Wenn wahr, Mattermost erlaubt Nutzern sich mit E-Mail und Passwort anzumelden.",
   "admin.email.allowEmailSignInTitle": "Erlaube Anmelden via E-Mail: ",
@@ -188,8 +188,8 @@
   "admin.email.smtpUsernameTitle": "SMTP Benutzername:",
   "admin.email.testing": "Überprüfen...",
   "admin.false": "falsch",
-  "admin.general.localization": "Localization",
-  "admin.general.localization.availableLocalesDescription": "Legt fest welche Sprachen in den Benutzereinstellungen zur Auswahl stehen.",
+  "admin.general.localization": "Lokalisation",
+  "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings. (Leave it blank to have all supported languages available)",
   "admin.general.localization.clientLocaleDescription": "Standard Sprache für neu angelegte Nutzer und Seiten wo sich der Nutzer noch nicht angemeldet hat.",
   "admin.general.localization.serverLocaleDescription": "Standard Sprache für Systemnachrichten und Logs. Eine Änderung erfordert einen Neustart damit sie gültig wird.",
   "admin.gitab.clientSecretDescription": "Befolgen Sie die Anleitung zum Login in Gitlab, um diesen Schlüssel zu erhalten.",
@@ -429,7 +429,7 @@
   "admin.sidebar.configuration": "Konfiguration",
   "admin.sidebar.connections": "Verbindungen",
   "admin.sidebar.customBrand": "Eigenes Branding",
-  "admin.sidebar.customEmoji": "Custom Emoji",
+  "admin.sidebar.customEmoji": "Eigene Emoji",
   "admin.sidebar.customization": "Anpassung",
   "admin.sidebar.database": "Datenbank",
   "admin.sidebar.developer": "Entwickler",
@@ -442,7 +442,7 @@
   "admin.sidebar.integrations": "Integrationen",
   "admin.sidebar.ldap": "LDAP",
   "admin.sidebar.license": "Edition und Lizenz",
-  "admin.sidebar.localization": "Localization",
+  "admin.sidebar.localization": "Lokalisation",
   "admin.sidebar.logging": "Protokollführung",
   "admin.sidebar.login": "Anmelden",
   "admin.sidebar.logs": "Protokolle",
@@ -1164,7 +1164,7 @@
   "sidebar_right_menu.inviteNew": "Neues Mitglied einladen",
   "sidebar_right_menu.logout": "Abmelden",
   "sidebar_right_menu.manageMembers": "Mitglieder verwalten",
-  "sidebar_right_menu.recentMentions": "Letzte Erwähnungen",
+  "sidebar_right_menu.recentMentions": "Kürzliche Erwähnungen",
   "sidebar_right_menu.report": "Fehler melden",
   "sidebar_right_menu.switch_team": "Teamauswahl",
   "sidebar_right_menu.teamLink": "Team Einladungslink erhalten",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 85e7de39fe..4f503240aa 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -4,7 +4,7 @@
   "about.database": "Base de Datos",
   "about.date": "Fecha de compilación:",
   "about.enterpriseEditionLearn": "Conoce más acerca de la edición Enterprise en ",
-  "about.enterpriseEditionSt": "Comunicaciones empresariales modernas protegidas por tu cortafuegos.",
+  "about.enterpriseEditionSt": "Comunicaciones modernas protegidas por tu cortafuegos.",
   "about.enterpriseEditione1": "Edición Enterprise E1",
   "about.hash": "Hash de compilación:",
   "about.hashee": "Hash de compilación de EE:",
@@ -189,7 +189,7 @@
   "admin.email.testing": "Probando...",
   "admin.false": "falso",
   "admin.general.localization": "Idiomas",
-  "admin.general.localization.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta. (al dejarlo en blanco se tienen disponibles todos los idiomas soportados.",
+  "admin.general.localization.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta. (Al dejar en blanco se tiene todos los idiomas disponibles)",
   "admin.general.localization.clientLocaleDescription": "Idioma predeterminado para nuevos usuarios y páginas donde el usuario no ha iniciado sesión.",
   "admin.general.localization.serverLocaleDescription": "Idioma predeterminado para los mensajes del sistema y los registros. Cambiar esto requerirá un reinicio del servidor antes de tomar efecto.",
   "admin.gitab.clientSecretDescription": "Utilizar este valor vía instrucciones suministradas anteriormente para iniciar sesión en GitLab.",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 868a1f05f7..baef9acf47 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -125,13 +125,13 @@
   "admin.connectionSecurityTitle": "Segurança da Conexão:",
   "admin.connectionSecurityTls": "TLS",
   "admin.connectionSecurityTlsDescription": "Encriptar a comunicação entre Mattermost e o seu servidor.",
-  "admin.customization.customEmoji": "Custom Emoji",
-  "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in chat messages.",
-  "admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:",
-  "admin.customization.restrictCustomEmojiCreationAll": "Allow everyone to create custom emoji",
-  "admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.",
-  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow system admins to create custom emoji",
-  "admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:",
+  "admin.customization.customEmoji": "Emoji Personalizado",
+  "admin.customization.enableCustomEmojiDesc": "Permitir que os usuários criem emoji personalizados para uso em mensagens de chat.",
+  "admin.customization.enableCustomEmojiTitle": "Ativar Emoji Personalizado:",
+  "admin.customization.restrictCustomEmojiCreationAll": "Permitir que todos possam criar emoji personalizados",
+  "admin.customization.restrictCustomEmojiCreationDesc": "Restringir a criação de emoji personalizado para determinados usuários.",
+  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Permitir que apenas administradores de sistema possam criar emoji personalizados",
+  "admin.customization.restrictCustomEmojiCreationTitle": "Restringir a Criação Emoji Personalizado:",
   "admin.email.agreeHPNS": " Eu entendo e aceito o serviço de notificação push Mattermost Hosted<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Termos do Serviço</a> e <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Politica de Privacidade</a>.",
   "admin.email.allowEmailSignInDescription": "Quando verdadeiro, Mattermost permite aos usuários fazer login usando o e-mail e senha.",
   "admin.email.allowEmailSignInTitle": "Permitir Login Com E-mail: ",
@@ -429,7 +429,7 @@
   "admin.sidebar.configuration": "Configuração",
   "admin.sidebar.connections": "Conexões",
   "admin.sidebar.customBrand": "Marca Personalizada",
-  "admin.sidebar.customEmoji": "Custom Emoji",
+  "admin.sidebar.customEmoji": "Emoji Personalizado",
   "admin.sidebar.customization": "Customização",
   "admin.sidebar.database": "Banco de dados",
   "admin.sidebar.developer": "Desenvolvedor",
@@ -1164,7 +1164,7 @@
   "sidebar_right_menu.inviteNew": "Convidar Membros para Equipe",
   "sidebar_right_menu.logout": "Logout",
   "sidebar_right_menu.manageMembers": "Gerenciar Membros",
-  "sidebar_right_menu.recentMentions": "Recent Mentions",
+  "sidebar_right_menu.recentMentions": "Menções Recentes",
   "sidebar_right_menu.report": "Relatar um Problema",
   "sidebar_right_menu.switch_team": "Selecionar Equipe",
   "sidebar_right_menu.teamLink": "Obter Link para Convite de Equipe",
@@ -1333,7 +1333,7 @@
   "user.settings.display.showNickname": "Mostras apelidos se um existir, caso contrário mostrar o primeiro e último nome",
   "user.settings.display.showUsername": "Mostrar nome de usuário (padrão)",
   "user.settings.display.teammateDisplay": "Nome de Exibição da Equipe de Trabalho",
-  "user.settings.display.theme.customTheme": "Tema Customizado",
+  "user.settings.display.theme.customTheme": "Tema Personalizado",
   "user.settings.display.theme.describe": "Abrir para gerenciar seu tema",
   "user.settings.display.theme.import": "Importar tema de cores do Slack",
   "user.settings.display.theme.otherThemes": "Veja outros temas",
@@ -1378,7 +1378,7 @@
   "user.settings.general.validEmail": "Por favor entre um endereço de e-mail válido",
   "user.settings.general.validImage": "Somente imagens em JPG ou PNG podem ser usadas como imagem do perfil",
   "user.settings.import_theme.cancel": "Cancelar",
-  "user.settings.import_theme.importBody": "Para importar um tema, vá para uma equipe no Slack e olhe para “Preferences -> Sidebar Theme”. Abra a opção de tema customizado, copie os valores das cores do tema e cole eles aqui:",
+  "user.settings.import_theme.importBody": "Para importar um tema, vá para uma equipe no Slack e olhe para “Preferences -> Sidebar Theme”. Abra a opção de tema personalizado, copie os valores das cores do tema e cole eles aqui:",
   "user.settings.import_theme.importHeader": "Importar Tema Slack",
   "user.settings.import_theme.submit": "Enviar",
   "user.settings.import_theme.submitError": "Formato inválido, por favor tente copiar e colar novamente.",