translations PR 20170403 (#5964)

22 files changed, 1391 insertions, 1068 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 0323715fd..a1f8d27f9 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -149,7 +149,7 @@
   },
   {
     "id": "api.brand.init.debug",
-    "translation": "Initialisiere Befehle-API-Routen"
+    "translation": "Initialisiere Marken-API-Routen"
   },
   {
     "id": "api.channel.add_member.added",
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Verwaltung und Erstellung von privaten Gruppen ist auf Systemadministratoren begrenzt."
+    "translation": "Verwaltung und Erstellung von öffentlichen Kanälen ist auf Systemadministratoren begrenzt."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Verwaltung und Erstellung von privaten Gruppen ist auf Team- und Systemadministratoren begrenzt."
+    "translation": "Verwaltung und Erstellung von öffentlichen Kanälen ist auf Team- und Systemadministratoren begrenzt."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -289,7 +289,7 @@
   },
   {
     "id": "api.channel.join_channel.already_deleted.app_error",
-    "translation": "Channel is already deleted"
+    "translation": "Der Kanal ist bereits gelöscht"
   },
   {
     "id": "api.channel.join_channel.permissions.app_error",
@@ -388,12 +388,12 @@
     "translation": "Versuch einer ungültigen Änderung am Standardkanal {{.Channel}} durchzuführen"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Konnte die Ungelesen-Zahl für user_id=%v und channel_id=%v nicht abrufen, err=%v"
   },
   {
     "id": "api.cluster.init.debug",
-    "translation": "Initialisiere Benutzer-API-Routen"
+    "translation": "Initialisiere Cluster-API-Routen"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -813,11 +813,11 @@
   },
   {
     "id": "api.compliance.init.debug",
-    "translation": "Initialisiere Befehle-API-Routen"
+    "translation": "Initialisiere Compliance-API-Routen"
   },
   {
     "id": "api.config.client.old_format.app_error",
-    "translation": "New format for the client configuration is not supported yet. Please specify format=old in the query string."
+    "translation": "Das neue Format für die Clientkonfiguration wird noch nicht unterstützt. Bitte geben Sie format=old in der Anfrage an."
   },
   {
     "id": "api.context.404.app_error",
@@ -888,6 +888,10 @@
     "translation": "Ein unbekannter Fehler ist aufgetreten. Bitte kontaktieren Sie den Support."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "Initialisiere veraltete API-Routen"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "Eingehender Kanal für E-Mail-Stapelverarbeitungs-Job war voll. Bitte erhöhen Sie EmailBatchingBufferSize."
   },
@@ -1251,7 +1255,7 @@
   },
   {
     "id": "api.ldap.init.debug",
-    "translation": "Initialisiere Datei-API-Routen"
+    "translation": "Initialisiere LDAP-API-Routen"
   },
   {
     "id": "api.license.add_license.array.app_error",
@@ -1291,7 +1295,7 @@
   },
   {
     "id": "api.license.client.old_format.app_error",
-    "translation": "New format for the client license is not supported yet. Please specify format=old in the query string."
+    "translation": "Das neue Format für die Clientlizenz wird nocht nicht unterstützt. Bitte geben Sie format=old in der Anfrage an."
   },
   {
     "id": "api.license.init.debug",
@@ -1949,19 +1953,19 @@
   },
   {
     "id": "api.status.user_not_found.app_error",
-    "translation": "User not found"
+    "translation": "Benutzer nicht gefunden"
   },
   {
     "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Invalid data."
+    "translation": "Ungültige Daten"
   },
   {
     "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Invalid invite id. No team matches with this invite id."
+    "translation": "Ungültige Einladungs-ID. Kein Team entspricht dieser Einladungs-ID"
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
-    "translation": "Parameter required to add user to team."
+    "translation": "Parameter um Benutzer zu Team hinzuzufügen erforderlich."
   },
   {
     "id": "api.team.create_team.email_disabled.app_error",
@@ -3157,11 +3161,11 @@
   },
   {
     "id": "authentication.permissions.read_public_channel.description",
-    "translation": "Ability to read public channels"
+    "translation": "Möglichkeit öffentliche Kanäle zu lesen"
   },
   {
     "id": "authentication.permissions.read_public_channel.name",
-    "translation": "Read Public Channels"
+    "translation": "Öffentliche Kanäle lesen"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3484,22 +3488,6 @@
     "translation": "Seite nicht gefunden"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "Sie werden von allen öffentlichen Kanälen und privaten Gruppen entfernt.  Wenn das Team privat ist können Sie nicht erneut beitreten.  Sind Sie sich sicher?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "Nein"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "Dieses Team verlassen?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Ja"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Konnte Kanal nicht finden: %v, %v Möglichkeiten gesucht"
   },
@@ -3732,8 +3720,28 @@
     "translation": "Problem beim Schreiben der Anfrage"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
-    "translation": "Error creating SAML certificate multipart form request"
+    "translation": "Fehler bei der Erstellung der SAML Zertifikat Multipart Form Anfrage"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
@@ -4717,11 +4725,11 @@
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.get.app_error",
-    "translation": "Es konnten nicht alle Kanäle abgerufen werden"
+    "translation": "Die Kanäle konnten nicht abgerufen werden"
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.not_found.app_error",
-    "translation": "No channel found"
+    "translation": "Kein Kanal gefunden"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
@@ -4769,11 +4777,11 @@
   },
   {
     "id": "store.sql_channel.get_public_channels.get.app_error",
-    "translation": "Es konnten nicht alle Kanäle abgerufen werden"
+    "translation": "Die öffentlichen Kanäle konnten nicht abgerufen werden"
   },
   {
     "id": "store.sql_channel.get_unread.app_error",
-    "translation": "Die ungelesenen Mitteilungen des Teams konnten nicht abgerufen werden"
+    "translation": "Die ungelesenen Mitteilungen des Kanals konnten nicht abgerufen werden"
   },
   {
     "id": "store.sql_channel.increment_mention_count.app_error",
@@ -4793,7 +4801,7 @@
   },
   {
     "id": "store.sql_channel.pinned_posts.app_error",
-    "translation": "We couldn't find the pinned posts"
+    "translation": "Die angepinnten Nachrichten konnten nicht gefunden werden"
   },
   {
     "id": "store.sql_channel.remove_member.app_error",
@@ -5488,6 +5496,14 @@
     "translation": "Das Teammitglied konnte nicht gespeichert werden"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "Es trat ein Fehler beim Suchen nach Kanälen auf"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "Es trat ein Fehler beim Suchen nach Kanälen auf"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "Das Team konnte nicht aktualisiert werden"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Fehler beim Erstellen der Ordner Überwachung %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "Initialisiere Status WebSocket-API-Routen"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "Initialisiere System WebSocket-API-Routen"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "Initialisiere Benutzer WebSocket-API-Routen"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "Initialisiere webrtc WebSocket-API-Routen"
   }
 ]
diff --git a/i18n/en.json b/i18n/en.json
index aeec957bd..051631f3c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -72,10 +72,6 @@
     "translation": "Image storage is not configured."
   },
   {
-    "id": "api.deprecated.init.debug",
-    "translation": "Initializing deprecated API routes"
-  },
-  {
     "id": "api.admin.init.debug",
     "translation": "Initializing admin API routes"
   },
@@ -148,22 +144,6 @@
     "translation": "Error rendering template %v err=%v"
   },
   {
-    "id": "wsapi.user.init.debug",
-    "translation": "Initializing user WebSocket API routes"
-  },
-  {
-    "id": "wsapi.system.init.debug",
-    "translation": "Initializing system WebSocket API routes"
-  },
-  {
-    "id": "wsapi.status.init.debug",
-    "translation": "Initializing status WebSocket API routes"
-  },
-  {
-    "id": "wsapi.webrtc.init.debug",
-    "translation": "Initializing webrtc WebSocket API routes"
-  },
-  {
     "id": "api.auth.unable_to_get_user.app_error",
     "translation": "Unable to get user to check permissions."
   },
@@ -908,6 +888,10 @@
     "translation": "An unknown error has occurred. Please contact support."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "Initializing deprecated API routes"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
   },
@@ -3736,28 +3720,28 @@
     "translation": "Unable to write request"
   },
   {
-    "id": "model.client.upload_saml_cert.app_error",
-    "translation": "Error creating SAML certificate multipart form request"
-  },
-  {
-    "id": "model.client.upload_post_attachment.writer.app_error",
-    "translation": "Error closing multipart writer"
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
   },
   {
     "id": "model.client.upload_post_attachment.file.app_error",
     "translation": "Error writing file to multipart form"
   },
   {
-    "id": "model.client.upload_post_attachment.channel_id.app_error",
-    "translation": "Error writing channel id to multipart form"
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
   },
   {
     "id": "model.client.upload_post_attachment.import_from.app_error",
     "translation": "Error writing importFrom to multipart form"
   },
   {
-    "id": "model.client.upload_post_attachment.file_size.app_error",
-    "translation": "Error writing fileSize to multipart form"
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
+    "id": "model.client.upload_saml_cert.app_error",
+    "translation": "Error creating SAML certificate multipart form request"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
@@ -5512,14 +5496,14 @@
     "translation": "We couldn't save the team member"
   },
   {
-    "id": "store.sql_team.search_open_team.app_error",
-    "translation": "We encountered an error searching open teams"
-  },
-  {
     "id": "store.sql_team.search_all_team.app_error",
     "translation": "We encountered an error searching teams"
   },
   {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "We encountered an error searching open teams"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "We couldn't update the team"
   },
@@ -6090,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "Initializing status WebSocket API routes"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "Initializing system WebSocket API routes"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "Initializing user WebSocket API routes"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "Initializing webrtc WebSocket API routes"
   }
 ]
diff --git a/i18n/es.json b/i18n/es.json
index 0a6323fe5..c02c20e74 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "La gestión y creación de Grupos Privados está restringido a los Administradores del Sistema."
+    "translation": "La gestión y creación de Canales Privados está restringido a los Administradores del Sistema."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "La gestión y creación de Grupos Privados está restringido a los Administradores de Equipo y Sistema."
+    "translation": "La gestión y creación de Canales Privados está restringido a los Administradores de Equipo y Sistema."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "Eres el último miembro que queda, intenta remover el Grupo Privado en vez de salirte."
+    "translation": "Eres el último miembro que queda, intenta remover el Canal Privado en vez de salirte."
   },
   {
     "id": "api.channel.leave.left",
@@ -388,7 +388,7 @@
     "translation": "Intento de realizar una actualización inválida al canal predeterminado {{.Channel}}"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "No se puede obtener el número de mensajes no leídos para user_id=%v y channel_id=%v, err=%v"
   },
   {
@@ -888,6 +888,10 @@
     "translation": "Ocurrió un error inesperado. Por favor contacta a soporte."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "Inicializando rutas del API marcadas como obsoletas"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "El trabajo de correos electrónicos por lotes del canal de recepción estaba lleno. Por favor, aumenta el EmailBatchingBufferSize."
   },
@@ -2277,7 +2281,7 @@
   },
   {
     "id": "api.templates.upgrade_30_body.info",
-    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>TUS CUENTAS DUPLICADAS HAN SIDO ACTUALIZADAS</h3>Tu servidor de Mattermost ha sido actualizado a la Versión 3.0, la cual permite que utilices una sólo cuenta de usuario en múltiples equipos.<br/><br/>Estás recibiendo este correo electrónico debido a que el proceso de actualización ha detectado que tu cuenta tiene la misma dirección de correo electrónico o nombre de usuario que otras cuentas en el servidor.<br/><br/>Los siguiente cambios han sido realizados: <br/><br/>{{if .EmailChanged }}- La dirección de correo electrónico duplicada para la cuenta en el equipo `/{{.TeamName}}` fue cambiada a `{{.Email}}`. En el caso de que utilices el correo electrónico y la contraseña para iniciar sesión, puedes utilizar esta nueva dirección de correo para iniciar tu sesión.<br/><br/>{{end}}{{if .UsernameChanged }}- El nombre de usuario duplicado para la cuenta en el equipo `/{{.TeamName}}` ha sido cambiado por `{{.Username}}` para evitar confusión con otras cuentas.<br/><br/>{{end}} ACCIÓN RECOMENDADA: <br/><br/>Se recomienda que inicies sesión en tus equipos donde se encontraron duplicados y agregues tu cuenta principal al equipo y a cualquier canal público y grupo privado que quieras continuar utilizando. <br/><br/>Esto hará que tu cuenta principal tenga acceso al historial de todos tus canales públicos y grupos privados. Podrás continuar teniendo acceso al historial de todos los mensajes directos de cada cuenta duplicada al iniciar sesión con las credenciales de de cada una de las cuentas. <br/><br/>PARA MÁS INFORMACIÓN: <br/><br/>Para obtener más información referente a la actualización a Mattermost 3.0 por favor revisa: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
+    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>TUS CUENTAS DUPLICADAS HAN SIDO ACTUALIZADAS</h3>Tu servidor de Mattermost ha sido actualizado a la Versión 3.0, la cual permite que utilices una sólo cuenta de usuario en múltiples equipos.<br/><br/>Estás recibiendo este correo electrónico debido a que el proceso de actualización ha detectado que tu cuenta tiene la misma dirección de correo electrónico o nombre de usuario que otras cuentas en el servidor.<br/><br/>Los siguiente cambios han sido realizados: <br/><br/>{{if .EmailChanged }}- La dirección de correo electrónico duplicada para la cuenta en el equipo `/{{.TeamName}}` fue cambiada a `{{.Email}}`. En el caso de que utilices el correo electrónico y la contraseña para iniciar sesión, puedes utilizar esta nueva dirección de correo para iniciar tu sesión.<br/><br/>{{end}}{{if .UsernameChanged }}- El nombre de usuario duplicado para la cuenta en el equipo `/{{.TeamName}}` ha sido cambiado por `{{.Username}}` para evitar confusión con otras cuentas.<br/><br/>{{end}} ACCIÓN RECOMENDADA: <br/><br/>Se recomienda que inicies sesión en tus equipos donde se encontraron duplicados y agregues tu cuenta principal al equipo y a cualquier canal que quieras continuar utilizando. <br/><br/>Esto hará que tu cuenta principal tenga acceso al historial de todos tus canales. Podrás continuar teniendo acceso al historial de todos los mensajes directos de cada cuenta duplicada al iniciar sesión con las credenciales de de cada una de las cuentas. <br/><br/>PARA MÁS INFORMACIÓN: <br/><br/>Para obtener más información referente a la actualización a Mattermost 3.0 por favor revisa: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
@@ -3484,22 +3488,6 @@
     "translation": "Página no encontrada"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "Serás removido de todos los canales públicos y privados.  Si el equipo es privado no serás capaz de regresar al equipo.  ¿Estás seguro?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "No"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "¿Abandonar el equipo?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Sí"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "No pudimos encontrar el canal: %v, búsqueda realizada con estas posibilidades %v"
   },
@@ -3732,6 +3720,26 @@
     "translation": "No se puede escribir la solicitud"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "Error al crear la solicitud multiparte del certificado SAML"
   },
@@ -5488,6 +5496,14 @@
     "translation": "No pudimos guardar el miembro del equipo"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "Encontramos un error buscando los equipos"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "Encontramos un error buscando los equipos abiertos"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "No pudimos actualizar el equipo"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Falla al agregar el directorio a ser vigilado %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "Inicializando rutas de los estatus en el API de WebSocket"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "Inicializando rutas del sistema en el API de WebSocket"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "Inicializando rutas de usuario en el API de WebSocket"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "Inicializando rutas de webrtc en el API de WebSocket"
   }
 ]
diff --git a/i18n/fr.json b/i18n/fr.json
index c44765dc0..603267820 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -149,7 +149,7 @@
   },
   {
     "id": "api.brand.init.debug",
-    "translation": "Initialisation des routes de l'API des commandes"
+    "translation": "Initialisation des routes de l'API de marque"
   },
   {
     "id": "api.channel.add_member.added",
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "La création et l'administration de groupes privés sont réservées aux administrateurs système."
+    "translation": "La création et l'administration du canal public sont réservées aux administrateurs système."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "La création et l'administration du canal public sont réservées aux administrateurs systèmes et administrateurs d'équipes."
+    "translation": "La création et l'administration du canal public sont réservées aux administrateurs systèmes et administrateurs d'équipe."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -289,7 +289,7 @@
   },
   {
     "id": "api.channel.join_channel.already_deleted.app_error",
-    "translation": "Channel is already deleted"
+    "translation": "Le can est déjà supprimé"
   },
   {
     "id": "api.channel.join_channel.permissions.app_error",
@@ -388,12 +388,12 @@
     "translation": "Échec de la tentative de mise à jour du canal par défaut {{.Channel}}"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
-    "translation": "Impossible de récupérer le nombre de messages non lus pour user_id=%v et channel_id=%v, err=%v"
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
+    "translation": "Impossible de récupérer le nombre de messages non lus pour l'user_id=%v et le channel_id=%v, err=%v"
   },
   {
     "id": "api.cluster.init.debug",
-    "translation": "Initialisation des routes de l'API utilisateur"
+    "translation": "Initialisation des routes de l'API de cluster"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -813,11 +813,11 @@
   },
   {
     "id": "api.compliance.init.debug",
-    "translation": "Initialisation des routes de l'API des commandes"
+    "translation": "Initialisation des routes de l'API de compatibilité"
   },
   {
     "id": "api.config.client.old_format.app_error",
-    "translation": "New format for the client configuration is not supported yet. Please specify format=old in the query string."
+    "translation": "Le nouveau format pour la configuration du client n'est pas encore supporté. Veuillez spécifier format=old dans la chaîne de requête (query string)"
   },
   {
     "id": "api.context.404.app_error",
@@ -888,6 +888,10 @@
     "translation": "Une erreur inconnue est survenue. Veuillez contacter le support."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "Initialisation des routes dépréciées de l'API"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "Le canal recevant les e-mail envoyés par lot est plein. Veuillez augmenter le paramètre EmailBatchingBufferSize."
   },
@@ -1031,7 +1035,7 @@
   },
   {
     "id": "api.file.get_file_preview.no_preview.app_error",
-    "translation": "Le fichier n'a pas d'aperçu d'image"
+    "translation": "Le fichier n'a pas d'image d'aperçu"
   },
   {
     "id": "api.file.get_file_thumbnail.no_thumbnail.app_error",
@@ -1251,7 +1255,7 @@
   },
   {
     "id": "api.ldap.init.debug",
-    "translation": "Initialisation des routes de l'API des fichiers"
+    "translation": "Initialisation des routes de l'API LDAP"
   },
   {
     "id": "api.license.add_license.array.app_error",
@@ -1291,7 +1295,7 @@
   },
   {
     "id": "api.license.client.old_format.app_error",
-    "translation": "New format for the client license is not supported yet. Please specify format=old in the query string."
+    "translation": "Le nouveau format pour la licence du client n'est pas encore supporté. Veuillez spécifier format=old dans la chaîne de requête (query string)"
   },
   {
     "id": "api.license.init.debug",
@@ -1949,19 +1953,19 @@
   },
   {
     "id": "api.status.user_not_found.app_error",
-    "translation": "User not found"
+    "translation": "Utilisateur introuvable"
   },
   {
     "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Invalid data."
+    "translation": "Donnée invalide."
   },
   {
     "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Invalid invite id. No team matches with this invite id."
+    "translation": "ID d'invitation invalide. Aucune équipe ne correspond à cet ID d'invitation."
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
-    "translation": "Parameter required to add user to team."
+    "translation": "Paramètre requis pour ajouter l'utilisateur à une équipe."
   },
   {
     "id": "api.team.create_team.email_disabled.app_error",
@@ -3157,11 +3161,11 @@
   },
   {
     "id": "authentication.permissions.read_public_channel.description",
-    "translation": "Ability to read public channels"
+    "translation": "Possibilité de lire les canaux publics"
   },
   {
     "id": "authentication.permissions.read_public_channel.name",
-    "translation": "Read Public Channels"
+    "translation": "Lire les canaux publics"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3269,7 +3273,7 @@
   },
   {
     "id": "ent.compliance.run_started.info",
-    "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
+    "translation": "L'export de compatibilité a démarré pour le job '{{.JobName}}' à '{{.FilePath}}'"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
@@ -3484,22 +3488,6 @@
     "translation": "Page introuvable"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "Vous serez supprimé de tous les canaux et groupes privés. Si l'équipe est privée, vous ne pourrez plus la rejoindre à nouveau. Êtes-vous sûr ?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "Non"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "Quitter l'équipe ?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Oui"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Impossible de trouver le canal : %v, %v possibilités recherchées"
   },
@@ -3732,8 +3720,28 @@
     "translation": "Impossible d'écrire la requête"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
-    "translation": "Error creating SAML certificate multipart form request"
+    "translation": "Erreur lors de la création de la requête pour le formulaire multipart pour le certificat SAML"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
@@ -3777,7 +3785,7 @@
   },
   {
     "id": "model.command.is_valid.url_http.app_error",
-    "translation": "URL invalude. Il doit s'agir d'une URL valide et commencer par http:// ou https://"
+    "translation": "URL invalide. L'URL doit être valide et commencer par http:// ou https://"
   },
   {
     "id": "model.command.is_valid.user_id.app_error",
@@ -3829,7 +3837,7 @@
   },
   {
     "id": "model.config.is_valid.email_security.app_error",
-    "translation": "Sécurité de connexion invalide dans les paramètres de messagerie. Doit être '', 'TLS' ou 'STARTTLS'"
+    "translation": "Sécurité de connexion invalide pour les paramètres e-mail. Doit être '', 'TLS' ou 'STARTTLS'"
   },
   {
     "id": "model.config.is_valid.encrypt_sql.app_error",
@@ -3909,7 +3917,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_security.app_error",
-    "translation": "Sécurité de connexion invalide dans les paramètres de messagerie. Doit être '', 'TLS' ou 'STARTTLS'"
+    "translation": "Sécurité de connexion invalide pour les paramètres AD/LDAP. Doit être '', 'TLS' ou 'STARTTLS'"
   },
   {
     "id": "model.config.is_valid.ldap_server",
@@ -4717,11 +4725,11 @@
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir les canaux"
+    "translation": "Impossible de récupérer les canaux"
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.not_found.app_error",
-    "translation": "No channel found"
+    "translation": "Aucun canal trouvé"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
@@ -4769,11 +4777,11 @@
   },
   {
     "id": "store.sql_channel.get_public_channels.get.app_error",
-    "translation": "Nous n'avons pas pu obtenir les canaux"
+    "translation": "Impossible de récupérer les canaux publics"
   },
   {
     "id": "store.sql_channel.get_unread.app_error",
-    "translation": "Impossible de récupérer la liste des messages non lus des équipes"
+    "translation": "Impossible de récupérer les messages non lus du canal"
   },
   {
     "id": "store.sql_channel.increment_mention_count.app_error",
@@ -4793,7 +4801,7 @@
   },
   {
     "id": "store.sql_channel.pinned_posts.app_error",
-    "translation": "We couldn't find the pinned posts"
+    "translation": "Impossible de récupérer les messages épinglés"
   },
   {
     "id": "store.sql_channel.remove_member.app_error",
@@ -5488,6 +5496,14 @@
     "translation": "Nous n'avons pas pu enregistrer le membre du canal"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "Nous avons rencontré une erreur durant la recherche des canaux"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "Nous avons rencontré une erreur durant la recherche des canaux"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "Nous n'avons pas pu mettre à jour l'équipe"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Échec de l'ajout du dossier à l'observateur %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "Initialisation des routes de l'API des statuts"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "Initialisation des routes systèmes de l'API WebSocket"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "Initialisation des routes utilisateurs de l'API WebSocket"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "Initialisation des routes de l'API WebSocket webrtc"
   }
 ]
diff --git a/i18n/ja.json b/i18n/ja.json
index 79b53d972..46a5dde1c 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "非公開グループの作成と管理は、システム管理者しかできません。"
+    "translation": "公開チャンネルの作成と管理は、システム管理者しかできません。"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "非公開グループの作成と管理は、チーム管理者かシステム管理者しかできません。"
+    "translation": "公開チャンネルの作成と管理は、チーム管理者かシステム管理者しかできません。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -388,7 +388,7 @@
     "translation": "デフォルトのチャンネル{{.Channel}}に不正な更新をしようとしました"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "未読数を取得できませんでした user_id=%v and channel_id=%v, err=%v"
   },
   {
@@ -817,7 +817,7 @@
   },
   {
     "id": "api.config.client.old_format.app_error",
-    "translation": "New format for the client configuration is not supported yet. Please specify format=old in the query string."
+    "translation": "クライアントの設定で新しい形式がまだサポートされていません。クエリー文字列に format=old を指定してください。"
   },
   {
     "id": "api.context.404.app_error",
@@ -888,6 +888,10 @@
     "translation": "詳細不明なエラーが発生しました。サポートに問い合わせしてください。"
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "非推奨APIルートを初期化しています"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "電子メールバッチ処理のジョブを受け取るチャンネルがいっぱいです。EmailBatchingBufferSizeを増やしてください。"
   },
@@ -1291,7 +1295,7 @@
   },
   {
     "id": "api.license.client.old_format.app_error",
-    "translation": "New format for the client license is not supported yet. Please specify format=old in the query string."
+    "translation": "クライアントのライセンスで新しい形式がまだサポートされていません。クエリー文字列に format=old を指定してください。"
   },
   {
     "id": "api.license.init.debug",
@@ -3484,22 +3488,6 @@
     "translation": "ページが見付かりません"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "全ての公開チャンネルと非公開グループから脱退します。  チームが非公開な場合、再度参加することはできません。  実行してよろしいですか?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "いいえ"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "チームから脱退しますか?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "はい"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "チャンネルが見付かりません: %v、%vではありませんか"
   },
@@ -3732,6 +3720,26 @@
     "translation": "リクエストを書き込めません"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "リクエストからSAML証明書のマルチパートを作成する際にエラーになりました"
   },
@@ -4721,7 +4729,7 @@
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.not_found.app_error",
-    "translation": "No channel found"
+    "translation": "チャンネルが見付かりませんでした"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
@@ -5488,6 +5496,14 @@
     "translation": "チャンネルのメンバーを保存できませんでした"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "チャンネルを検索する際にエラーが発生しました"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "チャンネルを検索する際にエラーが発生しました"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "チームが更新できませんでした"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "ウォッチャーにディレクトリーを追加できませんでした %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "状態ウェブソケットAPIルートを初期化しています"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "システムウェブソケットAPIルートを初期化しています"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "ユーザーウェブソケットAPIルートを初期化しています"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "WebRTCウェブソケットAPIルートを初期化しています"
   }
 ]
diff --git a/i18n/ko.json b/i18n/ko.json
index 13f152c49..bbcbfd81e 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "비공개 그룹 생성, 관리는 시스템 관리자 권한이 필요합니다."
+    "translation": "공개 채널 생성, 관리는 시스템 관리자 권한이 필요합니다."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "비공개 그룹 생성, 관리는 팀 관리자 또는 시스템 관리자 권한이 필요합니다."
+    "translation": "공개 채널 생성, 관리는 팀 관리자 또는 시스템 관리자 권한이 필요합니다."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -388,7 +388,7 @@
     "translation": "기본 채널 {{.Channel}}에 적절하지 않은 갱신을 시도했습니다"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "읽지 않은 메시지 갯수를 가져오지 못했습니다. user_id=%v and channel_id=%v, err=%v"
   },
   {
@@ -888,6 +888,10 @@
     "translation": "알 수 없는 오류가 발생했습니다. 지원 서비스에 연락하시기 바랍니다."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "명령어 API 경로 초기화 중"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "이메일 배치 작업을 받는 채널이 가득 찼습니다. EmailBatchingBufferSize를 늘려주세요."
   },
@@ -3484,22 +3488,6 @@
     "translation": "페이지가 없습니다."
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "No"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "Leave the team?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Yes"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Could not find channel: %v, %v possibilites searched"
   },
@@ -3732,6 +3720,26 @@
     "translation": "Unable to write request"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "Error creating SAML certificate multipart form request"
   },
@@ -5488,6 +5496,14 @@
     "translation": "채널을 찾을 수 없습니다"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "We encountered an error updating the channel"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "We encountered an error updating the channel"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "상태 API 루트를 초기화 중"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "웹소켓 API 경로 초기화 중"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "웹소켓 API 경로 초기화 중"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "웹소켓 API 경로 초기화 중"
   }
 ]
diff --git a/i18n/nl.json b/i18n/nl.json
index 682c9cb43..5207efd1e 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Privégroep-beheer en -aanmaak is voorbehouden aan systeembeheerders."
+    "translation": "Alleen systeembeheerders mogen publieke kanalen beheren en aanmaken."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Privégroep-beheer en -aanmaak is voorbehouden aan team- en systeembeheerders."
+    "translation": "Alleen team- en systeembeheerders mogen publieke kanalen beheren en aanmaken."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -388,7 +388,7 @@
     "translation": "Een ongeldige bijwerkings-poging van het standaard kanaal {{.Channel}} is geprobeerd"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Onmogelijk om het aantal ongelezen bericht op te halen voor user_id=%v en channel_id=%v, err=%v"
   },
   {
@@ -888,6 +888,10 @@
     "translation": "Een onbekende fout is opgetreden. Neem contact op met support."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "Initialisatie van de opdracht API routes"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "Kanaal voor e-mail batch taken was vol. Verhoog a.u.b. de EmailBatchingBufferSize"
   },
@@ -3484,22 +3488,6 @@
     "translation": "Pagina niet gevonden"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "Je word verwijdert van alle publieke kanalen en privé groepen. Als het team privé is kan je niet opnieuw lid worden van het team. Weet je get zeker?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "Nee"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "Verlaat het team?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Ja"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Kan het kanaal %v niet vinden, %v mogelijkheden doorzocht"
   },
@@ -3732,6 +3720,26 @@
     "translation": "Fout bij het schrijven van verzoek"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "Error creating SAML certificate multipart form request"
   },
@@ -5488,6 +5496,14 @@
     "translation": "Het team lid kan niet opgeslagen worden"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "Er is een fout opgetreden tijdens het bijwerken van het kanaal"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "Er is een fout opgetreden tijdens het bijwerken van het kanaal"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "Het team kan niet bijgewerkt worden"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Toevoegen van een directory om te controleren is mislukt %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "Het initialiseren van status api routes"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "Initialisatie van de websocket api"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "Initialisatie van de websocket api"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "Initialisatie van de websocket api"
   }
 ]
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 91e4b880d..cbc6f9476 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Gerenciamento de Canais Privados e criação é restrito apenas para Administradores do Sistema."
+    "translation": "Gerenciamento de Canais Públicos e criação é restrito apenas para Administradores do Sistema."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Gerenciamento de Canais Privados e criação é restrito apenas para o Time e Administradores do Sistema."
+    "translation": "Gerenciamento de Canais Públicos e criação é restrito apenas para o Time e Administradores do Sistema."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -388,7 +388,7 @@
     "translation": "Tentou executar uma atualização inválida para o canal padrão {{.Channel}}"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Não foi possível obter o número de não lidos para o user_id=%v e channel_id=%v, err=%v"
   },
   {
@@ -817,7 +817,7 @@
   },
   {
     "id": "api.config.client.old_format.app_error",
-    "translation": "New format for the client configuration is not supported yet. Please specify format=old in the query string."
+    "translation": "O novo formato para a configuração do cliente não é suportado ainda. Por favor, especifique na query string format=old."
   },
   {
     "id": "api.context.404.app_error",
@@ -888,6 +888,10 @@
     "translation": "Ocorreu um erro desconhecido. Por favor contato com o suporte."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "Inicializando as rotas da API que serão descontinuadas"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "A tarefa de email em lote do canal de entrada estava cheio. Por favor aumente o EmailBatchingBufferSize."
   },
@@ -1291,7 +1295,7 @@
   },
   {
     "id": "api.license.client.old_format.app_error",
-    "translation": "New format for the client license is not supported yet. Please specify format=old in the query string."
+    "translation": "O novo formato para a licença do cliente não é suportado ainda. Por favor, especifique na query string format=old."
   },
   {
     "id": "api.license.init.debug",
@@ -3484,22 +3488,6 @@
     "translation": "Página não encontrada"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "Você será removido de todos os canais públicos e grupos privados.  Se a equipe é privada você não será capaz de se juntar à equipe.  Você tem certeza?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "Não"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "Deixar a equipe?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Sim"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Não foi possível encontrar o canal %v, procurado %v possibilidades"
   },
@@ -3732,6 +3720,26 @@
     "translation": "Não foi possível escrever o pedido"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "Error em criar o formulário de requisição com o certificado multipart SAML"
   },
@@ -4721,7 +4729,7 @@
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.not_found.app_error",
-    "translation": "No channel found"
+    "translation": "Nenhum canal encontrado"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
@@ -5488,6 +5496,14 @@
     "translation": "Não foi possível salvar o membro da equipe"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "Encontramos um erro ao procurar pelos canais"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "Encontramos um erro ao procurar pelos canais"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "Não foi possível atualizar a equipe"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Falha ao adicionar diretório observador %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "Inicializando as rotas de API web socket de status"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "Inicializando as rotas de API web socket do sistema"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "Inicializando as rotas de API web socket de usuários"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "Inicializando as rotas de API web socket de webrtc"
   }
 ]
diff --git a/i18n/ru.json b/i18n/ru.json
index f522c172f..bdfe0e5e9 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -149,7 +149,7 @@
   },
   {
     "id": "api.brand.init.debug",
-    "translation": "Инициализация API команд"
+    "translation": "Инициализация маршрутов brand API"
   },
   {
     "id": "api.channel.add_member.added",
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Создание и управление Приватными Группами возможно только Системными Администраторами."
+    "translation": "Создание и управление Публичными Каналами возможно только Системными Администраторами."
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Создание и управление Приватными Группами возможно Командой и Системными Администраторами."
+    "translation": "Создание и управление Публичными Каналами возможно Командой и Системными Администраторами."
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -225,11 +225,11 @@
   },
   {
     "id": "api.channel.create_group.bad_size.app_error",
-    "translation": "Group message channels must contain at least 3 and no more than 8 users"
+    "translation": "Канал группы должен иметь не менее трёх и не более восьми пользователей"
   },
   {
     "id": "api.channel.create_group.bad_user.app_error",
-    "translation": "One of the provided users does not exist"
+    "translation": "Один из предложенных пользователей не существует"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -289,7 +289,7 @@
   },
   {
     "id": "api.channel.join_channel.already_deleted.app_error",
-    "translation": "Channel is already deleted"
+    "translation": "Канал уже удалён"
   },
   {
     "id": "api.channel.join_channel.permissions.app_error",
@@ -388,12 +388,12 @@
     "translation": "Попытка выполнения недопустимого обновления канала по умолчанию {{.Channel}}"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Невозможно получить количество непрочитанных сообщений для пользователя user_id=%v и канала channel_id=%v, err=%v"
   },
   {
     "id": "api.cluster.init.debug",
-    "translation": "Инициализация API пользователей"
+    "translation": "Инициализация маршрутов кластерного API"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -813,7 +813,7 @@
   },
   {
     "id": "api.compliance.init.debug",
-    "translation": "Инициализация API команд"
+    "translation": "Инициализация маршрутов compliance API"
   },
   {
     "id": "api.config.client.old_format.app_error",
@@ -888,6 +888,10 @@
     "translation": "Произошла неизвестная ошибка. Пожалуйста, свяжитесь с поддержкой."
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "Инициализация устаревших маршрутов API"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "Канал-получатель почтового объединения был полон. Пожалуйста, увеличьте значение EmailBatchingBufferSize."
   },
@@ -1251,7 +1255,7 @@
   },
   {
     "id": "api.ldap.init.debug",
-    "translation": "Инициализация API файлов"
+    "translation": "Инициализация маршрутов LDAP API"
   },
   {
     "id": "api.license.add_license.array.app_error",
@@ -1949,7 +1953,7 @@
   },
   {
     "id": "api.status.user_not_found.app_error",
-    "translation": "User not found"
+    "translation": "Пользователь не найден"
   },
   {
     "id": "api.team.add_user_to_team.invalid_data.app_error",
@@ -2173,7 +2177,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "[{{ .SiteName }}] {{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team"
+    "translation": "[{{ .SiteName }}] {{ .SenderName }} пригласил вас в команду {{ .TeamDisplayName }}"
   },
   {
     "id": "api.templates.mfa_activated_body.info",
@@ -2185,7 +2189,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "[{{ .SiteName }}] Your MFA has been updated"
+    "translation": "[{{ .SiteName }}] Ваша MFA была обновлена"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2205,7 +2209,7 @@
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "[{{ .SiteName }}] Your password has been updated"
+    "translation": "[{{ .SiteName }}] Ваш пароль обновлён"
   },
   {
     "id": "api.templates.post_body.button",
@@ -3484,22 +3488,6 @@
     "translation": "Страница не найдена"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "Вы будете удалены из всех общедоступных каналов и частных групп. Если команда является закрытой, то Вы не сможете вернуться в неё. Вы уверены?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "Нет"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "Уйти из команды?"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Да"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Невозможно найти канал: %v, найдено похожих %v "
   },
@@ -3732,6 +3720,26 @@
     "translation": "Не удалось записать запрос"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "Error creating SAML certificate multipart form request"
   },
@@ -5488,6 +5496,14 @@
     "translation": "Не удалось сохранить участника команды"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "Возникла проблема при поиске канала"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "Возникла проблема при поиске канала"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "Не удалось обновить команду"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Не удалось добавить каталог к наблюдателю %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "Инициализация маршрутов статусного WebSocket API"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "Инициализация маршрутов системного WebSocket API"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "Инициализация маршрутов пользовательского WebSocket API"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "Инициализация маршрутов webrtc WebSocket API"
   }
 ]
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 6f3a0b7e4..317a3aa95 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "只有系统管理能创建与管理私有群组。"
+    "translation": "只有系统管理员能创建公开频道。"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "只有团体和系统管理员能管理与创建私有群组。"
+    "translation": "只有团队和系统管理员能创建与管理公开频道。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -388,7 +388,7 @@
     "translation": "对默认频道试图执行一个无效的更新 {{.Channel}}"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "无法获取 user_id=%v 以及 channel_id=%v 的未读数量，err=%v"
   },
   {
@@ -888,6 +888,10 @@
     "translation": "发生未知错误。请联系我们。"
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "正在初始化已弃用 API 路由"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "批量电子邮件任务接收频道已满。请提高EmailBatchingBufferSize。"
   },
@@ -1949,19 +1953,19 @@
   },
   {
     "id": "api.status.user_not_found.app_error",
-    "translation": "User not found"
+    "translation": "未找到用户"
   },
   {
     "id": "api.team.add_user_to_team.invalid_data.app_error",
-    "translation": "Invalid data."
+    "translation": "无效数据。"
   },
   {
     "id": "api.team.add_user_to_team.invalid_invite_id.app_error",
-    "translation": "Invalid invite id. No team matches with this invite id."
+    "translation": "无效邀请 id。没有匹配此邀请 id 的团队。"
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
-    "translation": "Parameter required to add user to team."
+    "translation": "添加用户到团队所需的参数。"
   },
   {
     "id": "api.team.create_team.email_disabled.app_error",
@@ -3484,22 +3488,6 @@
     "translation": "未找到该页面"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "您将会从所有公开频道和私有组中移除。如果团队是私有的你将无法再加入。您确定吗？"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "不"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "退出团队？"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "是"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "找不到频道：%v，已搜索 %v 可能性"
   },
@@ -3732,6 +3720,26 @@
     "translation": "无法写入请求"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "创建 SAML 证书多部分表格请求失败"
   },
@@ -4721,7 +4729,7 @@
   },
   {
     "id": "store.sql_channel.get_channels_by_ids.not_found.app_error",
-    "translation": "No channel found"
+    "translation": "未找到频道"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
@@ -5488,6 +5496,14 @@
     "translation": "我们无法保存该频道成员"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "我们搜索频道时遇到错误"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "我们搜索频道时遇到错误"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "我们无法更新该团队"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "无法添加目录给观察者 %v"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "正在初始化状态 WebSocket API 路由"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "正在初始化系统 Websocket API 路由"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "正在初始化用户 Websocket API 路由"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "正在初始化 webrtc Websocket API 路由"
   }
 ]
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index a7e66c4f5..b676f5df0 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -185,11 +185,11 @@
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "只有系統管理員能建立與管理私人群組。"
+    "translation": "只有系統管理員能建立與管理公開頻道。"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "只有團隊和系統管理員能建立與管理私人群組。"
+    "translation": "只有團隊和系統管理員能建立與管理公開頻道。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
@@ -388,7 +388,7 @@
     "translation": "已對預設頻道 {{.Channel}} 嘗試執行無效的更新"
   },
   {
-    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
+    "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "無法計算未讀訊息數量：user_id=%v, channel_id=%v, err=%v"
   },
   {
@@ -888,6 +888,10 @@
     "translation": "發生未知的錯誤。請聯繫支援單位。"
   },
   {
+    "id": "api.deprecated.init.debug",
+    "translation": "正在初始化命令 API 路徑"
+  },
+  {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
     "translation": "批次郵件的接收頻道已滿。請增加 EmailBatchingBufferSize。"
   },
@@ -3484,22 +3488,6 @@
     "translation": "找不到頁面"
   },
   {
-    "id": "leave_team_modal.desc",
-    "translation": "將離開所有的公開頻道與私人群組。如果團隊是私人團隊，將無法重新加入。您確定嘛？"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "不"
-  },
-  {
-    "id": "leave_team_modal.title",
-    "translation": "退出團隊？"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "是"
-  },
-  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "找不到: %v 頻道，已搜尋 %v 的可能性"
   },
@@ -3732,6 +3720,26 @@
     "translation": "無法寫入要求"
   },
   {
+    "id": "model.client.upload_post_attachment.channel_id.app_error",
+    "translation": "Error writing channel id to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file.app_error",
+    "translation": "Error writing file to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.file_size.app_error",
+    "translation": "Error writing fileSize to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.import_from.app_error",
+    "translation": "Error writing importFrom to multipart form"
+  },
+  {
+    "id": "model.client.upload_post_attachment.writer.app_error",
+    "translation": "Error closing multipart writer"
+  },
+  {
     "id": "model.client.upload_saml_cert.app_error",
     "translation": "Error creating SAML certificate multipart form request"
   },
@@ -5488,6 +5496,14 @@
     "translation": "無法儲存該團隊成員"
   },
   {
+    "id": "store.sql_team.search_all_team.app_error",
+    "translation": "搜尋頻道時遇到錯誤"
+  },
+  {
+    "id": "store.sql_team.search_open_team.app_error",
+    "translation": "搜尋頻道時遇到錯誤"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "無法更新團隊"
   },
@@ -6058,5 +6074,21 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "新增目錄至監控 %v 失敗"
+  },
+  {
+    "id": "wsapi.status.init.debug",
+    "translation": "正在初始化狀態 API 路徑"
+  },
+  {
+    "id": "wsapi.system.init.debug",
+    "translation": "正在初始化 web socket API 路徑"
+  },
+  {
+    "id": "wsapi.user.init.debug",
+    "translation": "正在初始化 web socket API 路徑"
+  },
+  {
+    "id": "wsapi.webrtc.init.debug",
+    "translation": "正在初始化 web socket API 路徑"
   }
 ]
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 0ad77e548..b780fcd87 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -328,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "Systemadministratoren",
   "admin.general.policy.restrictPostDeleteDescription": "Richtline festlegen, wer die Berechtigung erhält, Nachrichten zu löschen.",
   "admin.general.policy.restrictPostDeleteTitle": "Löschen von Nachrichten erlauben:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Regel festlegen, wer private Gruppen erstellen darf.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Erlaube Erstellung privater Gruppen für:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Regel festlegen, wer öffentliche Kanäle erstellen darf.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Erlaube Erstellung öffentlicher Kanäle für:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "Kommandozeilenwerkzeug",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Regel festlegen, wer private Gruppen löschen darf. Gelöschte Gruppen können von der Datenbank mit einem {commandLineToolLink} wiederhergestellt werden.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Erlaube Löschung privater Gruppen für:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Regel festlegen, wer private Gruppen umbenennen und Kopfzeile sowie Zweck anpassen darf.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Erlaube Umbenennung privater Gruppen für:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Regel festlegen, wer öffentliche Kanäle löschen darf. Gelöschte Kanäle können von der Datenbank mit einem {commandLineToolLink} wiederhergestellt werden.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Erlaube Löschung öffentlicher Kanäle für:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Regel festlegen, wer öffentliche Kanäle umbenennen und Kopfzeile sowie Zweck anpassen darf.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Erlaube Umbenennung öffentlicher Kanäle für:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Regel festlegen, wer öffentliche Kanäle erstellen darf.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Erlaube Erstellung öffentlicher Kanäle für:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "Kommandozeilenwerkzeug",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "Erlaube Cross Origin Requests von:",
   "admin.service.developerDesc": "Wenn wahr werden Javascript Fehler in einer roten Zeile im oberen Bereich des Interfaces angezeigt. Nicht empfohlen für Produktivumgebungen. ",
   "admin.service.developerTitle": "Aktiviere Entwickler Modus: ",
-  "admin.service.enforcMfaTitle": "Multi-Faktor-Authentifizierung erzwingen:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "Wenn wahr, wird <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>Multi-Faktor-Authentifizierung</a> für einen Login vorausgesetzt. Neue Benutzer werden aufgefordert MFA bei Registrierung zu konfigurieren. Angemeldete Benutzer ohne eingerichtetem MFA werden zur MFA Einrichtungsseite weitergeleitet bis die Einrichtung abgeschlossen wurde.<br/><br/>Wenn es im System Benutzer mit einer anderen Anmeldemethode als AD/LDAP oder E-Mail gibt, muss MFA beim Authentifikationsprovider außerhalb von Mattermost erzwungen werden.",
   "admin.service.forward80To443": "Port 80 auf 443 weiterleiten:",
   "admin.service.forward80To443Description": "Leitet alle unsicheren Anfragen von Port 80 auf den sicheren Port 443 um",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "Aktiviere eingehende Webhooks: ",
   "admin.service.writeTimeout": "Schreibe-Zeitüberschreitung:",
   "admin.service.writeTimeoutDescription": "Wenn HTTP verwendet wird (unsicher), ist dies die maximale erlaubte Zeit vom ende des Lesens der Anfrage bis die Antwort geschrieben wurde. Wenn HTTPS verwendet wird ist es die komplette Zeit von Verbindungsannahme bis die Antwort geschrieben wurde.",
-  "admin.sidebar.addTeamSidebar": "Team aus dem Seitenmenü hinzufügen",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Erweitert",
   "admin.sidebar.audits": "Compliance und Prüfung",
   "admin.sidebar.authentication": "Authentifizierung",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "Mobil Push",
   "admin.sidebar.rateLimiting": "Geschwindigkeitsbegrenzung",
   "admin.sidebar.reports": "REPORTING",
-  "admin.sidebar.rmTeamSidebar": "Team aus dem Seitenmenü entfernen",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Sicherheit",
   "admin.sidebar.sessions": "Sitzungen",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "Aktive Nutzer mit Beiträgen",
   "admin.team_analytics.totalPosts": "Summe aller Beiträge",
   "admin.true": "wahr",
-  "admin.userList.title": "Mitglieder bei {team}",
-  "admin.userList.title2": "Mitglieder bei {team} ({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Anmelde-Methode:</strong> E-Mail-Adresse",
   "admin.user_item.authServiceNotEmail": "<strong>Anmelde-Methode:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Wenn Sie sich selbst die Systemadministrations-Rolle entziehen und es gibt keinen weitere Benutzer mit der Systemadministrations-Rolle, müssen Sie einen Systemadministrator über den Mattermost-Server in einer Terminal-Sitzung mit folgendem Kommando festlegen.",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "MFA entfernen",
   "admin.user_item.resetPwd": "Passwort zurücksetzen",
   "admin.user_item.switchToEmail": "Umschalten zu E-Mail-Adresse/Passwort",
-  "admin.user_item.sysAdmin": "Systemadministrator",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Team Administrator",
   "admin.webrtc.enableDescription": "Wenn wahr, erlaubt Mattermost die Erstellung von <strong>eins-zu-eins</strong> Videokonferenzen. WebRTC Anrufe sind in Chrome, Firefox und Mattermost Desktop Anwendungen verfügbar.",
   "admin.webrtc.enableTitle": "Aktiviere Mattermost WebRTC: ",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "Tägliche aktive Benutzer",
   "analytics.system.monthlyActiveUsers": "Monatliche aktive Benutzer",
   "analytics.system.postTypes": "Nachrichten, Dateien und Hashtags",
-  "analytics.system.privateGroups": "Private Gruppen",
+  "analytics.system.privateGroups": "Privater Kanal",
   "analytics.system.publicChannels": "Öffentliche Kanäle",
   "analytics.system.skippedIntensiveQueries": "Um die Performance zu maximieren sind einige Statistiken deaktiviert. Sie können diese in der config.json wieder reaktivieren. Sie erfahren mehr in der <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>Dokumentation</a>.",
   "analytics.system.textPosts": "Nur-Text Beiträge",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "Websocket Verbindungen",
   "analytics.team.activeUsers": "Aktive Benutzer mit Beiträgen",
   "analytics.team.newlyCreated": "Neu erstellte Benutzer",
-  "analytics.team.privateGroups": "Private Gruppen",
+  "analytics.team.privateGroups": "Privater Kanal",
   "analytics.team.publicChannels": "Öffentliche Kanäle",
   "analytics.team.recentActive": "Zuletzt aktive Benutzer",
   "analytics.team.recentUsers": "Zuletzt aktive Benutzer",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "Aus Favoriten entfernen",
   "channel_flow.alreadyExist": "Ein Kanal mit der URL existiert bereits",
   "channel_flow.changeUrlDescription": "Einige Zeichen sind nicht in URLs erlaubt und werden ggfs. entfernt.",
-  "channel_flow.changeUrlTitle": "Ändere {term} URL",
-  "channel_flow.channel": "Kanal",
-  "channel_flow.create": "Erstelle {term}",
-  "channel_flow.group": "Gruppe",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Privater Kanal",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Kanal-URL muss zwei oder mehr alphanumerische Zeichen enthalten",
   "channel_flow.invalidName": "Ungültiger Kanal Name",
-  "channel_flow.set_url_title": "Setze {term} URL",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "Mitglieder hinzufügen",
   "channel_header.addToFavorites": "Zu Favoriten hinzufügen",
-  "channel_header.channel": "Kanal",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Bearbeite Kanaltitel",
-  "channel_header.delete": "Lösche {term}",
+  "channel_header.delete": "Kanal löschen",
   "channel_header.flagged": "Markierte Nachrichten",
-  "channel_header.group": "Gruppe",
-  "channel_header.leave": "Verlasse {term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Kanal verlassen",
   "channel_header.manageMembers": "Mitglieder verwalten",
   "channel_header.notificationPreferences": "Benachrichtigungseinstellungen",
   "channel_header.recentMentions": "Letzte Erwähnungen",
   "channel_header.removeFromFavorites": "Aus Favoriten entfernen",
-  "channel_header.rename": "Benenne {term} um",
-  "channel_header.setHeader": "Bearbeite {term} Titel",
-  "channel_header.setPurpose": "Bearbeite {term} Zweck",
+  "channel_header.rename": "Kanal umbenennen",
+  "channel_header.setHeader": "Bearbeite Kanaltitel",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "Info anzeigen",
   "channel_header.viewMembers": "Zeige Mitglieder",
   "channel_header.webrtc.call": "Videoanruf starten",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " Füge neue Mitglieder hinzu",
   "channel_members_modal.members": " Mitglieder",
   "channel_modal.cancel": "Abbrechen",
-  "channel_modal.channel": "Kanal",
-  "channel_modal.createNew": "Erstelle neue(n) ",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Neuen Kanal erstellen",
   "channel_modal.descriptionHelp": "Beschreiben Sie wie diese(r) {term} genutzt werden soll.",
-  "channel_modal.displayNameError": "Channel name must be 2 or more characters",
+  "channel_modal.displayNameError": "Kanalname muss aus 2 oder mehr Zeichen bestehen",
   "channel_modal.edit": "Bearbeiten",
-  "channel_modal.group": "Gruppe",
+  "channel_modal.group": "Group",
   "channel_modal.header": "Überschrift",
   "channel_modal.headerEx": "z.B.: \"[Link Titel](http://beispiel.de)\"",
   "channel_modal.headerHelp": "Der Text der in der Kopfzeile der/des {term} neben dem Namen steht. Zum Beispiel könnten Sie häufig genutzte Links durch Hinzufügen von [Link Titel](http://example.de) anzeigen lassen.",
-  "channel_modal.modalTitle": "Neue(r) ",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "Name",
   "channel_modal.nameEx": "z.B.: \"Bugs\", \"Marketing\", \"客户支持\"",
   "channel_modal.optional": "(optional)",
   "channel_modal.privateGroup1": "Erstelle eine neue private Gruppe mit beschränktem Nutzerkreis. ",
-  "channel_modal.privateGroup2": "Erstelle eine private Gruppe",
+  "channel_modal.privateGroup2": "Erstelle einen öffentlichen Kanal",
   "channel_modal.publicChannel1": "Erstelle einen öffentlichen Kanal",
   "channel_modal.publicChannel2": "Erstelle einen neuen öffentlichen Kanal dem jeder beitreten kann. ",
   "channel_modal.purpose": "Zweck",
   "channel_modal.purposeEx": "z.B.: \"Ein Kanal um Fehler und Verbesserungsvorschläge abzulegen\"",
-  "channel_notification.push": "Mobile Push-Nachrichten versenden",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "Für alle Aktivitäten",
   "channel_notifications.allUnread": "Für alle ungelesenen Nachrichten",
   "channel_notifications.globalDefault": "Globaler Standard ({notifyLevel})",
@@ -1220,19 +1220,19 @@
   "create_team.team_url.hint": "<li>Kurz und gut merkbar ist von Vorteil</li><li>Nur Kleinbuchstaben, Ziffern und Bindestriche verwenden</li><li>Es muss mit einem Buchstaben begonnen werden und darf nicht mit einem Bindestrich enden.</li>",
   "create_team.team_url.regex": "Nur Kleinbuchstaben, Ziffern und Bindestriche verwenden. Es muss mit einem Buchstaben begonnen werden und darf nicht mit einem Bindestrich enden.",
   "create_team.team_url.required": "Dieses Feld ist erforderlich",
-  "create_team.team_url.taken": "This URL <a href=\"https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url\" target=\"_blank\">starts with a reserved word</a> or is unavailable. Please try another.",
+  "create_team.team_url.taken": "Diese URL <a href=\"https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url\" target=\"_blank\">startet mit einem reservierten Wort</a> oder ist nicht verfügbar. Bitte eine andere versuchen.",
   "create_team.team_url.teamUrl": "Team URL",
-  "create_team.team_url.unavailable": "Diese URL ist nicht verfügbar. Bitte eine andere versuchen.",
+  "create_team.team_url.unavailable": "Diese URL ist in Verwendung oder nicht verfügbar. Bitte eine andere versuchen.",
   "create_team.team_url.webAddress": "Wählen Sie die Webadresse für Ihr neues Team:",
   "custom_emoji.empty": "Kein eigenes Emoji gefunden",
   "custom_emoji.header": "Eigenes Emoji",
   "custom_emoji.search": "Suche eigenes Emoji",
-  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
+  "default_channel.purpose": "Senden Sie Nachrichten hier, die jeder sehen können soll. Jeder wird automatisch ein permanentes Mitglied in diesem Kanal wenn Sie dem Team beitreten.",
   "delete_channel.cancel": "Abbrechen",
-  "delete_channel.channel": "Kanal",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Bestätige LÖSCHUNG des Kanals",
   "delete_channel.del": "Löschen",
-  "delete_channel.group": "Gruppe",
+  "delete_channel.group": "group",
   "delete_channel.question": "Dieser Kanal und sein Inhalt wird aus dem Team gelöscht und ist dann für alle Nutzer nicht mehr verfügbar. Sind Sie sich sicher, dass Sie den {term}{display_name} löschen möchten?",
   "delete_post.cancel": "Abbrechen",
   "delete_post.comment": "Kommentar",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "Überschrift bearbeiten",
   "edit_channel_purpose_modal.body": "Beschreiben Sie wie diese(r) {type} genutzt werden soll. Dieser Text erscheint in der Kanalliste im \"Mehr...\" Menü und hilft anderen sich zu entscheiden ob sie beitreten sollen.",
   "edit_channel_purpose_modal.cancel": "Abbrechen",
-  "edit_channel_purpose_modal.channel": "Kanal",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Der Kanalzweck ist zu lang, bitte geben Sie einen kürzeren ein",
-  "edit_channel_purpose_modal.group": "Gruppe",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Speichern",
   "edit_channel_purpose_modal.title1": "Zweck bearbeiten",
   "edit_channel_purpose_modal.title2": "Zweck bearbeiten für ",
@@ -1277,8 +1277,8 @@
   "emoji_list.creator": "Ersteller",
   "emoji_list.delete": "Löschen",
   "emoji_list.delete.confirm.button": "Löschen",
-  "emoji_list.delete.confirm.msg": "This action permanently deletes the custom emoji. Are you sure you want to delete it?",
-  "emoji_list.delete.confirm.title": "Delete Custom Emoji",
+  "emoji_list.delete.confirm.msg": "Diese Aktion wird den benutzerdefinierten Emoji permanent löschen. Sind Sie sich sicher dass sie ihn löschen möchten?",
+  "emoji_list.delete.confirm.title": "Benutzerdefiniertes Emoji löschen",
   "emoji_list.empty": "Kein eigenes Emoji gefunden",
   "emoji_list.header": "Benutzerdefinierte Emoji",
   "emoji_list.help": "Benutzerdefinierte Emojis sind für jeden auf Ihrem Server verfügbar. Die Eingabe von ':' im Nachrichtenfeld öffnet das Emoji Auswahlfenster. Andere Nutzer müssen eventuell die Seite neu laden bevor neue Emojis angezeigt werden.",
@@ -1287,18 +1287,18 @@
   "emoji_list.name": "Name",
   "emoji_list.search": "Suche eigenes Emoji",
   "emoji_list.somebody": "Jemand in einem anderen Team",
-  "emoji_picker.activity": "Activity",
-  "emoji_picker.custom": "Custom",
-  "emoji_picker.emojiPicker": "Emoji Picker",
-  "emoji_picker.flags": "Markieren",
-  "emoji_picker.food": "Food",
-  "emoji_picker.nature": "Nature",
-  "emoji_picker.objects": "Objects",
-  "emoji_picker.people": "People",
-  "emoji_picker.recent": "Recently Used",
+  "emoji_picker.activity": "Aktivität",
+  "emoji_picker.custom": "Benutzerdefiniert",
+  "emoji_picker.emojiPicker": "Emoji Auswahl",
+  "emoji_picker.flags": "Flaggen",
+  "emoji_picker.food": "Essen",
+  "emoji_picker.nature": "Natur",
+  "emoji_picker.objects": "Objekte",
+  "emoji_picker.people": "Leute",
+  "emoji_picker.recent": "Zuletzt verwendet",
   "emoji_picker.search": "Suche",
-  "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel": "Travel",
+  "emoji_picker.symbols": "Symbole",
+  "emoji_picker.travel": "Reisen",
   "error.not_found.link_message": "Zurück zu Mattermost",
   "error.not_found.message": "Die Seite, die Sie versuchten zu erreichen, existiert nicht",
   "error.not_found.title": "Seite nicht gefunden",
@@ -1541,8 +1541,8 @@
   "intro_messages.beginning": "Start von {name}",
   "intro_messages.channel": "Kanal",
   "intro_messages.creator": "Dies ist der Start von {type} {name}, erstellt durch {creator} am {date}.",
-  "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "Private Gruppe",
+  "intro_messages.default": "<h4 class='channel-intro__title'>Start von {display_name}</h4><p class='channel-intro__content'>Willkommen in {display_name}!</strong><br/><br/>Versenden Sie Nachrichten hier, die jeder sehen können soll. Jeder wird automatisch permanentes Mitglied in diesem Kanal sobald er dem Team beitritt.</p>",
+  "intro_messages.group": "Privater Kanal",
   "intro_messages.invite": "Laden Sie andere zu {type} ein",
   "intro_messages.inviteOthers": "Laden Sie andere zu diesem Team ein",
   "intro_messages.noCreator": "Dies ist der Start von {type} {name}, erstellt am {date}.",
@@ -1637,82 +1637,82 @@
   "mfa.setup.step3": "<strong>Schritt 3:</strong> Geben Sie den durch Google Authenticator generierten Code ein",
   "mfa.setupTitle": "Multi-Faktor-Authentifizierung einrichten",
   "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "Copyright 2016 Mattermost, Inc. Alle Rechte vorbehalten",
-  "mobile.about.database": "Database: {type}",
+  "mobile.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. Alle Rechte vorbehalten",
+  "mobile.about.database": "Datenbank: {type}",
   "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
   "mobile.about.serverVersionNoBuild": "Server Version: {version}",
-  "mobile.account.notifications.email.footer": "When offline or away for more than five minutes",
-  "mobile.account_notifications.mentions_footer": "Your username (\"@{username}\") will always trigger mentions.",
-  "mobile.account_notifications.non-case_sensitive_words": "Other non-case sensitive words...",
-  "mobile.account_notifications.reply.header": "Send reply notifications for",
-  "mobile.account_notifications.threads_mentions": "Mentions in threads",
-  "mobile.account_notifications.threads_start": "Threads that I start",
-  "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.account.notifications.email.footer": "Wenn offline oder abwesend für mehr als fünf Minuten",
+  "mobile.account_notifications.mentions_footer": "Ihr Benutzername (\"@{username}\") wird immer eine Nennung auslösen.",
+  "mobile.account_notifications.non-case_sensitive_words": "Weitere nicht groß-/kleinschreibungsabhängige Wörter...",
+  "mobile.account_notifications.reply.header": "Antwort-Benachrichtigungen für",
+  "mobile.account_notifications.threads_mentions": "Nennungen in Antworten",
+  "mobile.account_notifications.threads_start": "Diskussionen die ich starte",
+  "mobile.account_notifications.threads_start_participate": "Diskussionen die ich starte oder an denen ich teilnehme",
+  "mobile.channel_info.alertMessageDeleteChannel": "Sind Sie sicher, dass Sie den {term} {name} verlassen möchten?",
+  "mobile.channel_info.alertMessageLeaveChannel": "Sind Sie sicher, dass Sie den {term} {name} verlassen möchten?",
   "mobile.channel_info.alertNo": "Nein",
-  "mobile.channel_info.alertTitleDeleteChannel": "Lösche {term}",
-  "mobile.channel_info.alertTitleLeaveChannel": "Verlasse {term}",
+  "mobile.channel_info.alertTitleDeleteChannel": "{term} löschen",
+  "mobile.channel_info.alertTitleLeaveChannel": "{term} verlassen",
   "mobile.channel_info.alertYes": "Ja",
-  "mobile.channel_info.privateChannel": "Private Channel",
-  "mobile.channel_info.publicChannel": "Öffentliche Kanäle",
-  "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_info.privateChannel": "Privater Kanal",
+  "mobile.channel_info.publicChannel": "Öffentlicher Kanal",
+  "mobile.channel_list.alertMessageLeaveChannel": "Sind Sie sicher, dass Sie den {term} {name} verlassen möchten?",
   "mobile.channel_list.alertNo": "Nein",
-  "mobile.channel_list.alertTitleLeaveChannel": "Verlasse {term}",
+  "mobile.channel_list.alertTitleLeaveChannel": "{term} verlassen",
   "mobile.channel_list.alertYes": "Ja",
-  "mobile.channel_list.closeDM": "Close Direct Message",
-  "mobile.channel_list.closeGM": "Close Group Message",
+  "mobile.channel_list.closeDM": "Direktnachricht schließen",
+  "mobile.channel_list.closeGM": "Gruppennachricht schließen",
   "mobile.channel_list.dm": "Direktnachricht",
-  "mobile.channel_list.gm": "Group Message",
-  "mobile.channel_list.open": "Open {term}",
-  "mobile.channel_list.openDM": "Open Direct Message",
-  "mobile.channel_list.openGM": "Open Group Message",
-  "mobile.channel_list.privateChannel": "Private Channel",
-  "mobile.channel_list.publicChannel": "Öffentliche Kanäle",
+  "mobile.channel_list.gm": "Gruppennachricht",
+  "mobile.channel_list.open": "{term} öffnen",
+  "mobile.channel_list.openDM": "Direktnachricht öffen",
+  "mobile.channel_list.openGM": "Gruppennachricht öffnen",
+  "mobile.channel_list.privateChannel": "Privater Kanal",
+  "mobile.channel_list.publicChannel": "Öffentlicher Kanal",
   "mobile.components.channels_list_view.yourChannels": "Ihre Kanäle:",
-  "mobile.components.error_list.dismiss_all": "Dismiss All",
-  "mobile.components.select_server_view.continue": "fortfahren",
+  "mobile.components.error_list.dismiss_all": "Alle verwerfen",
+  "mobile.components.select_server_view.continue": "Weiter",
   "mobile.components.select_server_view.enterServerUrl": "Geben Sie die Server-URL ein",
   "mobile.components.select_server_view.proceed": "Fortfahren",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
-  "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
-  "mobile.create_channel.public": "Öffentliche Kanäle",
-  "mobile.custom_list.no_results": "No Results",
-  "mobile.edit_post.title": "Editing Message",
-  "mobile.file_upload.camera": "Take Photo or Video",
-  "mobile.file_upload.library": "Photo Library",
+  "mobile.create_channel": "Erstellen",
+  "mobile.create_channel.private": "Neue private Gruppe",
+  "mobile.create_channel.public": "Neuer Öffentlicher Kanal",
+  "mobile.custom_list.no_results": "Keine Ergebnisse",
+  "mobile.edit_post.title": "Nachricht bearbeiten",
+  "mobile.file_upload.camera": "Ein Foto oder ein Video aufnehmen",
+  "mobile.file_upload.library": "Foto-Bibliothek",
   "mobile.file_upload.more": "Mehr",
-  "mobile.loading_channels": "Loading Channels...",
-  "mobile.loading_members": "Loading Members...",
-  "mobile.loading_posts": "Loading Messages...",
-  "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.loading_channels": "Lade Kanäle...",
+  "mobile.loading_members": "Lade Mitglieder...",
+  "mobile.loading_posts": "Lade Mitteilungen...",
+  "mobile.login_options.choose_title": "Wählen Sie Ihre Anmeldemethode",
   "mobile.post.cancel": "Abbrechen",
-  "mobile.post.delete_question": "Sind Sie sich sicher diese(n) {term} zu löschen?",
-  "mobile.post.delete_title": "Delete Post",
-  "mobile.request.invalid_response": "Received invalid response from the server.",
+  "mobile.post.delete_question": "Möchten Sie diese Nachricht wirklich löschen?",
+  "mobile.post.delete_title": "Nachricht löschen",
+  "mobile.request.invalid_response": "Ungültige Antwort vom Server erhalten.",
   "mobile.routes.channelInfo": "Info",
-  "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
-  "mobile.routes.channelInfo.delete_channel": "Kanal löschen...",
+  "mobile.routes.channelInfo.createdBy": "Erstellt durch {creator} am ",
+  "mobile.routes.channelInfo.delete_channel": "Kanal löschen",
   "mobile.routes.channelInfo.favorite": "Favoriten",
-  "mobile.routes.channel_members.action": "Mitglied entfernen",
-  "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
-  "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
+  "mobile.routes.channel_members.action": "Mitglieder entfernen",
+  "mobile.routes.channel_members.action_message": "Sie müssen mindestens ein Mitglied auswählen.",
+  "mobile.routes.channel_members.action_message_confirm": "Sind Sie sicher, dass Sie die ausgewählten Mitglieder vom Kanal löschen möchten?",
   "mobile.routes.channels": "Kanäle",
   "mobile.routes.enterServerUrl": "Geben Sie die Server-URL ein",
   "mobile.routes.login": "Anmelden",
-  "mobile.routes.loginOptions": "Login Chooser",
+  "mobile.routes.loginOptions": "Loginauswahl",
   "mobile.routes.mfa": "Multi-Faktor-Authentifizierung",
   "mobile.routes.postsList": "Mitteilungsliste",
-  "mobile.routes.saml": "Single SignOn",
+  "mobile.routes.saml": "Single Sign On",
   "mobile.routes.selectTeam": "Team auswählen",
-  "mobile.routes.settings": "Settings",
-  "mobile.routes.thread": "{channelName} Thread",
-  "mobile.routes.thread_dm": "Direct Message Thread",
-  "mobile.routes.user_profile": "Profile",
-  "mobile.routes.user_profile.send_message": "Nachricht versenden",
-  "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
-  "mobile.server_url.invalid_format": "Muss mit http:// oder https:// anfangen",
+  "mobile.routes.settings": "Einstellungen",
+  "mobile.routes.thread": "{channelName} Diskussion",
+  "mobile.routes.thread_dm": "Direktnachrichten-Diskussion",
+  "mobile.routes.user_profile": "Profil",
+  "mobile.routes.user_profile.send_message": "Nachricht senden",
+  "mobile.server_ping_failed": "Kann nicht zum Server verbinden. Bitte überprüfen Sie die Server-URL und Internetverbindung.",
+  "mobile.server_url.invalid_format": "URL muss mit http:// oder https:// beginnen",
   "mobile.settings.team_selection": "Teamauswahl",
   "more_channels.close": "Schließen",
   "more_channels.create": "Neuen Kanal erstellen",
@@ -1748,7 +1748,7 @@
   "navbar.toggle1": "Seitenleiste umschalten",
   "navbar.toggle2": "Seitenleiste umschalten",
   "navbar.viewInfo": "Info anzeigen",
-  "navbar.viewPinnedPosts": "View Pinned Posts",
+  "navbar.viewPinnedPosts": "Zeige angeheftete Nachrichten",
   "navbar_dropdown.about": "Über Mattermost",
   "navbar_dropdown.accountSettings": "Kontoeinstellungen",
   "navbar_dropdown.console": "System Konsole",
@@ -1803,11 +1803,11 @@
   "post_info.mobile.flag": "Markieren",
   "post_info.mobile.unflag": "Demarkieren",
   "post_info.permalink": "Dauerhafter Link",
-  "post_info.pin": "Pin to channel",
-  "post_info.pinned": "Pinned",
+  "post_info.pin": "An Kanal anheften",
+  "post_info.pinned": "angeheftet",
   "post_info.reply": "Antworten",
   "post_info.system": "System",
-  "post_info.unpin": "Un-pin from channel",
+  "post_info.unpin": "Vom Kanal abheften",
   "post_message_view.edited": "(bearbeitet)",
   "posts_view.loadMore": "Weitere Nachrichten laden",
   "posts_view.newMsg": "Neue Nachrichten",
@@ -1860,14 +1860,14 @@
   "rhs_root.mobile.flag": "Markieren",
   "rhs_root.mobile.unflag": "Demarkieren",
   "rhs_root.permalink": "Dauerhafter Link",
-  "rhs_root.pin": "Pin to channel",
-  "rhs_root.unpin": "Un-pin from channel",
+  "rhs_root.pin": "An Kanal anheften",
+  "rhs_root.unpin": "Vom Kanal abheften",
   "search_bar.search": "Suche",
   "search_bar.usage": "<h4>Suchoptionen</h4><ul><li><span>Verwenden Sie </span><b>\"Anführungszeichen\"</b><span> zur Suche nach Phrasen</span></li><li><span>Verwenden Sie </span><b>from:</b><span> um nach Nachrichten eines bestimmten Absenders zu suchen und </span><b>in:</b><span> für Nachrichten in einem bestimmten Kanal</span></li></ul>",
   "search_header.results": "Suchergebnisse",
   "search_header.title2": "Letzte Erwähnungen",
   "search_header.title3": "Markierte Nachrichten",
-  "search_header.title4": "Pinned posts in {channelDisplayName}",
+  "search_header.title4": "Angeheftete Nachrichten im {channelDisplayName}",
   "search_item.direct": "Direktnachricht (mit {username})",
   "search_item.jump": "Anzeigen",
   "search_results.because": "<ul><li>Wenn Sie nach einem Textteil suchen(z.b. suche nach \"rea\", wenn Sie \"Realität\" oder \"Reaktion\" finden möchten), hängen Sie ein * an Ihren Suchbegriff</li><li>Wegen zu vieler Treffer werden Suchen mit nur zwei Buchstaben oder häufigen Wörtern wie \"this\", \"a\" und \"is\" im Suchergebnis nicht angezeigt.</li></ul>",
@@ -1877,10 +1877,10 @@
   "search_results.usageFlag2": "Sie können eine Markierung zu einer Nachricht oder einem Kommentar hinzufügen indem Sie das ",
   "search_results.usageFlag3": " Symbol neben dem Zeitstempel klicken.",
   "search_results.usageFlag4": "Markierungen dienen als Möglichkeit Nachrichten für eine Wiedervorlage zu markieren. Ihre Markierungen sind persönlich und können nicht von anderen Benutzern gesehen werden.",
-  "search_results.usagePin1": "There are no pinned messages yet.",
-  "search_results.usagePin2": "All members of this channel can pin important or useful messages.",
-  "search_results.usagePin3": "Pinned messages are visible to all channel members.",
-  "search_results.usagePin4": "To pin a message: Go to the message that you want to pin and click [...] > \"Pin to channel\".",
+  "search_results.usagePin1": "Es gibt bisher keine angeheftete Nachrichten.",
+  "search_results.usagePin2": "Alle Mitglieder dieses Kanals können wichtige oder nützliche Nachrichten anheften.",
+  "search_results.usagePin3": "Angeheftete Nachrichten sind für alle Kanalmitglieder sichtbar.",
+  "search_results.usagePin4": "Um eine Nachricht anzuheften: Gehen Sie auf die Nachricht welche Sie anheften wollen, klicken auf [...] > \"An Kanal anheften\".",
   "setting_item_max.cancel": "Abbrechen",
   "setting_item_max.save": "Speichern",
   "setting_item_min.edit": "Bearbeiten",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "Keine Datei ausgewählt.",
   "setting_upload.select": "Datei auswählen",
   "sidebar.channels": "Kanäle",
-  "sidebar.createChannel": "Neuen Kanal erstellen",
-  "sidebar.createGroup": "Neue Gruppe erstellen",
+  "sidebar.createChannel": "Erstelle einen öffentlichen Kanal",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "Direktnachricht",
   "sidebar.favorite": "Favoriten",
   "sidebar.more": "Mehr",
   "sidebar.moreElips": "Mehr...",
   "sidebar.otherMembers": "Außerhalb dieses Teams",
-  "sidebar.pg": "Private Gruppen",
+  "sidebar.pg": "Privater Kanal",
   "sidebar.removeList": "Von Liste entfernen",
   "sidebar.tutorialScreen1": "<h4>Kanäle</h4><p><strong>Kanäle</strong> organisieren die Gespräche über verschiedene Themen. Jeder aus dem Team kann beitreten. Zur privaten, direkten Kommunikation nutzen Sie <strong>Direktnachrichten</strong> mit einer anderen Person oder <strong>Private Gruppen</strong> bei mehreren Personen.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" und \"{offtopic}\" Kanäle</h4><p>Hier sind zwei öffentliche Kanäle zum Start:</p><p><strong>{townsquare}</strong> ist ein Platz für Teamweite Kommunikation. Jeder in Ihrem Team ist ein Mitglied dieses Kanals.</p><p><strong>{offtopic}</strong> ist ein Platz fpr Spaß und Unterhaltungen außerhalb von arbeitsrelevanten Kanälen. Sie und Ihr Team können entscheiden welche weiteren Kanäle erstellt werden müssen.</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "Andere Kanäle",
   "suggestion.mention.nonmembers": "Nicht im Kanal",
   "suggestion.mention.special": "Spezielle Erwähnungen",
-  "suggestion.search.private": "Private Gruppen",
+  "suggestion.search.private": "Privater Kanal",
   "suggestion.search.public": "Öffentliche Kanäle",
   "team_export_tab.download": "Download",
   "team_export_tab.export": "Exportieren",
@@ -2055,7 +2055,7 @@
   "upload_overlay.info": "Datei zum Hochladen hier ablegen.",
   "user.settings.advance.embed_preview": "Für den ersten Weblink in einer Nachricht, eine Vorschau des Webseiteninhaltes unterhalb der Nachricht, sofern verfügbar, anzeigen",
   "user.settings.advance.embed_toggle": "Zeige Umschalter für alle eingebetteten Vorschauen",
-  "user.settings.advance.emojipicker": "Enable emoji picker in message input box",
+  "user.settings.advance.emojipicker": "Aktiviere Emoji-Auswahl im Nachrichteneingabefeld",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} aktiviert",
   "user.settings.advance.formattingDesc": "Wenn aktiviert werden Nachrichten formatiert, sodass Links erstellt, Emojis angezeigt, Text formatiert und Zeilenumbrüche hinzugefügt werden. Standardmäßig ist dies aktiviert. Ändern der Einstellung erfordert ein Neuladen der Seite.",
   "user.settings.advance.formattingTitle": "Formatierung von Nachrichten aktivieren",
@@ -2233,7 +2233,7 @@
   "user.settings.notifications.desktop.unlimited": "Unbegrenzt",
   "user.settings.notifications.desktopSounds": "Töne der Desktopbenachrichtigungen",
   "user.settings.notifications.email.disabled": "Deaktiviert durch den Systemadministrator",
-  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
+  "user.settings.notifications.email.disabled_long": "E-Mail-Benachrichtigungen wurden vom Systemadministrator deaktiviert.",
   "user.settings.notifications.email.everyHour": "Jede Stunde",
   "user.settings.notifications.email.everyXMinutes": "{count, plural, one {Jede Minute} other {Alle {count, number} Minuten}}",
   "user.settings.notifications.email.immediately": "Sofort",
@@ -2278,7 +2278,7 @@
   "user.settings.push_notification.send": "Mobile Push-Nachrichten versenden",
   "user.settings.push_notification.status": "Pushnachrichten auslösen wenn",
   "user.settings.push_notification.status_info": "Benachrichtigungen werden nur an Ihr Mobilgerät gesendet wenn Ihr Onlinestatus der oberen Auswahl entspricht.",
-  "user.settings.security.active": "Active",
+  "user.settings.security.active": "Aktiv",
   "user.settings.security.close": "Schließen",
   "user.settings.security.currentPassword": "Aktuelles Passwort",
   "user.settings.security.currentPasswordError": "Bitte geben Sie Ihr aktuelles Passwort ein.",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 4c28126e5..ae902e3f8 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "Save",
   "add_incoming_webhook.cancel": "Cancel",
   "add_incoming_webhook.channel": "Channel",
-  "add_incoming_webhook.channel.help": "Public or private channel that receives the webhook payloads. You must belong to the private channel when setting up the webhook.",
+  "add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
   "add_incoming_webhook.channelRequired": "A valid channel is required",
   "add_incoming_webhook.description": "Description",
   "add_incoming_webhook.description.help": "Description for your incoming webhook.",
@@ -165,7 +165,6 @@
   "admin.cluster.status_table.status": "Status",
   "admin.cluster.status_table.url": "Inter-Node URL",
   "admin.cluster.status_table.version": "Version",
-  "admin.cluster.unknown": "unknown",
   "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
   "admin.compliance.directoryExample": "E.g.: \"./data/\"",
   "admin.compliance.directoryTitle": "Compliance Report Directory:",
@@ -329,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "System Admins",
   "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.",
   "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private channels.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private channel creation for:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private groups.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private group creation for:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "command line tool",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private channels. Deleted channels can be recovered from the database using a {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private channel deletion for:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can rename and set the header or purpose for private channels.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private channel renaming for:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private groups. Deleted groups can be recovered from the database using a {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private group deletion for:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can rename and set the header or purpose for private groups.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group renaming for:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "command line tool",
@@ -388,7 +387,6 @@
   "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
   "admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
-  "admin.image.amazonS3SSLExample": "E.g.: \"true\"",
   "admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
   "admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
   "admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
@@ -693,7 +691,7 @@
   "admin.service.corsTitle": "Enable cross-origin requests from:",
   "admin.service.developerDesc": "When true, JavaScript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "Enable Developer Mode: ",
-  "admin.service.enforceMfaTitle": "Enforce Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
@@ -745,6 +743,7 @@
   "admin.service.webhooksTitle": "Enable Incoming Webhooks: ",
   "admin.service.writeTimeout": "Write Timeout:",
   "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Advanced",
   "admin.sidebar.audits": "Compliance and Auditing",
   "admin.sidebar.authentication": "Authentication",
@@ -774,7 +773,6 @@
   "admin.sidebar.login": "Login",
   "admin.sidebar.logs": "Logs",
   "admin.sidebar.metrics": "Performance Monitoring",
-  "admin.sidebar.mfa": "MFA",
   "admin.sidebar.nativeAppLinks": "Mattermost App Links",
   "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.oauth": "OAuth 2.0",
@@ -786,6 +784,7 @@
   "admin.sidebar.push": "Mobile Push",
   "admin.sidebar.rateLimiting": "Rate Limiting",
   "admin.sidebar.reports": "REPORTING",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Security",
   "admin.sidebar.sessions": "Sessions",
@@ -795,6 +794,7 @@
   "admin.sidebar.statistics": "Team Statistics",
   "admin.sidebar.storage": "Storage",
   "admin.sidebar.support": "Legal and Support",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "Users",
   "admin.sidebar.usersAndTeams": "Users and Teams",
   "admin.sidebar.view_statistics": "Site Statistics",
@@ -834,9 +834,6 @@
   "admin.system_analytics.activeUsers": "Active Users With Posts",
   "admin.system_analytics.title": "the System",
   "admin.system_analytics.totalPosts": "Total Posts",
-  "admin.system_users.allUsers": "All Users",
-  "admin.system_users.noTeams": "No Teams",
-  "admin.system_users.title": "{siteName} Users",
   "admin.team.brandDesc": "Enable custom branding to show an image of your choice, uploaded below, and some help text, written below, on the login page.",
   "admin.team.brandDescriptionExample": "All team communication in one place, searchable and accessible anywhere",
   "admin.team.brandDescriptionHelp": "Description of service shown in login screens and UI. When not specified, \"All team communication in one place, searchable and accessible anywhere\" is displayed.",
@@ -883,6 +880,8 @@
   "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total Posts",
   "admin.true": "true",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Sign-in Method:</strong> Email",
   "admin.user_item.authServiceNotEmail": "<strong>Sign-in Method:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
@@ -903,6 +902,7 @@
   "admin.user_item.resetMfa": "Remove MFA",
   "admin.user_item.resetPwd": "Reset Password",
   "admin.user_item.switchToEmail": "Switch to Email/Password",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Team Admin",
   "admin.user_item.sysAdmin": "System Admin",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
@@ -943,7 +943,7 @@
   "analytics.system.dailyActiveUsers": "Daily Active Users",
   "analytics.system.monthlyActiveUsers": "Monthly Active Users",
   "analytics.system.postTypes": "Posts, Files and Hashtags",
-  "analytics.system.privateGroups": "Private Channels",
+  "analytics.system.privateGroups": "Private Groups",
   "analytics.system.publicChannels": "Public Channels",
   "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Posts with Text-only",
@@ -963,8 +963,7 @@
   "analytics.system.totalWebsockets": "WebSocket Conns",
   "analytics.team.activeUsers": "Active Users With Posts",
   "analytics.team.newlyCreated": "Newly Created Users",
-  "analytics.team.noTeams": "There are no teams on this server for which to view statistics.",
-  "analytics.team.privateGroups": "Private Channels",
+  "analytics.team.privateGroups": "Private Groups",
   "analytics.team.publicChannels": "Public Channels",
   "analytics.team.recentActive": "Recent Active Users",
   "analytics.team.recentUsers": "Recent Active Users",
@@ -997,8 +996,8 @@
   "audit_table.attemptedWebhookDelete": "Attempted to delete a webhook",
   "audit_table.by": " by {username}",
   "audit_table.byAdmin": " by an admin",
-  "audit_table.channelCreated": "Created the {channelName} channel",
-  "audit_table.channelDeleted": "Deleted the channel with the URL {url}",
+  "audit_table.channelCreated": "Created the {channelName} channel/group",
+  "audit_table.channelDeleted": "Deleted the channel/group with the URL {url}",
   "audit_table.establishedDM": "Established a direct message channel with {username}",
   "audit_table.failedExpiredLicenseAdd": "Failed to add a new license as it has either expired or not yet been started",
   "audit_table.failedInvalidLicenseAdd": "Failed to add an invalid license",
@@ -1007,14 +1006,14 @@
   "audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through OAuth",
   "audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions",
   "audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions",
-  "audit_table.headerUpdated": "Updated the {channelName} channel header",
+  "audit_table.headerUpdated": "Updated the {channelName} channel/group header",
   "audit_table.ip": "IP Address",
   "audit_table.licenseRemoved": "Successfully removed a license",
   "audit_table.loginAttempt": " (Login attempt)",
   "audit_table.loginFailure": " (Login failure)",
   "audit_table.logout": "Logged out of your account",
   "audit_table.member": "member",
-  "audit_table.nameUpdated": "Updated the {channelName} channel name",
+  "audit_table.nameUpdated": "Updated the {channelName} channel/group name",
   "audit_table.oauthTokenFailed": "Failed to get an OAuth access token - {token}",
   "audit_table.revokedAll": "Revoked all current sessions for the team",
   "audit_table.sentEmail": "Sent an email to {email} to reset your password",
@@ -1033,9 +1032,9 @@
   "audit_table.updateGlobalNotifications": "Updated your global notification settings",
   "audit_table.updatePicture": "Updated your profile picture",
   "audit_table.updatedRol": "Updated user role(s) to ",
-  "audit_table.userAdded": "Added {username} to the {channelName} channel",
+  "audit_table.userAdded": "Added {username} to the {channelName} channel/group",
   "audit_table.userId": "User ID",
-  "audit_table.userRemoved": "Removed {username} to the {channelName} channel",
+  "audit_table.userRemoved": "Removed {username} to the {channelName} channel/group",
   "audit_table.verified": "Sucessfully verified your email address",
   "authorize.access": "Allow <strong>{appName}</strong> access?",
   "authorize.allow": "Allow",
@@ -1058,29 +1057,32 @@
   "change_url.longer": "URL must be two or more characters.",
   "change_url.noUnderscore": "URL can not contain two underscores in a row.",
   "change_url.startWithLetter": "URL must start with a letter or number.",
-  "change_url.urlLabel": "Channel URL",
   "channelHeader.addToFavorites": "Add to Favorites",
   "channelHeader.removeFromFavorites": "Remove from Favorites",
   "channel_flow.alreadyExist": "A channel with that URL already exists",
   "channel_flow.changeUrlDescription": "Some characters are not allowed in URLs and may be removed.",
-  "channel_flow.changeUrlTitle": "Change Channel URL",
-  "channel_flow.create": "Create Channel",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Create {term}",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
   "channel_flow.invalidName": "Invalid Channel Name",
-  "channel_flow.set_url_title": "Set Channel URL",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "Add Members",
   "channel_header.addToFavorites": "Add to Favorites",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Edit Channel Header",
-  "channel_header.delete": "Delete Channel",
+  "channel_header.delete": "Delete {term}",
   "channel_header.flagged": "Flagged Posts",
-  "channel_header.leave": "Leave Channel",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Leave {term}",
   "channel_header.manageMembers": "Manage Members",
   "channel_header.notificationPreferences": "Notification Preferences",
   "channel_header.recentMentions": "Recent Mentions",
   "channel_header.removeFromFavorites": "Remove from Favorites",
-  "channel_header.rename": "Rename Channel",
-  "channel_header.setHeader": "Edit Channel Header",
-  "channel_header.setPurpose": "Edit Channel Purpose",
+  "channel_header.rename": "Rename {term}",
+  "channel_header.setHeader": "Edit {term} Header",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "View Info",
   "channel_header.viewMembers": "View Members",
   "channel_header.webrtc.call": "Start Video Call",
@@ -1115,24 +1117,26 @@
   "channel_members_modal.addNew": " Add New Members",
   "channel_members_modal.members": " Members",
   "channel_modal.cancel": "Cancel",
-  "channel_modal.createNew": "Create New Channel",
-  "channel_modal.descriptionHelp": "Describe how this channel should be used.",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Create New ",
+  "channel_modal.descriptionHelp": "Describe how this {term} should be used.",
   "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "Edit",
+  "channel_modal.group": "Group",
   "channel_modal.header": "Header",
   "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
-  "channel_modal.headerHelp": "Set text that will appear in the header of the channel beside the channel name. For example, include frequently used links by typing [Link Title](http://example.com).",
-  "channel_modal.modalTitle": "New Channel",
+  "channel_modal.headerHelp": "Set text that will appear in the header of the {term} beside the {term} name. For example, include frequently used links by typing [Link Title](http://example.com).",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "Name",
   "channel_modal.nameEx": "E.g.: \"Bugs\", \"Marketing\", \"客户支持\"",
   "channel_modal.optional": "(optional)",
-  "channel_modal.privateGroup1": "Create a new private channel with restricted membership. ",
-  "channel_modal.privateGroup2": "Create a private channel",
+  "channel_modal.privateGroup1": "Create a new private group with restricted membership. ",
+  "channel_modal.privateGroup2": "Create a private group",
   "channel_modal.publicChannel1": "Create a public channel",
   "channel_modal.publicChannel2": "Create a new public channel anyone can join. ",
   "channel_modal.purpose": "Purpose",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notifications.push": "Send mobile push notifications",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "For all activity",
   "channel_notifications.allUnread": "For all unread messages",
   "channel_notifications.globalDefault": "Global default ({notifyLevel})",
@@ -1227,9 +1231,11 @@
   "custom_emoji.search": "Search Custom Emoji",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "Cancel",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Confirm DELETE Channel",
   "delete_channel.del": "Delete",
-  "delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} channel?",
+  "delete_channel.group": "group",
+  "delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} {term}?",
   "delete_post.cancel": "Cancel",
   "delete_post.comment": "Comment",
   "delete_post.confirm": "Confirm {term} Delete",
@@ -1243,9 +1249,11 @@
   "edit_channel_header_modal.save": "Save",
   "edit_channel_header_modal.title": "Edit Header for {channel}",
   "edit_channel_header_modal.title_dm": "Edit Header",
-  "edit_channel_purpose_modal.body": "Describe how this channel should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.",
+  "edit_channel_purpose_modal.body": "Describe how this {type} should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.",
   "edit_channel_purpose_modal.cancel": "Cancel",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "This channel purpose is too long, please enter a shorter one",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Save",
   "edit_channel_purpose_modal.title1": "Edit Purpose",
   "edit_channel_purpose_modal.title2": "Edit Purpose for ",
@@ -1314,7 +1322,6 @@
   "filtered_channels_list.search": "Search channels",
   "filtered_user_list.any_team": "All Users",
   "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}",
-  "filtered_user_list.countPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}}",
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.member": "Member",
@@ -1537,12 +1544,12 @@
   "intro_messages.channel": "channel",
   "intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "private channel",
+  "intro_messages.group": "private group",
   "intro_messages.invite": "Invite others to this {type}",
   "intro_messages.inviteOthers": "Invite others to this team",
   "intro_messages.noCreator": "This is the start of the {name} {type}, created on {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Beginning of {display_name}</h4><p class=\"channel-intro__content\">This is the start of {display_name}, a channel for non-work-related conversations.<br/></p>",
-  "intro_messages.onlyInvited": " Only invited members can see this private channel.",
+  "intro_messages.onlyInvited": " Only invited members can see this private group.",
   "intro_messages.purpose": " This {type}'s purpose is: {purpose}.",
   "intro_messages.setHeader": "Set a Header",
   "intro_messages.teammate": "This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.",
@@ -1568,7 +1575,7 @@
   "ldap_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
   "ldap_signup.teamName": "Enter name of new team",
   "ldap_signup.team_error": "Please enter a team name",
-  "leave_team_modal.desc": "You will be removed from all public and private channels.  If the team is private you will not be able to rejoin the team.  Are you sure?",
+  "leave_team_modal.desc": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?",
   "leave_team_modal.no": "No",
   "leave_team_modal.title": "Leave the team?",
   "leave_team_modal.yes": "Yes",
@@ -1600,7 +1607,6 @@
   "login.or": "or",
   "login.password": "Password",
   "login.passwordChanged": " Password updated successfully",
-  "login.placeholderOr": " or ",
   "login.session_expired": " Your session has expired. Please login again.",
   "login.signIn": "Sign in",
   "login.signInLoading": "Signing in...",
@@ -1720,8 +1726,8 @@
   "more_channels.title": "More Channels",
   "more_direct_channels.close": "Close",
   "more_direct_channels.message": "Message",
-  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private channel instead.",
-  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private channel instead.",
+  "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
+  "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
   "more_direct_channels.title": "Direct Messages",
   "msg_typing.areTyping": "{users} and {last} are typing...",
   "msg_typing.isTyping": "{user} is typing...",
@@ -1888,18 +1894,18 @@
   "setting_upload.noFile": "No file selected.",
   "setting_upload.select": "Select file",
   "sidebar.channels": "Channels",
-  "sidebar.createChannel": "Create new public channel",
-  "sidebar.createGroup": "Create new private channel",
+  "sidebar.createChannel": "Create new channel",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "Direct Messages",
   "sidebar.favorite": "Favorites",
   "sidebar.more": "More",
   "sidebar.moreElips": "More...",
   "sidebar.otherMembers": "Outside this team",
-  "sidebar.pg": "Private Channels",
+  "sidebar.pg": "Private Groups",
   "sidebar.removeList": "Remove from list",
-  "sidebar.tutorialScreen1": "<h4>Channels</h4><p><strong>Channels</strong> organize conversations across different topics. They’re open to everyone on your team. To send private communications use <strong>Direct Messages</strong> for a single person or <strong>Private Channel</strong> for multiple people.</p>",
+  "sidebar.tutorialScreen1": "<h4>Channels</h4><p><strong>Channels</strong> organize conversations across different topics. They’re open to everyone on your team. To send private communications use <strong>Direct Messages</strong> for a single person or <strong>Private Groups</strong> for multiple people.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" and \"{offtopic}\" channels</h4><p>Here are two public channels to start:</p><p><strong>{townsquare}</strong> is a place for team-wide communication. Everyone in your team is a member of this channel.</p><p><strong>{offtopic}</strong> is a place for fun and humor outside of work-related channels. You and your team can decide what other channels to create.</p>",
-  "sidebar.tutorialScreen3": "<h4>Creating and Joining Channels</h4><p>Click <strong>\"More...\"</strong> to create a new channel or join an existing one.</p><p>You can also create a new channel by clicking the <strong>\"+\" symbol</strong> next to the public or private channel header.</p>",
+  "sidebar.tutorialScreen3": "<h4>Creating and Joining Channels</h4><p>Click <strong>\"More...\"</strong> to create a new channel or join an existing one.</p><p>You can also create a new channel or private group by clicking the <strong>\"+\" symbol</strong> next to the channel or private group header.</p>",
   "sidebar.unreadAbove": "Unread post(s) above",
   "sidebar.unreadBelow": "Unread post(s) below",
   "sidebar_header.tutorial": "<h4>Main Menu</h4><p>The <strong>Main Menu</strong> is where you can <strong>Invite New Members</strong>, access your <strong>Account Settings</strong> and set your <strong>Theme Color</strong>.</p><p>Team administrators can also access their <strong>Team Settings</strong> from this menu.</p><p>System administrators will find a <strong>System Console</strong> option to administrate the entire system.</p>",
@@ -1975,11 +1981,8 @@
   "suggestion.mention.morechannels": "Other Channels",
   "suggestion.mention.nonmembers": "Not in Channel",
   "suggestion.mention.special": "Special Mentions",
-  "suggestion.search.private": "Private Channels",
+  "suggestion.search.private": "Private Groups",
   "suggestion.search.public": "Public Channels",
-  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
-  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total} total",
-  "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total} total",
   "team_export_tab.download": "download",
   "team_export_tab.export": "Export",
   "team_export_tab.exportTeam": "Export your team",
@@ -2034,7 +2037,7 @@
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS and Android",
   "tutorial_intro.next": "Next",
   "tutorial_intro.screenOne": "<h3>Welcome to:</h3><h1>Mattermost</h1><p>Your team communication all in one place, instantly searchable and available anywhere.</p><p>Keep your team connected to help them achieve what matters most.</p>",
-  "tutorial_intro.screenTwo": "<h3>How Mattermost works:</h3><p>Communication happens in public discussion channels, private channels and direct messages.</p><p>Everything is archived and searchable from any web-enabled desktop, laptop or phone.</p>",
+  "tutorial_intro.screenTwo": "<h3>How Mattermost works:</h3><p>Communication happens in public discussion channels, private groups and direct messages.</p><p>Everything is archived and searchable from any web-enabled desktop, laptop or phone.</p>",
   "tutorial_intro.skip": "Skip tutorial",
   "tutorial_intro.support": "Need anything, just email us at ",
   "tutorial_intro.teamInvite": "Invite teammates",
@@ -2360,9 +2363,9 @@
   "webrtc.declined": "Your call has been declined by {username}.",
   "webrtc.disabled": "{username} has WebRTC disabled, and cannot receive calls. To enable the feature, they must go to Account Settings > Advanced > Preview pre-release features and turn on WebRTC.",
   "webrtc.failed": "There was a problem connecting the video call.",
-  "webrtc.hangup": "Hang up",
+  "webrtc.hangup": "Hangup",
   "webrtc.header": "Call with {username}",
-  "webrtc.inProgress": "You have a call in progress. Please hang up first.",
+  "webrtc.inProgress": "You have a call in progress. Please hangup first.",
   "webrtc.mediaError": "Unable to access camera or microphone.",
   "webrtc.mute_audio": "Mute microphone",
   "webrtc.noAnswer": "{username} is not answering the call.",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 1d263748e..fa0312436 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -86,7 +86,7 @@
   "add_emoji.save": "Guardar",
   "add_incoming_webhook.cancel": "Cancelar",
   "add_incoming_webhook.channel": "Canal",
-  "add_incoming_webhook.channel.help": "Canal público o grupo privado que recibe el mensaje del webhook. Debes pertenecer al grupo privado para configurar el webhook.",
+  "add_incoming_webhook.channel.help": "Canal público o privado que recibe el mensaje del webhook. Debes pertenecer al canal privado para configurar el webhook.",
   "add_incoming_webhook.channelRequired": "Es obligatorio asignar un canal válido",
   "add_incoming_webhook.description": "Descripción",
   "add_incoming_webhook.description.help": "Descripción del webhook de entrada.",
@@ -328,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "Administradores de Sistema",
   "admin.general.policy.restrictPostDeleteDescription": "Establecer la política sobre quién tiene permiso para eliminar los mensajes.",
   "admin.general.policy.restrictPostDeleteTitle": "Permitir a los siguientes usuarios borrar los mensajes:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Establece la política de quién puede crear grupos privados.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Habilitar la creación de grupos privados a:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Establece la política de quién puede crear canales privados.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Habilitar creación de canales privados a:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "herramienta de línea de comandos",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Establece la política de quién puede eliminar grupos privados. Los grupos privados eliminados pueden ser recuperados de la base de datos utilizando la {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Habilitar la eliminación de grupos privados a:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Establecer la política sobre quién puede cambiar el nombre, y establecer el encabezado o el propósito de los grupos privados.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Habilitar el cambio de nombre de grupos privados a:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Establece la política de quién puede eliminar canales privados. Los canales eliminados pueden ser recuperados desde la base de datos utilizando la {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Habilitar la eliminación de canales privados a:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Establece la política de quién puede cambiar el nombre, y establecer el encabezado o el propósito de canales privados.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Habilitar el cambio de nombre a canales privados a:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Establece la política de quién puede crear canales públicos.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Habilitar creación de canales públicos a:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "herramienta de línea de comandos",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "Habilitar la procedencia de las solicitudes cruzadas de:",
   "admin.service.developerDesc": "Cuando es verdadero, los errores de JavaScript se muestran en una barra roja en la parte superior de la interfaz de usuario. No se recomienda su uso en producción. ",
   "admin.service.developerTitle": "Habilitar modo de Desarrollador: ",
-  "admin.service.enforcMfaTitle": "Imponer la Autenticación de Múltiples factores:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "Cuando es verdadero, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>la autenticación de múltiples factores</a> es requerida para iniciar sesión. Nuevos usuarios tendrán que configurar MFA cuando se registran. Los usuarios con sesiones iniciadas sin MFA configurado serán enviados a la página de configuración de MFA hasta que la configuración haya sido completada.<br/><br/>Si su sistema tiene usuarios con sesiones iniciadas cuyo métodos son diferentes a AD/LDAP o correo electrónico, La imposición de MFA debe realizarse en el proveedor de autenticación fuera de Mattermost.",
   "admin.service.forward80To443": "Redirigir el puerto 80 a 443:",
   "admin.service.forward80To443Description": "Redirige todo el trafico inseguro del puerto 80 al puerto seguro 443",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "Habilitar Webhooks de Entrada: ",
   "admin.service.writeTimeout": "Tiempo de Espera de Escritura:",
   "admin.service.writeTimeoutDescription": "Si se utiliza HTTP (inseguro), este es el tiempo máximo permitido desde que se termina de leer el encabezado de la solicitud hasta que la respuesta se escribe. Si se utiliza HTTPS, este el el tiempo total desde el momento en que se acepta la conexión hasta que la respuesta es escrita.",
-  "admin.sidebar.addTeamSidebar": "Agregar un equipo el menú lateral",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Avanzado",
   "admin.sidebar.audits": "Auditorías",
   "admin.sidebar.authentication": "Autenticación",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "Push a Móvil",
   "admin.sidebar.rateLimiting": "Límite de Velocidad",
   "admin.sidebar.reports": "INFORMES",
-  "admin.sidebar.rmTeamSidebar": "Remover un equipo del menú lateral",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Seguridad",
   "admin.sidebar.sessions": "Sesiones",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "Estadísticas de Equipo",
   "admin.sidebar.storage": "Almacenamiento",
   "admin.sidebar.support": "Legal y Soporte",
-  "admin.sidebar.teams": "EQUIPOS ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "Usuarios",
   "admin.sidebar.usersAndTeams": "Usuarios y Equipos",
   "admin.sidebar.view_statistics": "Estadísticas del Sitio",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total de Mensajes",
   "admin.true": "verdadero",
-  "admin.userList.title": "Usuarios para {team}",
-  "admin.userList.title2": "Usuarios para {team} ({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Método de inicio de sesión:</strong> Correo electrónico",
   "admin.user_item.authServiceNotEmail": "<strong>Método de inicio de sesión:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Si te degradas a ti mismo de la función de Administrador de Sistema y no hay otro usuario con privilegios de Administrador de Sistema, tendrás que volver a asignar un Administrador del Sistema accediendo al servidor de Mattermost a través de un terminal y ejecutar el siguiente comando.",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "Remover MFA",
   "admin.user_item.resetPwd": "Reiniciar Contraseña",
   "admin.user_item.switchToEmail": "Cambiar a Correo Electrónico/Contraseña",
-  "admin.user_item.sysAdmin": "Admin de Sistema",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Admin de Equipo",
   "admin.webrtc.enableDescription": "Cuando es verdadero, Mattermost permite hacer llamadas de vídeo <strong>uno-a-uno</strong>. Las llamadas con WebRTC están disponibles en Chrome, Firefox y la Aplicación de Escritorio de Mattermost.",
   "admin.webrtc.enableTitle": "Habilitar Mattermost WebRTC: ",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "Usuarios Activos Diarios",
   "analytics.system.monthlyActiveUsers": "Usuarios Activos Mensuales",
   "analytics.system.postTypes": "Mesajes, Archivos y Hashtags",
-  "analytics.system.privateGroups": "Grupos Privados",
+  "analytics.system.privateGroups": "Canales Privados",
   "analytics.system.publicChannels": "Canales Públicos",
   "analytics.system.skippedIntensiveQueries": "Para maximizar el rendimiento, algunas estadísticas están inhabilitadas. Puedes volver a activarlas en el archivo config.json. Ver: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Mensajes de sólo Texto",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "Conexiones por WebSocket",
   "analytics.team.activeUsers": "Usuarios Activos con Mensajes",
   "analytics.team.newlyCreated": "Nuevos Usuarios Creados",
-  "analytics.team.privateGroups": "Grupos Privados",
+  "analytics.team.privateGroups": "Canales Privados",
   "analytics.team.publicChannels": "Canales Públicos",
   "analytics.team.recentActive": "Usuarios Recientemente Activos",
   "analytics.team.recentUsers": "Usuarios Recientemente Activos",
@@ -994,8 +994,8 @@
   "audit_table.attemptedWebhookDelete": "Intento de eliminar un webhook",
   "audit_table.by": " por {username}",
   "audit_table.byAdmin": " por un admin",
-  "audit_table.channelCreated": "Creado el canal/grupo {channelName}",
-  "audit_table.channelDeleted": "Borrado el canal/grupo con el URL {url}",
+  "audit_table.channelCreated": "Creado el canal {channelName}",
+  "audit_table.channelDeleted": "Borrado el canal con el URL {url}",
   "audit_table.establishedDM": "Establecido un canal de mensajes directos con {username}",
   "audit_table.failedExpiredLicenseAdd": "No se pudo agregar una nueva licencia, ya que ha caducado o aún no ha comenzado",
   "audit_table.failedInvalidLicenseAdd": "No se pudo agregar una licencia inválida",
@@ -1004,14 +1004,14 @@
   "audit_table.failedPassword": "Falla al cambiar la contraseña - intento de actualizar la contraseña del usuario que está autenticado a través de OAuth",
   "audit_table.failedWebhookCreate": "Falla al crear un webhook - no tiene permisos en el canal",
   "audit_table.failedWebhookDelete": "Falla al borrar un webhook - condiciones inapropiadas",
-  "audit_table.headerUpdated": "Actualizado el encabezado del canal/grupo {channelName}",
+  "audit_table.headerUpdated": "Actualizado el encabezado del canal {channelName}",
   "audit_table.ip": "Dirección IP",
   "audit_table.licenseRemoved": "Licencia eliminada con éxito",
   "audit_table.loginAttempt": " (intento de inicio de sesión)",
   "audit_table.loginFailure": " (inicio de sesión fallido)",
   "audit_table.logout": "Cerrada la sesión de tu cuenta",
   "audit_table.member": "miembro",
-  "audit_table.nameUpdated": "Actualizado el nombre del canal/grupo {channelName}",
+  "audit_table.nameUpdated": "Actualizado el nombre del canal {channelName}",
   "audit_table.oauthTokenFailed": "Falla al obtener un token de acceso de OAuth - {token}",
   "audit_table.revokedAll": "Revocadas todas las sesiones actuales del equipo",
   "audit_table.sentEmail": "Correo electrónico enviado a {email} para restablecer tu contraseña",
@@ -1030,9 +1030,9 @@
   "audit_table.updateGlobalNotifications": "Actualizada la configuración global de tus notificaciones",
   "audit_table.updatePicture": "Actualizada tu imagen de perfil",
   "audit_table.updatedRol": "Rol(es) de usuario actualizado(s) a ",
-  "audit_table.userAdded": "Agregado {username} al canal/grupo {channelName}",
+  "audit_table.userAdded": "Agregado {username} al canal {channelName}",
   "audit_table.userId": "ID de Usuario",
-  "audit_table.userRemoved": "Removido {username} del canal/grupo {channelName}",
+  "audit_table.userRemoved": "Removido {username} del canal {channelName}",
   "audit_table.verified": "Verificada la dirección de correo electrónico satisfacoriamente",
   "authorize.access": "¿Permitir acceso a <strong>{appName}</strong>?",
   "authorize.allow": "Permitir",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "Quitar de favoritos",
   "channel_flow.alreadyExist": "Un canal con este identificador ya existe",
   "channel_flow.changeUrlDescription": "Algunos caracteres no están permitidos en las URLs y pueden ser removidos.",
-  "channel_flow.changeUrlTitle": "Cambiar URL de {term}",
-  "channel_flow.channel": "Canal",
-  "channel_flow.create": "Crear {term}",
-  "channel_flow.group": "Grupo",
+  "channel_flow.changeUrlTitle": "Cambiar URL del Canal",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Crear Canal",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Dirección URL del canal debe ser de 2 o más caracteres alfanuméricos en minúsculas",
   "channel_flow.invalidName": "Nombre de Canal Inválido",
-  "channel_flow.set_url_title": "Asignar URL de {term}",
+  "channel_flow.set_url_title": "Asignar URL del Canal",
   "channel_header.addMembers": "Agregar Miembros",
   "channel_header.addToFavorites": "Añadir a favoritos",
-  "channel_header.channel": "Canal",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Editar encabezado del canal",
-  "channel_header.delete": "Borrar {term}",
+  "channel_header.delete": "Borrar Canal",
   "channel_header.flagged": "Mensajes Marcados",
-  "channel_header.group": "Grupo",
-  "channel_header.leave": "Abandonar {term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Abandonar Canal",
   "channel_header.manageMembers": "Administrar Miembros",
   "channel_header.notificationPreferences": "Preferencias de Notificación",
   "channel_header.recentMentions": "Menciones recientes",
   "channel_header.removeFromFavorites": "Quitar de favoritos",
-  "channel_header.rename": "Renombrar {term}",
-  "channel_header.setHeader": "Editar encabezado del {term}",
-  "channel_header.setPurpose": "Editar el propósito del {term}",
+  "channel_header.rename": "Renombrar Canal",
+  "channel_header.setHeader": "Editar encabezado del canal",
+  "channel_header.setPurpose": "Editar el propósito del canal",
   "channel_header.viewInfo": "Ver Info",
   "channel_header.viewMembers": "Ver Miembros",
   "channel_header.webrtc.call": "Iniciar llamada de vídeo",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " Agregar nuevos Miembros",
   "channel_members_modal.members": " Miembros",
   "channel_modal.cancel": "Cancelar",
-  "channel_modal.channel": "Canal",
-  "channel_modal.createNew": "Crear Nuevo ",
-  "channel_modal.descriptionHelp": "Describe como este {term} debería ser utilizado.",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Crear Nuevo Canal",
+  "channel_modal.descriptionHelp": "Describe como este canal debería ser utilizado.",
   "channel_modal.displayNameError": "Nombre del canal debe ser de 2 o más caracteres",
   "channel_modal.edit": "Editar",
-  "channel_modal.group": "Grupo",
+  "channel_modal.group": "Group",
   "channel_modal.header": "Encabezado",
   "channel_modal.headerEx": "Ej: \"[Título del enlace](http://example.com)\"",
-  "channel_modal.headerHelp": "Establece el texto que aparecerá en el encabezado del {term} al lado del nombre del {term}. Por ejemplo, incluye enlaces que se usan con frecuencia escribiendo [Título del Enlace](http://example.com).",
-  "channel_modal.modalTitle": "Nuevo ",
+  "channel_modal.headerHelp": "Establece el texto que aparecerá en el encabezado del canal al lado del nombre del canal. Por ejemplo, incluye enlaces que se usan con frecuencia escribiendo [Título del Enlace](http://example.com).",
+  "channel_modal.modalTitle": "Nuevo Canal",
   "channel_modal.name": "Nombre",
   "channel_modal.nameEx": "Ej: \"Errores\", \"Mercadeo\", \"客户支持\"",
   "channel_modal.optional": "(opcional)",
-  "channel_modal.privateGroup1": "Crear un grupo privado con acceso restringido. ",
-  "channel_modal.privateGroup2": "Crear un grupo privado",
+  "channel_modal.privateGroup1": "Crear un canal privado con acceso restringido. ",
+  "channel_modal.privateGroup2": "Crear un canal privado",
   "channel_modal.publicChannel1": "Crear un canal público",
   "channel_modal.publicChannel2": "Crear un canal público al que cualquiera puede unirse. ",
   "channel_modal.purpose": "Propósito",
   "channel_modal.purposeEx": "Ej: \"Un canal para describir errores y mejoras\"",
-  "channel_notification.push": "Enviar notificaciones push móviles",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "Para toda actividad",
   "channel_notifications.allUnread": "Para todos los mensajes sin leer",
   "channel_notifications.globalDefault": "Predeterminada ({notifyLevel})",
@@ -1229,11 +1229,11 @@
   "custom_emoji.search": "Buscar Emoticon Personalizado",
   "default_channel.purpose": "Publica mensajes aquí que quieras que todos vean. Todo el mundo se convierte automáticamente en un miembro permanente de este canal cuando se unan al equipo.",
   "delete_channel.cancel": "Cancelar",
-  "delete_channel.channel": "canal",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Confirmar BORRAR Canal",
   "delete_channel.del": "Borrar",
-  "delete_channel.group": "grupo",
-  "delete_channel.question": "Se eliminará el canal del equipo y hará que su contenido sea inaccesible para todos los usuarios. ¿Está usted seguro de que quiere eliminar el {term} {display_name}?",
+  "delete_channel.group": "group",
+  "delete_channel.question": "Se eliminará el canal del equipo y hará que su contenido sea inaccesible para todos los usuarios. ¿Está usted seguro de que quiere eliminar el canal {display_name}?",
   "delete_post.cancel": "Cancelar",
   "delete_post.comment": "Comentario",
   "delete_post.confirm": "Confirmar Eliminación del {term}",
@@ -1247,11 +1247,11 @@
   "edit_channel_header_modal.save": "Guardar",
   "edit_channel_header_modal.title": "Edita el Encabezado de {channel}",
   "edit_channel_header_modal.title_dm": "Editar Encabezado",
-  "edit_channel_purpose_modal.body": "Describe como este {type} debería ser usado. Este texto aparace en la lista de canales dentro del menú de \"Más...\" y ayuda a otros en decidir si unirse.",
+  "edit_channel_purpose_modal.body": "Describe como este canal debería ser usado. Este texto aparece en la lista de canales dentro del menú de \"Más...\" y ayuda a otros en decidir si deben unirse.",
   "edit_channel_purpose_modal.cancel": "Cancelar",
-  "edit_channel_purpose_modal.channel": "Canal",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "El propósito de este canal es muy largo, por favor ingresa uno más corto",
-  "edit_channel_purpose_modal.group": "Grupo",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Guardar",
   "edit_channel_purpose_modal.title1": "Editar Propósito",
   "edit_channel_purpose_modal.title2": "Editar el Propósito de ",
@@ -1542,12 +1542,12 @@
   "intro_messages.channel": "canal",
   "intro_messages.creator": "Este es el inicio del {type} {name}, creado por {creator} el {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Inicio de {display_name}</h4><p class='channel-intro__content'><strong>Bienvenido a {display_name}!</strong><br/><br/>Publica mensajes aquí que quieras que todos vean. Todo el mundo se convierte automáticamente en un miembro permanente de este canal cuando se unan al equipo.</p>",
-  "intro_messages.group": "grupo privado",
+  "intro_messages.group": "canal privado",
   "intro_messages.invite": "Invita a otros a este {type}",
   "intro_messages.inviteOthers": "Invita a otros a este equipo",
   "intro_messages.noCreator": "Este es el inicio del {type} {name}, creado el  {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Inicio de {display_name}</h4><p class=\"channel-intro__content\">Este es el inicio de {display_name}, un canal para tener conversaciones no relacionadas trabajo.<br/></p>",
-  "intro_messages.onlyInvited": " Sólo miembros invitados pueden ver este grupo privado.",
+  "intro_messages.onlyInvited": " Sólo miembros invitados pueden ver este canal privado.",
   "intro_messages.purpose": " El propósito de este {type} es: {purpose}.",
   "intro_messages.setHeader": "Asignar un Encabezado",
   "intro_messages.teammate": "Este es el inicio de tu historial de mensajes directos con este compañero. Los mensajes directos y archivos que se comparten aquí no son mostrados a personas fuera de esta área.",
@@ -1573,7 +1573,7 @@
   "ldap_signup.length_error": "El nombre debe tener entre 3 y 15 caracteres",
   "ldap_signup.teamName": "Ingresa el nombre del nuevo equipo",
   "ldap_signup.team_error": "Por favor ingresa el nombre del equipo",
-  "leave_team_modal.desc": "Serás removido de todos los canales públicos y grupos privados.  si el equipo es privado no podrás unirte de nuevo al equipo.  ¿Estás seguro?",
+  "leave_team_modal.desc": "Serás removido de todos los canales públicos y privados.  si el equipo es privado no podrás unirte de nuevo al equipo.  ¿Estás seguro?",
   "leave_team_modal.no": "No",
   "leave_team_modal.title": "¿Abandonar Equipo?",
   "leave_team_modal.yes": "Sí",
@@ -1648,7 +1648,7 @@
   "mobile.account_notifications.threads_mentions": "Menciones en hilos",
   "mobile.account_notifications.threads_start": "Hilos que yo comience",
   "mobile.account_notifications.threads_start_participate": "Hilos que yo comience o participe",
-  "mobile.channel_info.alertMessageDeleteChannel": "¿Eliminar el {term} {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "¿Seguro quieres abandonar el {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "¿Seguro quieres abandonar el {term} {name}?",
   "mobile.channel_info.alertNo": "No",
   "mobile.channel_info.alertTitleDeleteChannel": "Eliminar {term}",
@@ -1724,8 +1724,8 @@
   "more_channels.title": "Más Canales",
   "more_direct_channels.close": "Cerrar",
   "more_direct_channels.message": "Mensaje",
-  "more_direct_channels.new_convo_note": "Se iniciará una nueva conversación. Si estás agregando a mucha gente, considera crear un grupo privado en su lugar.",
-  "more_direct_channels.new_convo_note.full": "Haz alcanzado el número máximo de personas para esta conversación. Considera crear un grupo privado en su lugar.",
+  "more_direct_channels.new_convo_note": "Se iniciará una nueva conversación. Si estás agregando a mucha gente, considera crear un canal privado en su lugar.",
+  "more_direct_channels.new_convo_note.full": "Haz alcanzado el número máximo de personas para esta conversación. Considera crear un canal privado en su lugar.",
   "more_direct_channels.title": "Mensajes Directos",
   "msg_typing.areTyping": "{users} y {last} están escribiendo...",
   "msg_typing.isTyping": "{user} está escribiendo...",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "No ha seleccionado un archivo",
   "setting_upload.select": "Selecciona un archivo",
   "sidebar.channels": "Canales",
-  "sidebar.createChannel": "Crear un nuevo canal",
-  "sidebar.createGroup": "Crear un nuevo grupo",
+  "sidebar.createChannel": "Crear nuevo canal público",
+  "sidebar.createGroup": "Crear nuevo canal privado",
   "sidebar.direct": "Mensajes Directos",
   "sidebar.favorite": "Favoritos",
   "sidebar.more": "Más",
   "sidebar.moreElips": "Más...",
   "sidebar.otherMembers": "Fuera de este equipo",
-  "sidebar.pg": "Grupos Privados",
+  "sidebar.pg": "Canales Privados",
   "sidebar.removeList": "Remover de la lista",
   "sidebar.tutorialScreen1": "<h4>Canales</h4><p><strong>Canales</strong> organizan las conversaciones en diferentes tópicos. Son abiertos para cualquier persona de tu equipo. Para enviar comunicaciones privadas con una sola persona utiliza <strong>Mensajes Directos</strong> o con multiples personas utilizando <strong>Grupos Privados</strong>.</p>",
   "sidebar.tutorialScreen2": "<h4>Los canal \"{townsquare}\" y \"{offtopic}\"</h4><p>Estos son dos canales para comenzar:</p><p><strong>{townsquare}</strong> es el lugar para tener comunicación con todo el equipo. Todos los integrantes de tu equipo son miembros de este canal.</p><p><strong>{offtopic}</strong> es un lugar para diversión y humor fuera de los canales relacionados con el trabajo. Tu y tu equipo pueden decidir que otros canales crear.</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "Otros Canales",
   "suggestion.mention.nonmembers": "No en el Canal",
   "suggestion.mention.special": "Menciones especiales",
-  "suggestion.search.private": "Grupos Privados",
+  "suggestion.search.private": "Canal Privado",
   "suggestion.search.public": "Canales Públicos",
   "team_export_tab.download": "descargar",
   "team_export_tab.export": "Exportar",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index a704bb156..c783cdaf8 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -328,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "Administrateurs système",
   "admin.general.policy.restrictPostDeleteDescription": "Définit quels sont les utilisateurs autorisés à supprimer des messages.",
   "admin.general.policy.restrictPostDeleteTitle": "Autorise quels utilisateurs peuvent supprimer des messages :",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Choisit qui peut créer des groupes privés.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Activer la création de groupes privés pour :",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Choisit qui peut créer des canaux publics.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Activer la création de canaux publics pour :",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "outil en ligne de commande",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Choisit qui peut supprimer des groupes privés. Les canaux supprimés peuvent être récupérés de la base de données en utilisant {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Activer la suppression de groupes privés pour :",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Choisit qui peut renommer et définir l'entête ou la description des groupes privés.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Activer le renommage de groupes privés pour :",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Choisit qui peut supprimer des canaux publics. Les canaux supprimés peuvent être récupérés de la base de données en utilisant {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Activer la suppression de canaux publics pour :",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Choisit qui peut renommer et définir l'entête ou la description des canaux publics.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Activer le renommage de canaux publics pour :",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Choisit qui peut créer des canaux publics.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Activer la création de canaux publics pour :",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "outil en ligne de commande",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "Autoriser les requêtes cross-origin depuis :",
   "admin.service.developerDesc": "Si activé, les erreurs Javascript sont affichées dans une barre rouge en haut de l'interface utilisateur. Ceci n'est pas recommandé sur un serveur de production. ",
   "admin.service.developerTitle": "Activer le mode développeur : ",
-  "admin.service.enforcMfaTitle": "Imposer l'authentification multi-facteurs :",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "Lorsqu'activé, l'<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>authentification multi-facteurs (MFA)</a> est requise pour la connexion. Les nouveaux utilisateurs devront configurer MFA lors de leur inscription. Les utilisateurs connectés sans MFA configuré seront redirigés vers la page de configuration MFA jusqu'à ce que la configuration soit terminée.<br/><br/>Si votre système dispose d'utilisateurs se connectant autrement que par AD/LDAP ou une adresse e-mail, MFA devra être appliqué avec un fournisseur d'authentification extérieur à Mattermost.",
   "admin.service.forward80To443": "Rediriger le port 80 sur le port 443 :",
   "admin.service.forward80To443Description": "Faire suivre le trafic non chiffré du port 80 vers le port sécurisé 443",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "Activer les webhooks entrants : ",
   "admin.service.writeTimeout": "Délai d'attente d'écriture :",
   "admin.service.writeTimeoutDescription": "Si vous utilisez HTTP (non sécurisé), il s'agit du temps maximum autorisé à partir du moment où les entêtes sont lus jusqu'au moment où la réponse est écrite. Si vous utilisez le protocole HTTPS, c'est le temps total à partir du moment où la connexion est acceptée jusqu'au moment où la réponse est écrite.",
-  "admin.sidebar.addTeamSidebar": "Afficher l'équipe dans le menu",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Options avancées",
   "admin.sidebar.audits": "Conformité et vérification",
   "admin.sidebar.authentication": "authentification",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "notifications Push",
   "admin.sidebar.rateLimiting": "Limitation de débit",
   "admin.sidebar.reports": "RAPPORTS",
-  "admin.sidebar.rmTeamSidebar": "Ne plus afficher l'équipe dans le menu",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Sécurité",
   "admin.sidebar.sessions": "sessions",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "Statistiques de l'équipe",
   "admin.sidebar.storage": "Stockage",
   "admin.sidebar.support": "Juridique et de soutien",
-  "admin.sidebar.teams": "Equipes ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "Utilisateurs",
   "admin.sidebar.usersAndTeams": "Utilisateur et équipes",
   "admin.sidebar.view_statistics": "Statistiques du serveur",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "Utilisateurs actifs avec messages",
   "admin.team_analytics.totalPosts": "Nombre total de messages",
   "admin.true": "oui",
-  "admin.userList.title": "Utilisateurs de {team}",
-  "admin.userList.title2": "Utilisateurs de {team} ({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Méthode de connexion :</strong> Adresse e-mail",
   "admin.user_item.authServiceNotEmail": "<strong>Méthode de connexion :</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Si vous vous retirez le rôle d'administrateur et qu'il n'y a aucun autre administrateur désigné, vous devrez en désigner un en utilisant les outils en ligne de commande depuis un terminal sur le serveur.",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "supprimer l’identification à facteurs-multiples",
   "admin.user_item.resetPwd": "Réinitialiser le mot de passe",
   "admin.user_item.switchToEmail": "Basculer le type de connexion sur le couple adresse e-mail / mot de passe",
-  "admin.user_item.sysAdmin": "Administrateur système",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Administrateur d'équipe",
   "admin.webrtc.enableDescription": "Lorsqu'activé, Mattermost autorise les appels vidéo en <strong>tête-à-tête</strong>. Les appels par WebRTC sont disponibles sur Chrome, Firefox et les applications Mattermost de bureau.",
   "admin.webrtc.enableTitle": "Activer Mattermost WebRTC :",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "Utilisateurs actifs quotidiens",
   "analytics.system.monthlyActiveUsers": "Utilisateurs actifs mensuels",
   "analytics.system.postTypes": "Messages, fichiers et hashtags",
-  "analytics.system.privateGroups": "Groupes privés",
+  "analytics.system.privateGroups": "Canal privé",
   "analytics.system.publicChannels": "Canaux publics",
   "analytics.system.skippedIntensiveQueries": "Pour optimiser les performances, certaines statistiques ont été désactivées. Vous pouvez les réactiver dans la config.json. Voir : <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Messages texte uniquement",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "Connexions WebSocket",
   "analytics.team.activeUsers": "Nombre d'utilisateurs actifs avec messages",
   "analytics.team.newlyCreated": "Nouveaux utilisateurs",
-  "analytics.team.privateGroups": "Groupes privés",
+  "analytics.team.privateGroups": "Canal privé",
   "analytics.team.publicChannels": "Canaux publics",
   "analytics.team.recentActive": "Utilisateurs actifs récemment",
   "analytics.team.recentUsers": "Utilisateurs actifs récemment",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "Retirer des favoris",
   "channel_flow.alreadyExist": "Il existe déjà un canal avec cette URL",
   "channel_flow.changeUrlDescription": "Certains caractères ne sont pas autorisés dans les URL et doivent être retirés.",
-  "channel_flow.changeUrlTitle": "Changer l'URL {term}",
-  "channel_flow.channel": "Canal",
-  "channel_flow.create": "Créer {term}",
-  "channel_flow.group": "Groupe",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Canal privé",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "L'URL du canal doit comporter au moins 2 caractères alphanumériques minuscules",
   "channel_flow.invalidName": "Nom du canal incorrect",
-  "channel_flow.set_url_title": "Choisir l'URL de {term}",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "Ajouter des membres",
   "channel_header.addToFavorites": "Ajouter aux favoris",
-  "channel_header.channel": "Canal",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Éditer l'entête du canal",
-  "channel_header.delete": "Supprimer {term}",
+  "channel_header.delete": "Supprimer le canal",
   "channel_header.flagged": "Messages marqués d'un indicateur",
-  "channel_header.group": "Groupe",
-  "channel_header.leave": "Quitter {term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Quitter le canal",
   "channel_header.manageMembers": "Gérer les membres",
   "channel_header.notificationPreferences": "Préférences de notification",
   "channel_header.recentMentions": "Mentions récentes",
   "channel_header.removeFromFavorites": "Retirer des favoris",
-  "channel_header.rename": "Renommer le {term}",
-  "channel_header.setHeader": "Éditer l'entête du {term}",
-  "channel_header.setPurpose": "Éditer le descriptif du {term}",
+  "channel_header.rename": "Renommer le canal",
+  "channel_header.setHeader": "Éditer l'entête du canal",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "Informations",
   "channel_header.viewMembers": "Voir les membres",
   "channel_header.webrtc.call": "Démarrer un appel vidéo",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " Ajouter des nouveaux membres",
   "channel_members_modal.members": " Membres",
   "channel_modal.cancel": "Annuler",
-  "channel_modal.channel": "Canal",
-  "channel_modal.createNew": "Créer un nouveau ",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Créer un nouveau canal",
   "channel_modal.descriptionHelp": "Décrit comment ce {term} doit être utilisé.",
-  "channel_modal.displayNameError": "Channel name must be 2 or more characters",
+  "channel_modal.displayNameError": "Le nom du canal doit avoir au moins 2 caractères",
   "channel_modal.edit": "Modifier",
-  "channel_modal.group": "Groupe",
+  "channel_modal.group": "Group",
   "channel_modal.header": "Entête",
   "channel_modal.headerEx": "Ex. : \"[Titre du lien](http://exemple.com)\"",
   "channel_modal.headerHelp": "Définit le texte qui apparaîtra comme entête de {term} en regard du nom du {term}. Par exemple, saisissez des liens fréquemment utilisés en tapant [Lien de titre](http://exemple.com).",
-  "channel_modal.modalTitle": "Nouveau ",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "Nom",
   "channel_modal.nameEx": "Exemple : \"Problèmes\", \"Marketing\", \"Éducation\"",
   "channel_modal.optional": "(facultatif)",
   "channel_modal.privateGroup1": "Crée un nouveau groupe privé avec des membres restreints. ",
-  "channel_modal.privateGroup2": "Créer un groupe privé",
+  "channel_modal.privateGroup2": "Créer un canal public",
   "channel_modal.publicChannel1": "Créer un canal public",
   "channel_modal.publicChannel2": "Crée un canal public que tout le monde peut rejoindre. ",
   "channel_modal.purpose": "Description",
   "channel_modal.purposeEx": "Ex. : \"Un canal pour rapporter des bogues ou des améliorations\"",
-  "channel_notification.push": "Envoyer des notifications push mobiles",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "Pour toute l'activité",
   "channel_notifications.allUnread": "Pour les messages non-lus",
   "channel_notifications.globalDefault": "Par défaut ({notifyLevel})",
@@ -1149,7 +1149,7 @@
   "channel_select.placeholder": "--- Sélectionnez un canal ---",
   "channel_switch_modal.dm": "(Message privé)",
   "channel_switch_modal.failed_to_open": "Impossible d'ouvrir le canal.",
-  "channel_switch_modal.help": "Saisissez le nom du canal. Utilisez ↑ ↓ pour parcourir, TAB pour sélectionner, ↵ pour confirmer, ESC pour rejeter",
+  "channel_switch_modal.help": "Saisissez le nom du canal. Utilisez ↑ ↓ pour parcourir, TAB pour sélectionner, ↵ pour confirmer, ESC pour annuler",
   "channel_switch_modal.not_found": "Aucune correspondance trouvée.",
   "channel_switch_modal.submit": "Basculer",
   "channel_switch_modal.title": "Changer de canal",
@@ -1220,19 +1220,19 @@
   "create_team.team_url.hint": "<li>Courte et facile à retenir</li><li>Utilisez des lettres minuscules, des chiffres et des tirets </li><li>Doit commencer par une lettre et ne peut pas se terminer par un tiret</li>",
   "create_team.team_url.regex": "Utilisez uniquement des lettres minuscules , des chiffres et des tirets. Doit commencer par une lettre et ne peut pas se terminer par un tiret.",
   "create_team.team_url.required": "Ce champ est obligatoire",
-  "create_team.team_url.taken": "This URL <a href=\"https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url\" target=\"_blank\">starts with a reserved word</a> or is unavailable. Please try another.",
+  "create_team.team_url.taken": "Cette URL <a href=\"https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url\" target=\"_blank\">commence par un mot réservé</a> ou est indisponible. Veuillez en spécifier une autre.",
   "create_team.team_url.teamUrl": "URL d’équipe",
-  "create_team.team_url.unavailable": "Cette URL est indisponible. Veuillez en spécifier une autre.",
+  "create_team.team_url.unavailable": "Cette URL est déjà prise ou est indisponible. Veuillez en spécifier une autre.",
   "create_team.team_url.webAddress": "Choisissez l’adresse Web de votre nouvelle équipe :",
   "custom_emoji.empty": "Aucun emoji personnalisé",
   "custom_emoji.header": "Emoji personnalisés",
   "custom_emoji.search": "Rechercher les emoji personnalisés",
-  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
+  "default_channel.purpose": "Publiez ici les messages que vous souhaitez que tout le monde voie. Chaque utilisateur devient un membre permanent de ce canal lorsqu'il rejoint l'équipe.",
   "delete_channel.cancel": "Annuler",
-  "delete_channel.channel": "canal",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Confirmez la SUPPRESSION du canal",
   "delete_channel.del": "Supprimer",
-  "delete_channel.group": "groupe",
+  "delete_channel.group": "group",
   "delete_channel.question": "Ceci va supprimer le canal de l'équipe et rendre son contenu inaccessible de tous les utilisateurs. Voulez-vous vraiment supprimer {display_name} {term} ?",
   "delete_post.cancel": "Annuler",
   "delete_post.comment": "Commentaire",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "Modifier l'entête",
   "edit_channel_purpose_modal.body": "Décrit de quelle manière ce {type} devrait être utilisé. Ce texte apparaît dans la liste des canaux dans le menu \"Suite...\" et guide les personnes pour décider si elles devraient le rejoindre ou non.",
   "edit_channel_purpose_modal.cancel": "Annuler",
-  "edit_channel_purpose_modal.channel": "Canal",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "La description de ce canal est trop longue, veuillez en indiquer une plus courte.",
-  "edit_channel_purpose_modal.group": "Groupe",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Enregistrer",
   "edit_channel_purpose_modal.title1": "Modifier la description",
   "edit_channel_purpose_modal.title2": "Modifier la description de ",
@@ -1277,8 +1277,8 @@
   "emoji_list.creator": "Auteur",
   "emoji_list.delete": "Supprimer",
   "emoji_list.delete.confirm.button": "Supprimer",
-  "emoji_list.delete.confirm.msg": "This action permanently deletes the custom emoji. Are you sure you want to delete it?",
-  "emoji_list.delete.confirm.title": "Delete Custom Emoji",
+  "emoji_list.delete.confirm.msg": "Cette action supprime de façon permanente l'émoticône personnalisée. Voulez-vous vraiment la supprimer ?",
+  "emoji_list.delete.confirm.title": "Supprimer l'émoticône personnalisée",
   "emoji_list.empty": "Aucun emoji personnalisé",
   "emoji_list.header": "Emoticônes personnalisées",
   "emoji_list.help": "Les emoji personnalisés sont disponible pour tous les utilisateurs et apparaissent dans le menu d'autocomplétion des emoji. Il faut rafraîchir la page pour que les nouveaux emoji apparaissent.",
@@ -1287,18 +1287,18 @@
   "emoji_list.name": "Nom",
   "emoji_list.search": "Rechercher les emoji personnalisés",
   "emoji_list.somebody": "Un membre d'une autre équipe",
-  "emoji_picker.activity": "Activity",
-  "emoji_picker.custom": "Custom",
-  "emoji_picker.emojiPicker": "Emoji Picker",
-  "emoji_picker.flags": "Marquer avec un indicateur",
-  "emoji_picker.food": "Food",
+  "emoji_picker.activity": "Activité",
+  "emoji_picker.custom": "Personnalisée",
+  "emoji_picker.emojiPicker": "Sélection d'émoticônes",
+  "emoji_picker.flags": "Indicateurs",
+  "emoji_picker.food": "Nourriture",
   "emoji_picker.nature": "Nature",
-  "emoji_picker.objects": "Objects",
-  "emoji_picker.people": "People",
-  "emoji_picker.recent": "Recently Used",
+  "emoji_picker.objects": "Objets",
+  "emoji_picker.people": "Personnes",
+  "emoji_picker.recent": "Récemment utilisées",
   "emoji_picker.search": "Rechercher",
-  "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel": "Travel",
+  "emoji_picker.symbols": "Symboles",
+  "emoji_picker.travel": "Voyage",
   "error.not_found.link_message": "Retour à Mattermost",
   "error.not_found.message": "La page que vous essayer d'atteindre n'existe pas",
   "error.not_found.title": "Page non trouvée",
@@ -1541,8 +1541,8 @@
   "intro_messages.beginning": "Début de {name}",
   "intro_messages.channel": "canal",
   "intro_messages.creator": "Ceci est le début de {type} {name}, créé par {creator} le {date}.",
-  "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "Groupe privé",
+  "intro_messages.default": "<h4 class='channel-intro__title'>Début de {display_name}</h4><p class='channel-intro__content'><strong>Bienvenue sur {display_name}!</strong><br/><br/>Publiez ici les messages que vous souhaitez que tout le monde voie. Chaque utilisateur devient un membre permanent de ce canal lorsqu'il rejoint l'équipe.</p>",
+  "intro_messages.group": "Canal privé",
   "intro_messages.invite": "Inviter d'autres membres sur ce {type}",
   "intro_messages.inviteOthers": "Inviter d'autres membres dans cette équipe",
   "intro_messages.noCreator": "Ceci est le début de {name} {type}, créé le {date}.",
@@ -1636,84 +1636,84 @@
   "mfa.setup.step2": "<strong>Etape 2 : </strong>Utilisez Google Authenticator pour scanner ce code QR, ou tapez manuellement la clé secrète",
   "mfa.setup.step3": "<strong>Etape 3 : </strong>Entrez le code généré par Google Authenticator",
   "mfa.setupTitle": "Configuration de l'authentification multi-facteurs",
-  "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "Copyright 2016 Mattermost, Inc. Tous droits réservés",
-  "mobile.about.database": "Database: {type}",
-  "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
-  "mobile.about.serverVersionNoBuild": "Server Version: {version}",
-  "mobile.account.notifications.email.footer": "When offline or away for more than five minutes",
-  "mobile.account_notifications.mentions_footer": "Your username (\"@{username}\") will always trigger mentions.",
-  "mobile.account_notifications.non-case_sensitive_words": "Other non-case sensitive words...",
-  "mobile.account_notifications.reply.header": "Send reply notifications for",
-  "mobile.account_notifications.threads_mentions": "Mentions in threads",
-  "mobile.account_notifications.threads_start": "Threads that I start",
-  "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
-  "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.about.appVersion": "Version de l'App : {version} (Build {number})",
+  "mobile.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. Tous droits réservés",
+  "mobile.about.database": "Base de données : {type}",
+  "mobile.about.serverVersion": "Version du serveur : {version} (Build {number})",
+  "mobile.about.serverVersionNoBuild": "Version du serveur : {version}",
+  "mobile.account.notifications.email.footer": "Lorsque hors ligne ou absent de plus de cinq minutes",
+  "mobile.account_notifications.mentions_footer": "Votre nom d'utilisateur (\"@{username}\") déclenchera toujours des mentions.",
+  "mobile.account_notifications.non-case_sensitive_words": "Autres mots non sensibles à la casse...",
+  "mobile.account_notifications.reply.header": "Envoyer des notifications de réponse pour",
+  "mobile.account_notifications.threads_mentions": "Mentions dans les fils de discussion",
+  "mobile.account_notifications.threads_start": "Fils de discussion que je démarre",
+  "mobile.account_notifications.threads_start_participate": "Fils de discussion que je démarre ou auxquels je participe",
+  "mobile.channel_info.alertMessageDeleteChannel": "Voulez-vous vraiment quitter le {term} {name} ?",
+  "mobile.channel_info.alertMessageLeaveChannel": "Voulez-vous vraiment quitter le {term} {name} ?",
   "mobile.channel_info.alertNo": "Non",
   "mobile.channel_info.alertTitleDeleteChannel": "Supprimer {term}",
   "mobile.channel_info.alertTitleLeaveChannel": "Quitter {term}",
   "mobile.channel_info.alertYes": "Oui",
-  "mobile.channel_info.privateChannel": "Private Channel",
-  "mobile.channel_info.publicChannel": "Canaux publics",
-  "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
+  "mobile.channel_info.privateChannel": "Canal privé",
+  "mobile.channel_info.publicChannel": "Canal public",
+  "mobile.channel_list.alertMessageLeaveChannel": "Voulez-vous vraiment quitter le {term} {name} ?",
   "mobile.channel_list.alertNo": "Non",
   "mobile.channel_list.alertTitleLeaveChannel": "Quitter {term}",
   "mobile.channel_list.alertYes": "Oui",
-  "mobile.channel_list.closeDM": "Close Direct Message",
-  "mobile.channel_list.closeGM": "Close Group Message",
+  "mobile.channel_list.closeDM": "Fermer le message privé",
+  "mobile.channel_list.closeGM": "Fermer le groupe de message",
   "mobile.channel_list.dm": "Message privé",
-  "mobile.channel_list.gm": "Group Message",
-  "mobile.channel_list.open": "Open {term}",
-  "mobile.channel_list.openDM": "Open Direct Message",
-  "mobile.channel_list.openGM": "Open Group Message",
-  "mobile.channel_list.privateChannel": "Private Channel",
-  "mobile.channel_list.publicChannel": "Canaux publics",
+  "mobile.channel_list.gm": "Message de groupe",
+  "mobile.channel_list.open": "Ouvrir {term}",
+  "mobile.channel_list.openDM": "Ouvrir le message privé",
+  "mobile.channel_list.openGM": "Ouvrir le message de groupe",
+  "mobile.channel_list.privateChannel": "Canal privé",
+  "mobile.channel_list.publicChannel": "Canal public",
   "mobile.components.channels_list_view.yourChannels": "Vos canaux :",
-  "mobile.components.error_list.dismiss_all": "Dismiss All",
-  "mobile.components.select_server_view.continue": "continuer",
+  "mobile.components.error_list.dismiss_all": "Annuler tout",
+  "mobile.components.select_server_view.continue": "Continuer",
   "mobile.components.select_server_view.enterServerUrl": "Spécifiez l'URL du serveur",
   "mobile.components.select_server_view.proceed": "Continuer",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
-  "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
-  "mobile.create_channel.public": "Canaux publics",
-  "mobile.custom_list.no_results": "No Results",
-  "mobile.edit_post.title": "Editing Message",
-  "mobile.file_upload.camera": "Take Photo or Video",
-  "mobile.file_upload.library": "Photo Library",
+  "mobile.create_channel": "Créer",
+  "mobile.create_channel.private": "Nouveau groupe privé",
+  "mobile.create_channel.public": "Nouveau canal public",
+  "mobile.custom_list.no_results": "Aucun résultat",
+  "mobile.edit_post.title": "Edition du message",
+  "mobile.file_upload.camera": "Prendre une photo ou une vidéo",
+  "mobile.file_upload.library": "Bibliothèque de photos",
   "mobile.file_upload.more": "Plus…",
-  "mobile.loading_channels": "Loading Channels...",
-  "mobile.loading_members": "Loading Members...",
-  "mobile.loading_posts": "Loading Messages...",
-  "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.loading_channels": "Chargement des canaux...",
+  "mobile.loading_members": "Chargement des membres...",
+  "mobile.loading_posts": "Chargement des messages...",
+  "mobile.login_options.choose_title": "Choisissez votre méthode de connexion",
   "mobile.post.cancel": "Annuler",
-  "mobile.post.delete_question": "Voulez-vous vraiment supprimer ce {term} ?",
-  "mobile.post.delete_title": "Delete Post",
-  "mobile.request.invalid_response": "Received invalid response from the server.",
-  "mobile.routes.channelInfo": "Info",
-  "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
-  "mobile.routes.channelInfo.delete_channel": "Supprimer le canal...",
+  "mobile.post.delete_question": "Voulez-vous vraiment supprimer ce message ?",
+  "mobile.post.delete_title": "Supprimer le message",
+  "mobile.request.invalid_response": "Réponse invalide reçue du serveur.",
+  "mobile.routes.channelInfo": "Information",
+  "mobile.routes.channelInfo.createdBy": "Créé par {creator} le ",
+  "mobile.routes.channelInfo.delete_channel": "Supprimer le canal",
   "mobile.routes.channelInfo.favorite": "Favoris",
-  "mobile.routes.channel_members.action": "Supprimer un membre",
-  "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
-  "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
+  "mobile.routes.channel_members.action": "Supprimer des membres",
+  "mobile.routes.channel_members.action_message": "Vous devez sélectionner au moins un membre à supprimer de ce canal.",
+  "mobile.routes.channel_members.action_message_confirm": "Voulez-vous vraiment supprimer les membres sélectionnés du canal ?",
   "mobile.routes.channels": "Canaux",
   "mobile.routes.enterServerUrl": "Spécifiez l'URL du serveur",
   "mobile.routes.login": "Se connecter",
-  "mobile.routes.loginOptions": "Login Chooser",
+  "mobile.routes.loginOptions": "Sélecteur de connexion",
   "mobile.routes.mfa": "Authentification multi-facteurs",
   "mobile.routes.postsList": "Liste des messages",
-  "mobile.routes.saml": "Single SignOn",
+  "mobile.routes.saml": "Authentification unique (SSO)",
   "mobile.routes.selectTeam": "Choisir une équipe",
-  "mobile.routes.settings": "Settings",
-  "mobile.routes.thread": "{channelName} Thread",
-  "mobile.routes.thread_dm": "Direct Message Thread",
-  "mobile.routes.user_profile": "Profile",
+  "mobile.routes.settings": "Paramètres",
+  "mobile.routes.thread": "Fil de discussion de {channelName}",
+  "mobile.routes.thread_dm": "Fil de discussion de message privé",
+  "mobile.routes.user_profile": "Profil",
   "mobile.routes.user_profile.send_message": "Envoyer un message",
-  "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
-  "mobile.server_url.invalid_format": "Doit commencer par http:// ou https://",
-  "mobile.settings.team_selection": "Sélection de l'équipe",
+  "mobile.server_ping_failed": "Impossible de se connecter au serveur. Veuillez vérifier l'URL de votre serveur et votre connexion internet.",
+  "mobile.server_url.invalid_format": "L'URL doit commencer par http:// ou https://",
+  "mobile.settings.team_selection": "Sélection d'équipe",
   "more_channels.close": "Fermer",
   "more_channels.create": "Créer un nouveau canal",
   "more_channels.createClick": "Veuillez cliquer sur \"Créer un nouveau canal\" pour en créer un nouveau",
@@ -1748,7 +1748,7 @@
   "navbar.toggle1": "Basculer la barre latérale",
   "navbar.toggle2": "Basculer la barre latérale",
   "navbar.viewInfo": "Afficher Informations",
-  "navbar.viewPinnedPosts": "View Pinned Posts",
+  "navbar.viewPinnedPosts": "Afficher les messages épinglés",
   "navbar_dropdown.about": "À propos",
   "navbar_dropdown.accountSettings": "Paramètres du compte",
   "navbar_dropdown.console": "Console système",
@@ -1803,11 +1803,11 @@
   "post_info.mobile.flag": "Marquer avec un indicateur",
   "post_info.mobile.unflag": "Supprimer l'indicateur",
   "post_info.permalink": "Lien permanent",
-  "post_info.pin": "Pin to channel",
-  "post_info.pinned": "Pinned",
+  "post_info.pin": "Épingler au canal",
+  "post_info.pinned": "Epinglé",
   "post_info.reply": "Répondre",
   "post_info.system": "Système",
-  "post_info.unpin": "Un-pin from channel",
+  "post_info.unpin": "Désépingler du canal",
   "post_message_view.edited": "(édité)",
   "posts_view.loadMore": "Charger plus de messages",
   "posts_view.newMsg": "Nouveaux messages",
@@ -1860,14 +1860,14 @@
   "rhs_root.mobile.flag": "Ajouter un indicateur",
   "rhs_root.mobile.unflag": "Supprimer l'indicateur",
   "rhs_root.permalink": "Lien permanent",
-  "rhs_root.pin": "Pin to channel",
-  "rhs_root.unpin": "Un-pin from channel",
+  "rhs_root.pin": "Épingler au canal",
+  "rhs_root.unpin": "Désépingler du canal",
   "search_bar.search": "Rechercher",
   "search_bar.usage": "<h4>Options de recherche</h4><ul><li><span>Utilisez </span><b>\"des guillemets\"</b><span> pour rechercher des phrases</span></li><li><span>Utilisez </span><b>from:</b><span> pour rechercher des messages d'utilisateur spécifiques et </span><b>in:</b><span> pour rechercher des messages sur des canaux spécifiques</span></li></ul>",
   "search_header.results": "Résultats de la recherche",
   "search_header.title2": "Mentions récentes",
   "search_header.title3": "Messages marqués d'un indicateur",
-  "search_header.title4": "Pinned posts in {channelDisplayName}",
+  "search_header.title4": "Messages épinglés dans {channelDisplayName}",
   "search_item.direct": "Message privé (avec {username})",
   "search_item.jump": "Aller à",
   "search_results.because": "<ul><li>Pour rechercher une partie d'un mot (ex. rechercher \"réa\" en souhaitant \"réagir\" ou \"réaction\"), ajoutez un * au terme recherché</li><li>En raison du nombre de résultats, les recherches sur deux lettres ou sur les mots communs tels que \"ce\", \"un\" et \"est\" n'apparaîtront pas dans les résultats de la recherche</li></ul>",
@@ -1877,10 +1877,10 @@
   "search_results.usageFlag2": "Vous pouvez marquer un message ou un commentaire en cliquant sur ",
   "search_results.usageFlag3": " l'icône à côté de l'horodateur.",
   "search_results.usageFlag4": "Marquer un message est un bon moyen d'assurer le suivi. Marquer un message est personnel et ne peut être vu par les autres utilisateurs.",
-  "search_results.usagePin1": "There are no pinned messages yet.",
-  "search_results.usagePin2": "All members of this channel can pin important or useful messages.",
-  "search_results.usagePin3": "Pinned messages are visible to all channel members.",
-  "search_results.usagePin4": "To pin a message: Go to the message that you want to pin and click [...] > \"Pin to channel\".",
+  "search_results.usagePin1": "Il n'y a pas encore de messages épinglés.",
+  "search_results.usagePin2": "Tous les membres de ce canal peuvent épingler les messages qu'ils jugent importants ou utiles.",
+  "search_results.usagePin3": "Les messages épinglés sont visibles de tous les membres du canal.",
+  "search_results.usagePin4": "Pour épingler un message : Allez dans le message que vous souhaitez épingler et cliquez sur [...] > \"Épingler au canal\".",
   "setting_item_max.cancel": "Annuler",
   "setting_item_max.save": "Enregistrer",
   "setting_item_min.edit": "Modifier",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "Aucun fichier sélectionné.",
   "setting_upload.select": "Parcourir",
   "sidebar.channels": "Canaux",
-  "sidebar.createChannel": "Créer un nouveau canal",
-  "sidebar.createGroup": "Créer un nouveau groupe",
+  "sidebar.createChannel": "Créer un canal public",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "Messages privés",
   "sidebar.favorite": "Favoris",
   "sidebar.more": "Plus…",
   "sidebar.moreElips": "Plus...",
   "sidebar.otherMembers": "En dehors de l’équipe",
-  "sidebar.pg": "Groupes privés",
+  "sidebar.pg": "Canal privé",
   "sidebar.removeList": "Retirer de la liste",
   "sidebar.tutorialScreen1": "<h4>Canaux</h4><p><strong>Les canaux</strong> organisent les conversations en sujets distincts. Ils sont ouverts à tous les utilisateurs de votre équipe. Pour envoyer des messages privés, utilisez <strong>Messages privés</strong> pour une personne ou <strong>Groupes privés</strong> pour plusieurs personnes.</p>",
   "sidebar.tutorialScreen2": "<h4>Canaux \"{townsquare}\" et \"{offtopic}\"</h4><p>Voici deux canaux publics pour commencer :</p><p><strong>{townsquare}</strong> est l'endroit idéal pour communiquer avec toute l'équipe. Tous les membres de votre équipe sont membres de ce canal.</p><p><strong>{offtopic}</strong> (est l'endroit pour se détendre et parler d'autre chose que du travail. Vous et votre équipe décidez des autres canaux à créer.</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "Autres canaux",
   "suggestion.mention.nonmembers": "Pas dans le canal",
   "suggestion.mention.special": "Mentions spéciales",
-  "suggestion.search.private": "Groupes privés",
+  "suggestion.search.private": "Canal privé",
   "suggestion.search.public": "Canaux publics",
   "team_export_tab.download": "Télécharger",
   "team_export_tab.export": "Exporter",
@@ -2055,7 +2055,7 @@
   "upload_overlay.info": "Faites glisser un fichier pour le télécharger.",
   "user.settings.advance.embed_preview": "Pour le premier lien web dans un message, afficher un aperçu du contenu du site sous le message, si disponible.",
   "user.settings.advance.embed_toggle": "Voir un aperçu pour tous les messages inclus",
-  "user.settings.advance.emojipicker": "Enable emoji picker in message input box",
+  "user.settings.advance.emojipicker": "Activer la possibilité de choisir une émoticône à partir de la zone de composition du message",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Activée",
   "user.settings.advance.formattingDesc": "Si activé, les messages seront formatés pour créer des liens, montrer des emoji, le style du texte et ajouter des sauts de ligne. Par défaut, ce paramètre est activé. La modification de ce paramètre nécessite le rafraîchissement de la page.",
   "user.settings.advance.formattingTitle": "Activé le formatage des messages",
@@ -2233,7 +2233,7 @@
   "user.settings.notifications.desktop.unlimited": "Illimité",
   "user.settings.notifications.desktopSounds": "Sons des notifications",
   "user.settings.notifications.email.disabled": "Désactivé par l'administrateur système",
-  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
+  "user.settings.notifications.email.disabled_long": "Les notifications par e-mail ont été désactivées par votre administrateur système.",
   "user.settings.notifications.email.everyHour": "Toutes les heures",
   "user.settings.notifications.email.everyXMinutes": "Chaque {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.email.immediately": "Immédiatement",
@@ -2278,7 +2278,7 @@
   "user.settings.push_notification.send": "Notifications push mobile",
   "user.settings.push_notification.status": "Déclencher des notifications push lorsque",
   "user.settings.push_notification.status_info": "Les notifications seront envoyées sur votre téléphone uniquement si votre statut en ligne correspond à la sélection ci-dessus.",
-  "user.settings.security.active": "Active",
+  "user.settings.security.active": "Actif",
   "user.settings.security.close": "Quitter",
   "user.settings.security.currentPassword": "Mot de passe actuel",
   "user.settings.security.currentPasswordError": "Veuillez saisir votre mot de passe actuel",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index ee5c5c209..cb9136315 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -328,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "システム管理者",
   "admin.general.policy.restrictPostDeleteDescription": "メッセージを削除できる権限を持つユーザーについてのポリシーを設定してください。",
   "admin.general.policy.restrictPostDeleteTitle": "メッセージの削除ができるユーザー:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "非公開グループの作成ができるユーザーについてのポリシーを設定してください。",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "非公開グループの作成を許可する:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "公開チャンネルの作成ができるユーザーについてのポリシーを設定してください。",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "公開チャンネル作成を許可する:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "コマンドラインツール",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "非公開グループの削除ができるユーザーについてのポリシーを設定してください。削除したグループは {commandLineToolLink} を利用することでデータベースから復元することができます。",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "非公開グループの削除を許可する:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "非公開グループ名の変更やヘッダー・目的の設定ができるユーザーについてのポリシーを設定してください。",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "非公開グループ名の変更を許可する:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "公開チャンネルの削除ができるユーザーについてのポリシーを設定してください。削除されたチャンネルは {commandLineToolLink} を利用することでデータベースから復元することができます。",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "公開チャンネルの削除を許可する:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "公開チャンネル名の変更や、ヘッダー・目的の設定ができるユーザーについてのポリシーを設定してください。",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "公開チャンネル名の変更を許可する許可する:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "公開チャンネルの作成ができるユーザーについてのポリシーを設定してください。",
   "admin.general.policy.restrictPublicChannelCreationTitle": "公開チャンネル作成を許可する:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "コマンドラインツール",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "クロスオリジンリクエストを許可する:",
   "admin.service.developerDesc": "有効にした場合、JavaScriptのエラーはユーザーインターフェイス上部の赤いバーに表示されます。本番環境での使用はお勧めできません。 ",
   "admin.service.developerTitle": "開発者モードを有効にする: ",
-  "admin.service.enforcMfaTitle": "多要素認証を有効にする:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "有効の場合、<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多要素認証</a>がログイン時に求められます。新しいユーザーはサインアップ時に多要素認証の設定を求められます。多要素認証設定なしにログインしているユーザーは設定が完了するまで多要素認証設定ページへリダイレクトされます。<br/><br/>システムにAD/LDAPと電子メール以外のログイン方法のユーザーがいる場合、Mattermostの外部の認証プロバイダーで多要素認証が強制されます。",
   "admin.service.forward80To443": "ポート80の443への転送:",
   "admin.service.forward80To443Description": "ポート80からの安全でない接続を安全なポート443へ転送します",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "内向きのウェブフックを有効にする: ",
   "admin.service.writeTimeout": "Writeタイムアウト:",
   "admin.service.writeTimeoutDescription": "HTTP(安全でない)を使用している場合、これはリクエストヘッダーの読み込みが完了してからレスポンスが書き込まれるまでの上限となる時間です。HTTPSを使用している場合、接続が受け付けられてからレスポンスが書き込まれるまでの合計時間です。",
-  "admin.sidebar.addTeamSidebar": "サイドバーメニューからチームを追加する",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "詳細",
   "admin.sidebar.audits": "コンプライアンスと監査",
   "admin.sidebar.authentication": "認証",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "モバイルプッシュ",
   "admin.sidebar.rateLimiting": "投稿頻度制限",
   "admin.sidebar.reports": "リポート",
-  "admin.sidebar.rmTeamSidebar": "サイドバーメニューからチームを削除する",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "セキュリティー",
   "admin.sidebar.sessions": "セッション",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "チームの統計",
   "admin.sidebar.storage": "ストレージ",
   "admin.sidebar.support": "法的事項とサポート",
-  "admin.sidebar.teams": "チーム ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "ユーザー",
   "admin.sidebar.usersAndTeams": "ユーザーとチーム",
   "admin.sidebar.view_statistics": "システムの使用統計",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "投稿実績のあるアクティブユーザー",
   "admin.team_analytics.totalPosts": "総投稿数",
   "admin.true": "有効",
-  "admin.userList.title": "{team}のユーザー",
-  "admin.userList.title2": "{team}のユーザー({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>サインイン方法:</strong> 電子メール",
   "admin.user_item.authServiceNotEmail": "<strong>サインイン方法:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "システム管理者を辞任する際に、他にシステム管理者の権限を持っているユーザーがいない場合、システム管理者の権限を再設定するには、Mattermostサーバーにターミナルでアクセスし、以下のコマンドを実行してください。",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "多要素認証を削除する",
   "admin.user_item.resetPwd": "パスワードを初期化する",
   "admin.user_item.switchToEmail": "電子メールアドレス/パスワードに切り替える",
-  "admin.user_item.sysAdmin": "システム管理者",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "チーム管理者",
   "admin.webrtc.enableDescription": "有効な場合、Mattermostは<strong>1対1</strong>のビデオ通話を可能にします。WebRTC通話は、ChromeとFirefox、Mattermostデスクトップアプリで利用可能です。",
   "admin.webrtc.enableTitle": "Mattermost WebRTCを有効にする: ",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "日次アクティブユーザー",
   "analytics.system.monthlyActiveUsers": "月次アクティブユーザー",
   "analytics.system.postTypes": "投稿、ファイル、ハッシュタグ",
-  "analytics.system.privateGroups": "非公開グループ",
+  "analytics.system.privateGroups": "非公開チャンネル",
   "analytics.system.publicChannels": "公開チャンネル",
   "analytics.system.skippedIntensiveQueries": "パフォーマンスを最大にするために無効化された統計情報があります。config.jsonで再び有効化にすることができます。<a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>を参照してください。",
   "analytics.system.textPosts": "テキストのみの投稿数",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "ウェブソケット接続",
   "analytics.team.activeUsers": "投稿実績のあるアクティブユーザー",
   "analytics.team.newlyCreated": "新規作成ユーザー数",
-  "analytics.team.privateGroups": "非公開グループ",
+  "analytics.team.privateGroups": "非公開チャンネル",
   "analytics.team.publicChannels": "公開チャンネル",
   "analytics.team.recentActive": "最近のアクティブユーザー数",
   "analytics.team.recentUsers": "最近のアクティブユーザー数",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "お気に入りから削除する",
   "channel_flow.alreadyExist": "このURLを持つチャンネルは既に存在しています",
   "channel_flow.changeUrlDescription": "URLで使用できない文字が使われている場合、削除されます。",
-  "channel_flow.changeUrlTitle": "{term}のURLを変更する",
-  "channel_flow.channel": "チャンネル",
-  "channel_flow.create": "{term}を作成する",
-  "channel_flow.group": "グループ",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "非公開チャンネル",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "チャンネルURLは2文字以上の小文字の英数字にしてください",
   "channel_flow.invalidName": "不正なチャンネル名です",
-  "channel_flow.set_url_title": "{term}のURLを設定する",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "メンバーを追加する",
   "channel_header.addToFavorites": "お気に入りに追加する",
-  "channel_header.channel": "チャンネル",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "チャンネルヘッダーを編集する",
-  "channel_header.delete": "{term}を削除する",
+  "channel_header.delete": "チャンネルを削除する",
   "channel_header.flagged": "フラグの立てられた投稿",
-  "channel_header.group": "グループ",
-  "channel_header.leave": "{term}から出る",
+  "channel_header.group": "Group",
+  "channel_header.leave": "チャンネルから脱退する",
   "channel_header.manageMembers": "メンバーを管理する",
   "channel_header.notificationPreferences": "通知の設定",
   "channel_header.recentMentions": "最近のあなたについての投稿",
   "channel_header.removeFromFavorites": "お気に入りから削除する",
-  "channel_header.rename": "{term}の名前を変更する",
-  "channel_header.setHeader": "{term}ヘッダーを編集する",
-  "channel_header.setPurpose": "{term}の目的を編集する",
+  "channel_header.rename": "チャンネル名を変更する",
+  "channel_header.setHeader": "チャンネルヘッダーを編集する",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "情報を表示する",
   "channel_header.viewMembers": "メンバーを見る",
   "channel_header.webrtc.call": "ビデオ通話の開始",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " 新しいメンバーを追加する",
   "channel_members_modal.members": " メンバー",
   "channel_modal.cancel": "キャンセル",
-  "channel_modal.channel": "チャンネル",
-  "channel_modal.createNew": "新規 ",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "新しいチャンネルを作成する",
   "channel_modal.descriptionHelp": "この{term}がどのように使われるべきか説明してください。",
   "channel_modal.displayNameError": "チャンネル名は2文字以上にしてください",
   "channel_modal.edit": "編集する",
-  "channel_modal.group": "グループ",
+  "channel_modal.group": "Group",
   "channel_modal.header": "ヘッダー",
   "channel_modal.headerEx": "例: \"[Link Title](http://example.com)\"",
   "channel_modal.headerHelp": "{term}名の近くの{term}のヘッダー部分に表示されるテキストを設定してください。例えば、よく入力されるリンク [リンクのタイトル](http://example.com) などを含めてください。",
-  "channel_modal.modalTitle": "新規 ",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "名前",
   "channel_modal.nameEx": "例: \"Bugs\", \"Marketing\", \"客户支持\"",
   "channel_modal.optional": "(オプション)",
   "channel_modal.privateGroup1": "ユーザーを制限した非公開グループを作成します。 ",
-  "channel_modal.privateGroup2": "非公開グループを作成する",
+  "channel_modal.privateGroup2": "公開チャンネルを作成する",
   "channel_modal.publicChannel1": "公開チャンネルを作成する",
   "channel_modal.publicChannel2": "新しい誰でも参加できる公開チャンネルを作成します。 ",
   "channel_modal.purpose": "目的",
   "channel_modal.purposeEx": "例: \"バグや改善を取りまとめるチャンネル\"",
-  "channel_notification.push": "モバイルプッシュ通知を送信する",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "全てのアクティビティーについて",
   "channel_notifications.allUnread": "全ての未読のメッセージについて",
   "channel_notifications.globalDefault": "システム全体のデフォルト({notifyLevel})",
@@ -1229,10 +1229,10 @@
   "custom_emoji.search": "カスタム絵文字を検索",
   "default_channel.purpose": "全員に見てほしいメッセージをここに投稿して下さい。チームに参加すると、全員が自動的にこのチャンネルのメンバーになります。",
   "delete_channel.cancel": "キャンセル",
-  "delete_channel.channel": "チャンネル",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "チャンネルの削除を確認する",
   "delete_channel.del": "削除",
-  "delete_channel.group": "グループ",
+  "delete_channel.group": "group",
   "delete_channel.question": "チームからチャンネルを削除し、全てのユーザーがチャンネルの内容にアクセスできないようになります。本当に {display_name} {term} を削除しますか？",
   "delete_post.cancel": "キャンセル",
   "delete_post.comment": "コメント",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "ヘッダーを編集する",
   "edit_channel_purpose_modal.body": "この{type}をどう使うかを説明してください。このテキストはチャンネル一覧の「詳細」メニューで表示され、他の人が参加するかどうか判断するのに使われます。",
   "edit_channel_purpose_modal.cancel": "キャンセル",
-  "edit_channel_purpose_modal.channel": "チャンネル",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "このチャンネルの目的は長過ぎます。短くしてください",
-  "edit_channel_purpose_modal.group": "グループ",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "保存する",
   "edit_channel_purpose_modal.title1": "目的を編集する",
   "edit_channel_purpose_modal.title2": "目的を編集する。対象: ",
@@ -1541,8 +1541,8 @@
   "intro_messages.beginning": "{name}のはじまり",
   "intro_messages.channel": "チャンネル",
   "intro_messages.creator": "ここは{name} {type}のはじまりです。{date}に{creator}によって作成されました。",
-  "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}の始まり</h4><p class='channel-intro__content'><strong>{display_name}へようこそ!</strong><br/><br/>全員に見てほしいメッセージをここに投稿して下さい。チームに参加すると、全員が自動的にこのチャンネルのメンバーになります。</p>",
-  "intro_messages.group": "非公開グループ",
+  "intro_messages.default": "<h4 class='channel-intro__title'>{display_name}のはじまり</h4><p class='channel-intro__content'><strong>{display_name}へようこそ!</strong><br/><br/>全員に見てほしいメッセージをここに投稿して下さい。チームに参加すると、全員が自動的にこのチャンネルのメンバーになります。</p>",
+  "intro_messages.group": "非公開チャンネル",
   "intro_messages.invite": "他の人をこの{type}に招待する",
   "intro_messages.inviteOthers": "他の人をこのチームに招待する",
   "intro_messages.noCreator": "ここは{name} {type}のはじまりです。{date}に作成されました。",
@@ -1636,11 +1636,11 @@
   "mfa.setup.step2": "<strong>ステップ2: </strong>Google Authenticatorを使ってこのQRコードをスキャン、もしくはシークレットキーを手入力してください",
   "mfa.setup.step3": "<strong>ステップ3: </strong>Google Authenticatorで生成されたコードを入力してください",
   "mfa.setupTitle": "多要素認証設定",
-  "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "Copyright 2016 Mattermost, Inc. All rights reserved",
-  "mobile.about.database": "Database: {type}",
-  "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
-  "mobile.about.serverVersionNoBuild": "Server Version: {version}",
+  "mobile.about.appVersion": "バージョン: {version} (ビルド {number})",
+  "mobile.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. All rights reserved",
+  "mobile.about.database": "データベース: {type}",
+  "mobile.about.serverVersion": "サーバーバージョン: {version} (ビルド {number})",
+  "mobile.about.serverVersionNoBuild": "サーバーバージョン: {version}",
   "mobile.account.notifications.email.footer": "5分以上オフラインか離席中の場合",
   "mobile.account_notifications.mentions_footer": "あなたのユーザー名(\"@{username}\")が常にトリガーとなります。",
   "mobile.account_notifications.non-case_sensitive_words": "他の大文字小文字を区別しない単語...",
@@ -1648,15 +1648,15 @@
   "mobile.account_notifications.threads_mentions": "スレッド内のあなたについての投稿",
   "mobile.account_notifications.threads_start": "自分で開始したスレッド",
   "mobile.account_notifications.threads_start_participate": "開始もしくは参加したスレッド",
-  "mobile.channel_info.alertMessageDeleteChannel": "{name} という名前の {term} を本当に削除しますか?",
-  "mobile.channel_info.alertMessageLeaveChannel": "{name} という名前の {term} から本当に脱退しますか?",
+  "mobile.channel_info.alertMessageDeleteChannel": "{term} {name} から本当に脱退しますか?",
+  "mobile.channel_info.alertMessageLeaveChannel": "{term} {name} から本当に脱退しますか?",
   "mobile.channel_info.alertNo": "いいえ",
   "mobile.channel_info.alertTitleDeleteChannel": "{term} を削除する",
   "mobile.channel_info.alertTitleLeaveChannel": "{term}から脱退する",
   "mobile.channel_info.alertYes": "はい",
   "mobile.channel_info.privateChannel": "非公開チャンネル",
   "mobile.channel_info.publicChannel": "公開チャンネル",
-  "mobile.channel_list.alertMessageLeaveChannel": "{name} という名前の {term} から本当に脱退しますか?",
+  "mobile.channel_list.alertMessageLeaveChannel": "{term} {name} から本当に脱退しますか?",
   "mobile.channel_list.alertNo": "いいえ",
   "mobile.channel_list.alertTitleLeaveChannel": "{term} から脱退する",
   "mobile.channel_list.alertYes": "はい",
@@ -1678,8 +1678,8 @@
   "mobile.create_channel": "作成する",
   "mobile.create_channel.private": "新しい非公開グループ",
   "mobile.create_channel.public": "新しい公開チャンネル",
-  "mobile.custom_list.no_results": "No Results",
-  "mobile.edit_post.title": "Editing Message",
+  "mobile.custom_list.no_results": "該当するものはありません",
+  "mobile.edit_post.title": "メッセージ編集中",
   "mobile.file_upload.camera": "写真もしくはビデオを撮る",
   "mobile.file_upload.library": "フォトライブラリー",
   "mobile.file_upload.more": "もっと",
@@ -1696,8 +1696,8 @@
   "mobile.routes.channelInfo.delete_channel": "チャンネルを削除する",
   "mobile.routes.channelInfo.favorite": "お気に入り",
   "mobile.routes.channel_members.action": "メンバーを削除する",
-  "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
-  "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
+  "mobile.routes.channel_members.action_message": "チャンネルから削除するメンバーを少なくとも一人選択してください。",
+  "mobile.routes.channel_members.action_message_confirm": "本当に選択したメンバーをチャンネルから削除しますか?",
   "mobile.routes.channels": "チャンネル",
   "mobile.routes.enterServerUrl": "サーバーURLを入力してください",
   "mobile.routes.login": "ログイン",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "ファイルが選択されていません。",
   "setting_upload.select": "ファイルを選択してください",
   "sidebar.channels": "チャンネル",
-  "sidebar.createChannel": "新しいチャンネルを作成する",
-  "sidebar.createGroup": "新しいグループを作成する",
+  "sidebar.createChannel": "公開チャンネルを作成する",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "ダイレクトメッセージ",
   "sidebar.favorite": "お気に入り",
   "sidebar.more": "もっと",
   "sidebar.moreElips": "もっと…",
   "sidebar.otherMembers": "このチームの外側",
-  "sidebar.pg": "非公開グループ",
+  "sidebar.pg": "非公開チャンネル",
   "sidebar.removeList": "一覧から削除する",
   "sidebar.tutorialScreen1": "<h4>チャンネル</h4><p><strong>チャンネル</strong>は様々な話題についての会話を扱います。チャンネルはあなたのチームの全員が読み書き可能です。個人的なコミュニケーションには特定の一人との場合には<strong>ダイレクトメッセージ</strong>を、複数の人との場合には<strong>非公開グループ</strong>を使ってください。</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\"と\"{offtopic}\"チャンネル</h4><p>以下は最初にふさわしい2つの公開チャンネルです</p><p><strong>{townsquare}</strong>は、チーム内のコミュニケーションのための場所です、あなたのチームの全員が参加しています。</p><p><strong>{offtopic}</strong>は仕事と関係のない楽しみとユーモアのための場所です。あなたとチームは、他のチャンネルを作るか決めることができます。</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "他のチャンネル",
   "suggestion.mention.nonmembers": "チャンネルにいません",
   "suggestion.mention.special": "特殊な誰かについての投稿",
-  "suggestion.search.private": "非公開グループ",
+  "suggestion.search.private": "非公開チャンネル",
   "suggestion.search.public": "公開チャンネル",
   "team_export_tab.download": "ダウンロードする",
   "team_export_tab.export": "エクスポートする",
@@ -2361,9 +2361,9 @@
   "webrtc.declined": "あなたの通話は{username}によって辞退されました。",
   "webrtc.disabled": "{username}はWebRTCを無効にしているため、通話を受けることができません。この機能を有効にするためには、アカウント設定 > 詳細 > プリリリース機能をプレビューする へ行き、WebRTCをオンにしなくてはなりません。",
   "webrtc.failed": "ビデオ通話の接続に問題があります。",
-  "webrtc.hangup": "中止する",
+  "webrtc.hangup": "切断する",
   "webrtc.header": "{username}との通話",
-  "webrtc.inProgress": "通話中です。現在の通話を中止してください。",
+  "webrtc.inProgress": "通話中です。現在の通話を切断してください。",
   "webrtc.mediaError": "カメラとマイクへのアクセスができません。",
   "webrtc.mute_audio": "マイクをミュートする",
   "webrtc.noAnswer": "{username}が通話に応答しません。",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 6513f5b7b..af93d30bc 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -333,7 +333,7 @@
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "command line tool",
   "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private groups. Deleted groups can be recovered from the database using a {commandLineToolLink}.",
   "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private group deletion for:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for private groups.",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can create, delete, rename, and set the header or purpose for public channels.",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group renaming for:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "CORS 요청 허용:",
   "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "개발자 모드: ",
-  "admin.service.enforcMfaTitle": "Enable Multi-factor Authentication:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "모바일 푸시",
   "admin.sidebar.rateLimiting": "Rate Limiting",
   "admin.sidebar.reports": "보고",
-  "admin.sidebar.rmTeamSidebar": "사이드바 메뉴에서 팀 제거",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "보안",
   "admin.sidebar.sessions": "세션",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "통계",
   "admin.sidebar.storage": "저장소",
   "admin.sidebar.support": "지원",
-  "admin.sidebar.teams": "팀 ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "사용자",
   "admin.sidebar.usersAndTeams": "팀과 사용자",
   "admin.sidebar.view_statistics": "사이트 통계",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "MFA 제거",
   "admin.user_item.resetPwd": "패스워드 리셋",
   "admin.user_item.switchToEmail": "이메일/패스워드로 변경",
-  "admin.user_item.sysAdmin": "시스템 관리자",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "팀 관리자",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Mattermost WebRTC: ",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "Daily Active Users",
   "analytics.system.monthlyActiveUsers": "Monthly Active Users",
   "analytics.system.postTypes": "글, 파일, 해시태그",
-  "analytics.system.privateGroups": "비공개 그룹",
+  "analytics.system.privateGroups": "Private Groups",
   "analytics.system.publicChannels": "공개 채널",
   "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "텍스트 글 수",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "웹소켓 연결",
   "analytics.team.activeUsers": "활성 사용자 (글 작성 기준)",
   "analytics.team.newlyCreated": "Newly Created Users",
-  "analytics.team.privateGroups": "비공개 그룹",
+  "analytics.team.privateGroups": "Private Groups",
   "analytics.team.publicChannels": "공개 채널",
   "analytics.team.recentActive": "Recent Active Users",
   "analytics.team.recentUsers": "Recent Active Users",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "즐겨찾기에서 제거",
   "channel_flow.alreadyExist": "이미 존재하는 채널 URL입니다.",
   "channel_flow.changeUrlDescription": "일부 URL로 사용할 수 없는 문자들은 제거될 수 있습니다.",
-  "channel_flow.changeUrlTitle": "{term} URL 변경",
-  "channel_flow.channel": "채널",
-  "channel_flow.create": "{term} 생성",
-  "channel_flow.group": "그룹",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "채널 떠나기",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
   "channel_flow.invalidName": "잘못된 채널 이름",
-  "channel_flow.set_url_title": "{term} URL 설정",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "회원 추가",
   "channel_header.addToFavorites": "즐겨찾기에 추가",
-  "channel_header.channel": "채널",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "채널 헤더 설정",
-  "channel_header.delete": "{term} 삭제...",
+  "channel_header.delete": "채널 삭제",
   "channel_header.flagged": "중요 메시지",
-  "channel_header.group": "그룹",
-  "channel_header.leave": "{term} 떠나기",
+  "channel_header.group": "Group",
+  "channel_header.leave": "채널 떠나기",
   "channel_header.manageMembers": "회원 관리",
   "channel_header.notificationPreferences": "알림 설정",
   "channel_header.recentMentions": "최근 멘션",
   "channel_header.removeFromFavorites": "즐겨찾기에서 제거",
-  "channel_header.rename": "{term}의 이름을 변경...",
-  "channel_header.setHeader": "{term}의 헤더 설정...",
-  "channel_header.setPurpose": "{term}의 설명 설정...",
+  "channel_header.rename": "채널 이름 변경",
+  "channel_header.setHeader": "채널 헤더 설정",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "정보 보기",
   "channel_header.viewMembers": "회원 보기",
   "channel_header.webrtc.call": "영상 통화 시작하기",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " 새로운 회원 추가",
   "channel_members_modal.members": " 회원",
   "channel_modal.cancel": "취소",
-  "channel_modal.channel": "채널",
-  "channel_modal.createNew": "새로운 ",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "새로 만들기",
   "channel_modal.descriptionHelp": "{term}은 이렇게 사용되어야 합니다.",
   "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "편집",
-  "channel_modal.group": "그룹",
+  "channel_modal.group": "Group",
   "channel_modal.header": "헤더",
   "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
   "channel_modal.headerHelp": "{term} 상단 이름 옆에 표시될 텍스트를 입력하세요. 예를 들면, 다음과 같이 자주 사용되는 링크를 등록할 수 있습니다. [링크](http://example.com).",
-  "channel_modal.modalTitle": "새로운 ",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "이름",
   "channel_modal.nameEx": "예시: \"버그\", \"마케팅\", \"고객지원\"",
   "channel_modal.optional": "(선택사항)",
   "channel_modal.privateGroup1": "일부 회원만 접근할 수 있는 비공개 그룹을 만듭니다. ",
-  "channel_modal.privateGroup2": "비공개 그룹 만들기",
+  "channel_modal.privateGroup2": "공개 채널 만들기",
   "channel_modal.publicChannel1": "공개 채널 만들기",
   "channel_modal.publicChannel2": "누구나 참여할 수 있는 새 공개 채널을 만듭니다. ",
   "channel_modal.purpose": "설명",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notification.push": "알림 받기",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "모든 활동",
   "channel_notifications.allUnread": "모든 읽지않은 메시지",
   "channel_notifications.globalDefault": "전역 기본 설정 ({notifyLevel})",
@@ -1229,10 +1229,10 @@
   "custom_emoji.search": "커스텀 이모티콘 검색",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "취소",
-  "delete_channel.channel": "채널",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "채널 삭제 확인",
   "delete_channel.del": "삭제",
-  "delete_channel.group": "그룹",
+  "delete_channel.group": "group",
   "delete_channel.question": "정말 {display_name} {term}을 삭제하시겠습니까?",
   "delete_post.cancel": "취소",
   "delete_post.comment": "답글",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "헤더 편집",
   "edit_channel_purpose_modal.body": "{type}(이)가 어떻게 사용되어야 하는지 설명하세요. 이 설명은 채널 목록의 \"더 보기...\"에서 가입을 위한 도움말로 표시됩니다.",
   "edit_channel_purpose_modal.cancel": "취소",
-  "edit_channel_purpose_modal.channel": "채널",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "채널 설명이 너무 깁니다. 더 짧은 채널 설명을 사용하세요.",
-  "edit_channel_purpose_modal.group": "그룹",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "저장",
   "edit_channel_purpose_modal.title1": "설명 편집",
   "edit_channel_purpose_modal.title2": "설명 편집: ",
@@ -1542,7 +1542,7 @@
   "intro_messages.channel": "채널",
   "intro_messages.creator": "{name} {type}입니다. 만들어진 날짜: {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "비공개 그룹",
+  "intro_messages.group": "private group",
   "intro_messages.invite": "{type}에 사용자 초대하기",
   "intro_messages.inviteOthers": "팀에 사용자 초대하기",
   "intro_messages.noCreator": "{name} {type}입니다. 만들어진 날짜: {date}.",
@@ -1648,7 +1648,7 @@
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "정말 {term}을 삭제하시겠습니까?",
   "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
   "mobile.channel_info.alertNo": "아니요",
   "mobile.channel_info.alertTitleDeleteChannel": "{term} 삭제...",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "파일이 선택되지 않았습니다.",
   "setting_upload.select": "파일 선택",
   "sidebar.channels": "채널",
-  "sidebar.createChannel": "채널 생성하기",
-  "sidebar.createGroup": "그룹 생성하기",
+  "sidebar.createChannel": "공개 채널 만들기",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "개인 메시지",
   "sidebar.favorite": "즐겨찾기",
   "sidebar.more": "더 보기",
   "sidebar.moreElips": "더 보기...",
   "sidebar.otherMembers": "팀 외부",
-  "sidebar.pg": "비공개 그룹",
+  "sidebar.pg": "Private Groups",
   "sidebar.removeList": "목록에서 제거",
   "sidebar.tutorialScreen1": "<h4>채널</h4><p><strong>채널</strong>을 통해 주제별로 대화를 구성합니다. 팀의 모든 일원에게 공개되어 있습니다. 공개하고 싶지 않은 메시지는 <strong>개인 메시지</strong>나 <strong>비공개 그룹</strong>으로 전달할 수 있습니다. </p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" 와 \"{offtopic}\" 채널</h4><p>두 채널과 함께 시작합니다:</p><p><strong>{townsquare}</strong>(은)는 팀 전체의 소통을 위한 공간입니다. 모든 팀의 구성원들이 확인할 수 있습니다.</p><p><strong>{offtopic}</strong> 비업무 대화를 위한 공간입니다. 당신의 팀에 어떤 채널을 만들고 운영할지 결정할 수 있습니다.</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "Other Channels",
   "suggestion.mention.nonmembers": "Not in Channel",
   "suggestion.mention.special": "Special Mentions",
-  "suggestion.search.private": "비공개 그룹",
+  "suggestion.search.private": "Private Groups",
   "suggestion.search.public": "공개 채널",
   "team_export_tab.download": "다운로드",
   "team_export_tab.export": "내보내기",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index c4c59658d..f3b3679a7 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -333,7 +333,7 @@
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "command line tool",
   "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private groups. Deleted groups can be recovered from the database using a {commandLineToolLink}.",
   "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private group deletion for:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Zet een policy aan wie er kan maken, verwijderen, hernoemen en de header instellen bij gebruik van privé groepen.",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Stel in wie publieke kanalen kan maken, verwijderen, hernoemen, en de koptekst en het doel ervan instellen.",
   "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group renaming for:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "Cross-origin Requests toestaan van:",
   "admin.service.developerDesc": "Javascript fout worden weergeven in een rode bar boven in de user interface. Niet aangeraden voor productie.",
   "admin.service.developerTitle": "Developer mode inschakelen: ",
-  "admin.service.enforcMfaTitle": "Aanzetten multi-factor authenticatie:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "Inschakelen inkomende webhooks: ",
   "admin.service.writeTimeout": "Write Timeout:",
   "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
-  "admin.sidebar.addTeamSidebar": "Voeg een team toe van de navigatiekolom",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Geavanceerd",
   "admin.sidebar.audits": "Compliance en Auditing",
   "admin.sidebar.authentication": "Authenticatie",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "Mobiele meldingen",
   "admin.sidebar.rateLimiting": "Snelheidsbeperking",
   "admin.sidebar.reports": "RAPPORTEREN",
-  "admin.sidebar.rmTeamSidebar": "Verwijder een team van de navigatiekolom",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Beveiliging",
   "admin.sidebar.sessions": "Sessies",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "Actieve gebruikers met berichten",
   "admin.team_analytics.totalPosts": "Totaal aantal berichten",
   "admin.true": "ingeschakeld",
-  "admin.userList.title": "Gebruikers van {team}",
-  "admin.userList.title2": "Gebruikers van {team} ({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": ", <strong>Aanmeld-methode:</strong> Email",
   "admin.user_item.authServiceNotEmail": ", <strong>Aanmeld-methode:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Als je jezelf degradeert vanaf de System Admin rol en er is geen andere gebruiker met de System Admin rechten, zal je jezelf System Admin moeten maken door in te loggen op de Mattermost server en het volgende commando uit te voeren.",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "Verwijder MFA",
   "admin.user_item.resetPwd": "Reset wachtwoord",
   "admin.user_item.switchToEmail": "Overschakelen naar e-mail/wachtwoord",
-  "admin.user_item.sysAdmin": "Systeem beheerder",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Team beheerder",
   "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Aanzetten Mattermost WebRTC: ",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "Daily Active Users",
   "analytics.system.monthlyActiveUsers": "Monthly Active Users",
   "analytics.system.postTypes": "Berichten, bestanden en hashtags",
-  "analytics.system.privateGroups": "Privé groepen",
+  "analytics.system.privateGroups": "Private Groups",
   "analytics.system.publicChannels": "Publieke kanalen",
   "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Berichten met enkel tekst",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "WebSocket Conns",
   "analytics.team.activeUsers": "Actieve gebruikers met berichten",
   "analytics.team.newlyCreated": "Nieuw gemaakte gebruikers",
-  "analytics.team.privateGroups": "Privé groepen",
+  "analytics.team.privateGroups": "Private Groups",
   "analytics.team.publicChannels": "Publieke kanalen",
   "analytics.team.recentActive": "Recent actieve gebruikers",
   "analytics.team.recentUsers": "Recent actieve gebruikers",
@@ -1059,26 +1059,26 @@
   "channelHeader.removeFromFavorites": "Remove from Favorites",
   "channel_flow.alreadyExist": "Een kanaal met die URL bestaat reeds",
   "channel_flow.changeUrlDescription": "Sommige tekens zijn ongeldig in een URL en worden verwijderd.",
-  "channel_flow.changeUrlTitle": "Bewerk {term} URL",
-  "channel_flow.channel": "Kanaal",
-  "channel_flow.create": "Maak {term} URL aan",
-  "channel_flow.group": "Groep",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Verlaat kanaal",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Kanaal URL moet 2 of meer kleine alfanumerieke karakters bevatten",
   "channel_flow.invalidName": "Ongeldige kanaal naam",
-  "channel_flow.set_url_title": "Instelling {term} URL",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "Leden toevoegen",
   "channel_header.addToFavorites": "Add to Favorites",
-  "channel_header.channel": "Kanaal",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Edit Channel Header",
-  "channel_header.delete": "Verwijder {term}...",
+  "channel_header.delete": "Verwijder kanaal...",
   "channel_header.flagged": "Gemarkeerde Berichten",
-  "channel_header.group": "Groep",
-  "channel_header.leave": "Verlaat {term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Verlaat kanaal",
   "channel_header.manageMembers": "Leden beheren",
   "channel_header.notificationPreferences": "Meldings-voorkeuren",
   "channel_header.recentMentions": "Recente vermeldingen",
   "channel_header.removeFromFavorites": "Remove from Favorites",
-  "channel_header.rename": "Hernoem {term}...",
+  "channel_header.rename": "Hernoem kanaal...",
   "channel_header.setHeader": "Edit {term} Header",
   "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "Bekijk informatie",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": "Leden toevoegen",
   "channel_members_modal.members": " Leden",
   "channel_modal.cancel": "Annuleren",
-  "channel_modal.channel": "Kanaal",
-  "channel_modal.createNew": "Maak nieuw ",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Maak een nieuw kanaal",
   "channel_modal.descriptionHelp": "Beschrijf hoe deze {term} gebruikt moet worden.",
   "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "Bewerken",
-  "channel_modal.group": "Groep",
+  "channel_modal.group": "Group",
   "channel_modal.header": "Kop",
   "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
   "channel_modal.headerHelp": "Geef de tekst die zal verschijnen in het hoofd van de {term} naast de {term} naam. Bijvoorbeeld, veelgebruikte links door het opgeven van [Link Titel](http://example.com).",
-  "channel_modal.modalTitle": "Nieuw ",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "Naam",
   "channel_modal.nameEx": "Bijv.: \"Bugs\", \"Marketing\", \"客户支持\"",
   "channel_modal.optional": "(optioneel)",
   "channel_modal.privateGroup1": "Maak een nieuwe privé groep met beperkt lidmaatschap. ",
-  "channel_modal.privateGroup2": "Maak een privé groep",
+  "channel_modal.privateGroup2": "Maak een publiek kanaal",
   "channel_modal.publicChannel1": "Maak een publiek kanaal",
   "channel_modal.publicChannel2": "Maak een publiek kanaal waar iedereen lid van kan worden. ",
   "channel_modal.purpose": "Doel",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notification.push": "Stuur mobiele push notificaties",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "Voor alle activiteiten",
   "channel_notifications.allUnread": "Voor alle ongelezen berichten",
   "channel_notifications.globalDefault": "Globale standaard ({notifyLevel})",
@@ -1229,10 +1229,10 @@
   "custom_emoji.search": "Zoek custom Emoji",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "Annuleren",
-  "delete_channel.channel": "kanaal",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Bevestig het WISSEN van het kanaal",
   "delete_channel.del": "Verwijderen",
-  "delete_channel.group": "groep",
+  "delete_channel.group": "group",
   "delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} {term}?",
   "delete_post.cancel": "Annuleren",
   "delete_post.comment": "Commentaar",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "Koptekst bewerken",
   "edit_channel_purpose_modal.body": "Omschrijf hoe dit {type} zal worden gebruikt. Deze tekst word zichtbaar in de kanalen lijst in het \"Meer...\" menu en zal anderen helpen te beslissen of zij willen joinen.",
   "edit_channel_purpose_modal.cancel": "Annuleren",
-  "edit_channel_purpose_modal.channel": "Kanaal",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Het kanaaldoel is te lang, gelieve een kortere tekst in te geven",
-  "edit_channel_purpose_modal.group": "Groep",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Opslaan",
   "edit_channel_purpose_modal.title1": "Bewerk doel",
   "edit_channel_purpose_modal.title2": "Doeleinden bewerken voor ",
@@ -1542,7 +1542,7 @@
   "intro_messages.channel": "kanaal",
   "intro_messages.creator": "Dit is de start van {name} {type}, gemaakt door {creator} op {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "privé groep",
+  "intro_messages.group": "private group",
   "intro_messages.invite": "Nodig anderen uit voor: {type}",
   "intro_messages.inviteOthers": "Nodig anderen uit voor dit team",
   "intro_messages.noCreator": "Dit is de start van {name} {type}, gemaakt op {date}.",
@@ -1648,7 +1648,7 @@
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Weet u zeker dat u deze {term} wilt verwijderen?",
   "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
   "mobile.channel_info.alertNo": "Nee",
   "mobile.channel_info.alertTitleDeleteChannel": "Verwijder {term}...",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "Geen bestand geselecteerd.",
   "setting_upload.select": "Selecteer een bestand",
   "sidebar.channels": "Kanalen",
-  "sidebar.createChannel": "Maak een nieuw kanaal",
-  "sidebar.createGroup": "Maak een nieuwe groep",
+  "sidebar.createChannel": "Maak een publiek kanaal",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "Privé berichten",
   "sidebar.favorite": "Favorites",
   "sidebar.more": "Meer",
   "sidebar.moreElips": "Meer...",
   "sidebar.otherMembers": "Buiten dit team",
-  "sidebar.pg": "Privé groepen",
+  "sidebar.pg": "Private Groups",
   "sidebar.removeList": "Uit de lijst verwijderen",
   "sidebar.tutorialScreen1": "<h4>Kanalen</h4><p><strong>Kanalen</strong> organiseren conversaties in verschillende onderwerpen. Ze zijn open voor iedereen in je team. Om privéberichten te sturen, gebruik <strong>Directe Berichten</strong> voor een enkel persoon of <strong>Privé Groepen</strong> voor meerdere personen.</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\" en \"{offtopic}\" kanalen</h4><p>Hier zijn 2 publieke kanalen om te starten:</p><p><strong>{townsquare}</strong> is een plaats voor team wijde communicatie. Iedereen in jouw team is lid van dit kanaal.</p><p><strong>{offtopic}</strong> is een plaats voor ontspanning en humor buiten werk gerelateerde zaken en kanalen. Jij en jouw team kunnen beslissen wel andere kanalen er gemaakt moeten worden.</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "Andere Kanalen",
   "suggestion.mention.nonmembers": "Niet in kanaal",
   "suggestion.mention.special": "Speciale Vermeldingen",
-  "suggestion.search.private": "Privé groepen",
+  "suggestion.search.private": "Private Groups",
   "suggestion.search.public": "Publieke kanalen",
   "team_export_tab.download": "downloaden",
   "team_export_tab.export": "Exporteer",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index cfba81127..2246585c7 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -328,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "Administrador de Sistema",
   "admin.general.policy.restrictPostDeleteDescription": "Define a política de quem tem permissão para deletar mensagens.",
   "admin.general.policy.restrictPostDeleteTitle": "Permitir quais usuários a deletar mensagens:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Define a política sobre quem pode criar grupos privados.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Ativar a criação de grupos privados para:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Definir política sobre quem pode criar canais públicos.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Ativar a criação de canais públicos para:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "ferramenta de linha de comando",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Definir política sobre quem pode excluir grupos privados. Grupos deletados podem ser recuperados do banco de dados usando {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Ativar a exclusão de grupos privados para:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Definir a política sobre quem pode renomear e definir o cabeçalho ou propósito para grupos privados.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Ativar o renomeio de grupos privados para:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Definir política sobre quem pode excluir canais públicos. Canais deletados podem ser recuperados do banco de dados usando {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Ativar a exclusão de canais públicos para:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Definir a política sobre quem pode renomear e definir o cabeçalho ou propósito para canais públicos.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Ativar o renomeio de canais públicos para:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Definir política sobre quem pode criar canais públicos.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Ativar a criação de canais públicos para:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "ferramenta de linha de comando",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "Permitir requisição cross-origin de:",
   "admin.service.developerDesc": "Quando verdadeiro, os erros de Javascript serão mostrados em uma barra vermelha no topo da interface de usuário. Não recomendado para uso em produção. ",
   "admin.service.developerTitle": "Ativar o Modo Desenvolvedor: ",
-  "admin.service.enforcMfaTitle": "Obrigar Autenticação Multi-Fator:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "Quando verdadeiro, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>autenticação pode multi-fator</a> será requerida para o login. O configuração do MFA será requerida para os novos usuários na inscrição. Usuários logados sem o MFA configurado serão redirecionados para a página de configuração do MFA até a configuração estiver completa.<br/><br/>Se o seu sistema tiver usuários com outros métodos de login que não AD/LDAP e por email, o MFA deverá ser aplicado um provedor de autenticação externo ao Mattermost.",
   "admin.service.forward80To443": "Redirecionamento porta 80 para 443:",
   "admin.service.forward80To443Description": "Redirecionar todo trafego inseguro da porta 80 para porta segura 443",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "Ativar Webhooks Entrada: ",
   "admin.service.writeTimeout": "Tempo limite de gravação:",
   "admin.service.writeTimeoutDescription": "Se estiver usando HTTP (inseguro), este é o tempo máximo permitido desde o final da leitura dos cabeçalhos de solicitação até que a resposta seja escrita. Se estiver usando HTTPS, é o tempo total de quando a conexão é aceita até que a resposta seja escrita.",
-  "admin.sidebar.addTeamSidebar": "Adicionar equipe do menu lateral",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Avançado",
   "admin.sidebar.audits": "Conformidade e Auditoria",
   "admin.sidebar.authentication": "Autenticação",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "Notificação Móvel",
   "admin.sidebar.rateLimiting": "Limite de Velocidade",
   "admin.sidebar.reports": "REPORTANDO",
-  "admin.sidebar.rmTeamSidebar": "Remover equipe do menu lateral",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Segurança",
   "admin.sidebar.sessions": "Sessões",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "Estatísticas de Equipe",
   "admin.sidebar.storage": "Armazenamento",
   "admin.sidebar.support": "Legal e Suporte",
-  "admin.sidebar.teams": "EQUIPES ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "Usuários",
   "admin.sidebar.usersAndTeams": "Usuários e Equipes",
   "admin.sidebar.view_statistics": "Estatísticas do Site",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "Usuários Ativos Com Postagens",
   "admin.team_analytics.totalPosts": "Total Posts",
   "admin.true": "verdadeiro",
-  "admin.userList.title": "Usuários para {team}",
-  "admin.userList.title2": "Usuários para {team} ({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Método de Login:</strong> Email",
   "admin.user_item.authServiceNotEmail": "<strong>Método de Login:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "Se você rebaixar você mesmo de Admin de Sistema e não exista outro usuário como privilegios de Admin de Sistema, você precisa-rá re-inscrever um Admin de Sistema acessando o servidor Mattermost através do terminal e executando o seguinte comando.",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "Remover MFA",
   "admin.user_item.resetPwd": "Resetar Senha",
   "admin.user_item.switchToEmail": "Trocar para Email/Senha",
-  "admin.user_item.sysAdmin": "Admin do Sistema",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Admin Equipe",
   "admin.webrtc.enableDescription": "Quando verdadeiro, Mattermost permite fazer vídeo chamadas <strong>ponto-a-ponto</strong>. Chamadas WebRTC estão disponíveis no Chrome, Firefox e Mattermost Desktop Apps.",
   "admin.webrtc.enableTitle": "Ativar Mattermost WebRTC: ",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "Usuários Diários Ativos",
   "analytics.system.monthlyActiveUsers": "Usuários Mensais Ativos",
   "analytics.system.postTypes": "Posts, Arquivos e Hashtags",
-  "analytics.system.privateGroups": "Grupos Privados",
+  "analytics.system.privateGroups": "Canal Privado",
   "analytics.system.publicChannels": "Canais Públicos",
   "analytics.system.skippedIntensiveQueries": "Para maximizar a performance, algumas estatísticas foram desativadas. Veja: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Post com Texto somente",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "Conexão Websocket",
   "analytics.team.activeUsers": "Usuários Ativos Com Posts",
   "analytics.team.newlyCreated": "Novos Usuários Criados",
-  "analytics.team.privateGroups": "Grupos Privados",
+  "analytics.team.privateGroups": "Canal Privado",
   "analytics.team.publicChannels": "Canais Públicos",
   "analytics.team.recentActive": "Usuários Ativos Recentes",
   "analytics.team.recentUsers": "Usuários Ativos Recentes",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "Remover dos Favoritos",
   "channel_flow.alreadyExist": "Um canal com essa URL já existe",
   "channel_flow.changeUrlDescription": "Alguns caracteres não são permitidos nas URLs e podem ser removidos.",
-  "channel_flow.changeUrlTitle": "Alterar URL {term}",
-  "channel_flow.channel": "Canal",
-  "channel_flow.create": "Criar {term}",
-  "channel_flow.group": "Grupo",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Canal Privado",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "URL do canal precisa ter 2 ou mais caracteres minúsculos alfanuméricos",
   "channel_flow.invalidName": "Nome do Canal Inválido",
-  "channel_flow.set_url_title": "Ajustar URL {term}",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "Adicionar Membros",
   "channel_header.addToFavorites": "Adicionar aos Favoritos",
-  "channel_header.channel": "Canal",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Editar Cabeçalho do Canal",
-  "channel_header.delete": "Deletar {term}",
+  "channel_header.delete": "Deletar Canal",
   "channel_header.flagged": "Posts Marcados",
-  "channel_header.group": "Grupo",
-  "channel_header.leave": "Sair {term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Deixar o Canal",
   "channel_header.manageMembers": "Gerenciar Membros",
   "channel_header.notificationPreferences": "Preferências de Notificação",
   "channel_header.recentMentions": "Menções Recentes",
   "channel_header.removeFromFavorites": "Remover dos Favoritos",
-  "channel_header.rename": "Renomear {term}",
-  "channel_header.setHeader": "Editar Cabeçalho {term}",
-  "channel_header.setPurpose": "Editar Propósito {term}",
+  "channel_header.rename": "Renomear Canal",
+  "channel_header.setHeader": "Editar Cabeçalho do Canal",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "Ver Informações",
   "channel_header.viewMembers": "Ver Membros",
   "channel_header.webrtc.call": "Iniciar Vídeo Chamada",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " Adicionar Novos Membros",
   "channel_members_modal.members": " Membros",
   "channel_modal.cancel": "Cancelar",
-  "channel_modal.channel": "Canal",
-  "channel_modal.createNew": "Criar Novo ",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Criar Novo Canal",
   "channel_modal.descriptionHelp": "Descreva como este {term} pode ser usado.",
   "channel_modal.displayNameError": "O nome do canal deve ter com 2 ou mais caracteres",
   "channel_modal.edit": "Editar",
-  "channel_modal.group": "Grupo",
+  "channel_modal.group": "Group",
   "channel_modal.header": "Cabeçalho",
   "channel_modal.headerEx": "Ex.: \"[Título do Link](http://example.com)\"",
   "channel_modal.headerHelp": "Configure o texto que irá aparecer no topo do {term} ao lado do nome {term}. Por exemplo, inclua os links utilizados frequentemente digitando [Link Title](http://example.com).",
-  "channel_modal.modalTitle": "Novo ",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "Nome",
   "channel_modal.nameEx": "Ex.: \"Bugs\", \"Marketing\", \"办公室恋情\"",
   "channel_modal.optional": "(opcional)",
   "channel_modal.privateGroup1": "Criar um novo grupo privado com membros restritos. ",
-  "channel_modal.privateGroup2": "Criar um grupo privado",
+  "channel_modal.privateGroup2": "Criar um canal público",
   "channel_modal.publicChannel1": "Criar um canal público",
   "channel_modal.publicChannel2": "Criar um novo canal público para qualquer um participar. ",
   "channel_modal.purpose": "Propósito",
   "channel_modal.purposeEx": "Ex.: \"Um canal para arquivar bugs e melhorias\"",
-  "channel_notification.push": "Enviar notificações push para o celular",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "Para todas as atividades",
   "channel_notifications.allUnread": "Para todas as mensagens não lidas",
   "channel_notifications.globalDefault": "Global padrão ({notifyLevel})",
@@ -1229,10 +1229,10 @@
   "custom_emoji.search": "Pesquisar Emoji Personalizado",
   "default_channel.purpose": "Poste mensagens aqui que você quer que todos vejam. Todos se tornam automaticamente membros permanentes deste canal quando se juntam à equipe.",
   "delete_channel.cancel": "Cancelar",
-  "delete_channel.channel": "canal",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Confirmar EXCLUSÃO do Canal",
   "delete_channel.del": "Deletar",
-  "delete_channel.group": "grupo",
+  "delete_channel.group": "group",
   "delete_channel.question": "Isto irá apagar o canal da equipe e todo o conteúdo não vai estar mais disponível para os usuários. Você tem certeza de que deseja apagar o {term} {display_name}?",
   "delete_post.cancel": "Cancelar",
   "delete_post.comment": "Comentário",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "Editar cabeçalho",
   "edit_channel_purpose_modal.body": "Descreva como este {type} deve ser usado. Este texto aparece na lista de canais no menu \"Mais...\" e ajuda os outros a decidir se deseja participar.",
   "edit_channel_purpose_modal.cancel": "Cancelar",
-  "edit_channel_purpose_modal.channel": "Canal",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Este propósito do canal é muito longo, por favor insira um menor",
-  "edit_channel_purpose_modal.group": "Grupo",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Salvar",
   "edit_channel_purpose_modal.title1": "Editar Propósito",
   "edit_channel_purpose_modal.title2": "Editar Propósito para ",
@@ -1542,7 +1542,7 @@
   "intro_messages.channel": "canal",
   "intro_messages.creator": "Este é o início do {name} {type}, criado por {creator} em {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Início de {display_name}</h4><p class='channel-intro__content'><strong>Bem vindo a {display_name}!</strong><br/><br/>Poste mensagens aqui que você quer que todos vejam. Todos se tornam automaticamente membros permanentes deste canal quando se juntam à equipe.</p>",
-  "intro_messages.group": "grupo privado",
+  "intro_messages.group": "Canal Privado",
   "intro_messages.invite": "Convidar outras pessoas para este {type}",
   "intro_messages.inviteOthers": "Convide outros para esta equipe",
   "intro_messages.noCreator": "Este é o início do {name} {type}, criado em {date}.",
@@ -1636,11 +1636,11 @@
   "mfa.setup.step2": "<strong>Passo 2: </strong>Use o Google Authenticator para escanear este QR code, ou manualmente digite a chave",
   "mfa.setup.step3": "<strong>Passo 3: </strong>Digite o código gerado pelo Google Authenticator",
   "mfa.setupTitle": "Configuração Autenticação Multi-fator",
-  "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "Copyright 2016 Mattermost, Inc. Todos os direitos reservados",
-  "mobile.about.database": "Database: {type}",
-  "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
-  "mobile.about.serverVersionNoBuild": "Server Version: {version}",
+  "mobile.about.appVersion": "Versão do App: {version} (Build {number})",
+  "mobile.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. Todos os direitos reservados",
+  "mobile.about.database": "Banco de Dados: {type}",
+  "mobile.about.serverVersion": "Versão do Servidor: {version} (Build {number})",
+  "mobile.about.serverVersionNoBuild": "Versão do Servidor: {version}",
   "mobile.account.notifications.email.footer": "Quando desconectado ou ausente por mais de cinco minutos",
   "mobile.account_notifications.mentions_footer": "Seu usuário (\"@{username}\") sempre irá disparar menções.",
   "mobile.account_notifications.non-case_sensitive_words": "Outras palavras não sensíveis a maiúsculas e minúsculas...",
@@ -1648,7 +1648,7 @@
   "mobile.account_notifications.threads_mentions": "Menções em tópicos",
   "mobile.account_notifications.threads_start": "Tópicos que eu iniciei",
   "mobile.account_notifications.threads_start_participate": "Tópicos que eu iniciei ou participo",
-  "mobile.channel_info.alertMessageDeleteChannel": "Você tem certeza que quer deletar o {term} {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Você tem certeza que quer deixar o {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Você tem certeza que quer deixar o {term} {name}?",
   "mobile.channel_info.alertNo": "Não",
   "mobile.channel_info.alertTitleDeleteChannel": "Deletar {term}",
@@ -1678,8 +1678,8 @@
   "mobile.create_channel": "Criar",
   "mobile.create_channel.private": "Novo Grupo Privado",
   "mobile.create_channel.public": "Novo Canal Público",
-  "mobile.custom_list.no_results": "No Results",
-  "mobile.edit_post.title": "Editing Message",
+  "mobile.custom_list.no_results": "Nenhum Resultado",
+  "mobile.edit_post.title": "Editando a Mensagem",
   "mobile.file_upload.camera": "Tirar Foto ou Vídeo",
   "mobile.file_upload.library": "Biblioteca de Fotos",
   "mobile.file_upload.more": "Mais",
@@ -1695,9 +1695,9 @@
   "mobile.routes.channelInfo.createdBy": "Criado por {creator} em ",
   "mobile.routes.channelInfo.delete_channel": "Deletar Canal",
   "mobile.routes.channelInfo.favorite": "Favorito",
-  "mobile.routes.channel_members.action": "Remover Membro",
-  "mobile.routes.channel_members.action_message": "Você deve selecionar ao menos um membro para {term} do canal {prep}.",
-  "mobile.routes.channel_members.action_message_confirm": "Você tem certeza que quer {term} o membro selecionado do canal {prep}?",
+  "mobile.routes.channel_members.action": "Remover Membros",
+  "mobile.routes.channel_members.action_message": "Você deve selecionar pelo menos um membro para remover do canal.",
+  "mobile.routes.channel_members.action_message_confirm": "Você tem certeza que quer remover o membro selecionado do canal?",
   "mobile.routes.channels": "Canais",
   "mobile.routes.enterServerUrl": "Informe a URL do Servidor",
   "mobile.routes.login": "Login",
@@ -1713,7 +1713,7 @@
   "mobile.routes.user_profile.send_message": "Enviar Mensagem",
   "mobile.server_ping_failed": "Não é possível conectar ao servidor. Por favor verifique a URL do seu servidor e a conexão de internet.",
   "mobile.server_url.invalid_format": "URL deve começar com http:// ou https://",
-  "mobile.settings.team_selection": "Seleção de Equipe",
+  "mobile.settings.team_selection": "Seleção da Equipe",
   "more_channels.close": "Fechar",
   "more_channels.create": "Criar Novo Canal",
   "more_channels.createClick": "Clique em 'Criar Novo Canal' para fazer um novo",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "Nenhum arquivo selecionado.",
   "setting_upload.select": "Selecione o arquivo",
   "sidebar.channels": "Canais",
-  "sidebar.createChannel": "Criar novo canal",
-  "sidebar.createGroup": "Criar um novo grupo",
+  "sidebar.createChannel": "Criar um canal público",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "Mensagens Diretas",
   "sidebar.favorite": "Favoritos",
   "sidebar.more": "Mais",
   "sidebar.moreElips": "Mais...",
   "sidebar.otherMembers": "Fora desta equipe",
-  "sidebar.pg": "Grupos Privados",
+  "sidebar.pg": "Canal Privado",
   "sidebar.removeList": "Remover da lista",
   "sidebar.tutorialScreen1": "<h4>Canais</h4><p><strong>Canais</strong> organizar conversas em diferentes tópicos. Eles estão abertos a todos em sua equipe. Para enviar comunicações privadas utilize <strong>Mensagens Diretas</strong> para uma única pessoa ou <strong>Grupos Privados</strong> para várias pessoas.</p>",
   "sidebar.tutorialScreen2": "<h4>Canais \"{townsquare}\" e \"{offtopic}\"</h4><p>Aqui estão dois canais públicos para começar:</p><p><strong>{townsquare}</strong> é um lugar comunicação de toda equipe. Todo mundo em sua equipe é um membro deste canal.</p><p><strong>{offtopic}</strong> é um lugar para diversão e humor fora dos canais relacionados com o trabalho. Você e sua equipe podem decidir qual outros canais serão criados.</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "Outros Canais",
   "suggestion.mention.nonmembers": "Não no Canal",
   "suggestion.mention.special": "Menções Especiais",
-  "suggestion.search.private": "Grupos Privados",
+  "suggestion.search.private": "Canal Privado",
   "suggestion.search.public": "Canais Públicos",
   "team_export_tab.download": "download",
   "team_export_tab.export": "Exportar",
@@ -2363,7 +2363,7 @@
   "webrtc.failed": "Houve um problema na conexão da vídeo chamada.",
   "webrtc.hangup": "Desligar",
   "webrtc.header": "Chamada com {username}",
-  "webrtc.inProgress": "Você tem uma chamada em progresso. Por favor desligue primeiro.",
+  "webrtc.inProgress": "Você já tem uma chamada em progresso. Por favor desligue primeiro.",
   "webrtc.mediaError": "Não foi possível acessar a câmera ou microfone.",
   "webrtc.mute_audio": "Silenciar microfone",
   "webrtc.noAnswer": "{username} não está respondendo a chamada.",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index f490e20fc..a05d0c6e8 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -138,7 +138,7 @@
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "Первое слово соответствует слову события полностью",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "Первое слово начинается со слова триггера",
   "admin.advance.cluster": "Высокая доступность (Beta)",
-  "admin.advance.metrics": "Мониторинг производительности (бета)",
+  "admin.advance.metrics": "Мониторинг производительности",
   "admin.audits.reload": "Перезагрузить логи активности пользователя",
   "admin.audits.title": "Логи активности пользователя",
   "admin.authentication.email": "Аутентификация по Email",
@@ -218,7 +218,7 @@
   "admin.customization.enableCustomEmojiDesc": "Разрешите пользователя создавать Специальные Эмодзи для использования в сообщениях. После разрешения, настройки Специальных Эмодзи могут быть доступны в разделе Команда, нажатием на три точки над боковой панелью и выбором \"Специальные Эмодзи\".",
   "admin.customization.enableCustomEmojiTitle": "Включить пользовательские смайлы:",
   "admin.customization.enableLinkPreviewsDesc": "Enable users to display a preview of website content below the message, if available. When true, website previews can be enabled from Account Settings > Advanced > Preview pre-release features.",
-  "admin.customization.enableLinkPreviewsTitle": "Enable Link Previews:",
+  "admin.customization.enableLinkPreviewsTitle": "Включить предпросмотр ссылок:",
   "admin.customization.iosAppDownloadLinkDesc": "Добавляет ссылку для скачивания приложения для IOS. Пользователям, которые посещают сайт через мобильный браузер, на специальной странице будет предложена возможность скачать приложение. Оставьте это поле пустым, чтобы предотвратить появление этой страницы.",
   "admin.customization.iosAppDownloadLinkTitle": "Ссылка на страницу загрузки приложения для iOS:",
   "admin.customization.linkPreviews": "Предварительный просмотр ссылок",
@@ -321,20 +321,20 @@
   "admin.general.policy.permissionsAdmin": "Группа и Администраторы системы",
   "admin.general.policy.permissionsAll": "Все участники команды",
   "admin.general.policy.permissionsAllChannel": "Все участники канала",
-  "admin.general.policy.permissionsChannelAdmin": "Channel, Team and System Admins",
+  "admin.general.policy.permissionsChannelAdmin": "Администраторы системы, каналов и команд",
   "admin.general.policy.permissionsDeletePostAdmin": "Администраторы команд и администраторы системы",
   "admin.general.policy.permissionsDeletePostAll": "Авторы сообщений могут удалять свои сообщения и администраторы могут удалять любые сообщения",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "Администраторы системы",
   "admin.general.policy.permissionsSystemAdmin": "Администраторы Системы",
   "admin.general.policy.restrictPostDeleteDescription": "Установка правил, кто имеет право удалять сообщения.",
   "admin.general.policy.restrictPostDeleteTitle": "Каким пользователям позволять удалять сообщения:",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "Установите политики того, кто может создавать приватные группы.",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "Включить возможность создания приватных групп для:",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "Установите политики того, кто может создавать публичные каналы.",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "Включить возможность создания публичных каналов для:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "командная строка",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Установите политики того, кто может удалять приватные группы. Удалённые каналы могут быть восстановлены из базы данных с помощью {commandLineToolLink}.",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Включить возможность удаления приватных групп для:",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "Задайте политики того, кто может создавать, удалять, переименовывать приватные группы и устанавливать для них заголовок или цель.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Включить возможность изменения названия приватных групп для:",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "Установите политики того, кто может удалять публичные каналы. Удалённые каналы могут быть восстановлены из базы данных с помощью {commandLineToolLink}.",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "Включить возможность удаления публичных каналов для:",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Задайте политики того, кто может создавать, удалять, переименовывать общедоступные каналы и устанавливать для них заголовок или цель.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Включить возможность изменять названия публичных каналов для:",
   "admin.general.policy.restrictPublicChannelCreationDescription": "Установите политики того, кто может создавать публичные каналы.",
   "admin.general.policy.restrictPublicChannelCreationTitle": "Включить возможность создания публичных каналов для:",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "командная строка",
@@ -569,7 +569,7 @@
   "admin.password.requirementsDescription": "Виды символов требуемых для пароля.",
   "admin.password.symbol": "Хотя бы один символ (\"~!@#$%^&*()\")",
   "admin.password.uppercase": "Хотя бы одна заглавная буква",
-  "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
+  "admin.privacy.showEmailDescription": "Отключите, чтобы скрыть email адреса пользователей от всех, кроме системных администраторов.",
   "admin.privacy.showEmailTitle": "Показать Email: ",
   "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
   "admin.privacy.showFullNameTitle": "Показать полное имя: ",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "Разрешить кроссдоменные запросы от:",
   "admin.service.developerDesc": "Когда включено, на красной панели сверху будут показываться ошибки Javascript. Не рекомендуется включать на боевом сервере. ",
   "admin.service.developerTitle": "Включить режим разработчика:",
-  "admin.service.enforcMfaTitle": "Принудительная многофакторная аутентификация:",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.forward80To443": "Перенаправить 80 порт на 443:",
   "admin.service.forward80To443Description": "Перенаправляет весь незащищённый трафик с 80 порта на 443",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "Включить входящие Webhook'и: ",
   "admin.service.writeTimeout": "Тайм-аут записи:",
   "admin.service.writeTimeoutDescription": "При использовании HTTP (небезопасно) — максимально допустимое время с момента окончания чтения заголовка запроса до окончания записи ответа. В случае с HTTPS — полное время с момента установки соединения до окончания записи ответа.",
-  "admin.sidebar.addTeamSidebar": "Добавить команду из меню боковой панели",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Дополнительно",
   "admin.sidebar.audits": "Аудит",
   "admin.sidebar.authentication": "Аутентификация",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "Мобильные Push-уведомления",
   "admin.sidebar.rateLimiting": "Ограничение скорости",
   "admin.sidebar.reports": "ОТЧЁТЫ",
-  "admin.sidebar.rmTeamSidebar": "Удалить команду из бокового меню",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Безопасность",
   "admin.sidebar.sessions": "Сеансы",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "Статистика команды",
   "admin.sidebar.storage": "Хранилище",
   "admin.sidebar.support": "Право и поддержка",
-  "admin.sidebar.teams": "КОМАНДЫ ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "Пользователи",
   "admin.sidebar.usersAndTeams": "Пользователи и команды",
   "admin.sidebar.view_statistics": "Статистика системы",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "Активные пользователи с сообщениями",
   "admin.team_analytics.totalPosts": "Всего сообщений",
   "admin.true": "да",
-  "admin.userList.title": "Пользователи {team}",
-  "admin.userList.title2": "Пользователи для команды {team} ({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": ", <strong>Метод входа:</strong> Email",
   "admin.user_item.authServiceNotEmail": ", <strong>Метод входа:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "Удалить MFA",
   "admin.user_item.resetPwd": "Сброс пароля",
   "admin.user_item.switchToEmail": "Переключение на E-Mail/Пароль",
-  "admin.user_item.sysAdmin": "Администратор системы",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Team Admin",
   "admin.webrtc.enableDescription": "При выборе Mattermost позволяет совершать <strong>тет-а-тет</strong> видеозвонки. WebRTC звонки доступны в браузерах Chrome и Firefox, а так же в приложениях Mattermost.",
   "admin.webrtc.enableTitle": "Включить Mattermost WebRTC:",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "Активность пользователей за день",
   "analytics.system.monthlyActiveUsers": "Активность пользователей за месяц",
   "analytics.system.postTypes": "Сообщения, файлы и хештэги",
-  "analytics.system.privateGroups": "Приватные Группы",
+  "analytics.system.privateGroups": "Private Groups",
   "analytics.system.publicChannels": "Публичные Каналы",
   "analytics.system.skippedIntensiveQueries": "Для максимальной производительности некоторая статистика отключена. Вы можете включить её снова в файле конфигурации config.json. Смотрите: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Только текстовые сообщения",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "Соединений Websocket",
   "analytics.team.activeUsers": "Активные пользователи с сообщениями",
   "analytics.team.newlyCreated": "Вновь созданные пользователи",
-  "analytics.team.privateGroups": "Приватные группы",
+  "analytics.team.privateGroups": "Private Groups",
   "analytics.team.publicChannels": "Публичные каналы",
   "analytics.team.recentActive": "Недавние активные пользователи",
   "analytics.team.recentUsers": "Недавние активные пользователи",
@@ -1052,35 +1052,35 @@
   "change_url.close": "Закрыть",
   "change_url.endWithLetter": "Должен заканчиваться буквой или цифрой",
   "change_url.invalidUrl": "Некорректный URL",
-  "change_url.longer": "URL must be two or more characters.",
+  "change_url.longer": "Ссылка должна быть от двух символов длиной.",
   "change_url.noUnderscore": "Не может содержать два подчеркивания подряд.",
   "change_url.startWithLetter": "Должен начинаться с буквы или цифры",
   "channelHeader.addToFavorites": "Добавить в избранное",
   "channelHeader.removeFromFavorites": "Удалить из избранного",
   "channel_flow.alreadyExist": "Канал с таким URL уже существует",
   "channel_flow.changeUrlDescription": "Некоторые символы не разрешены в URL-адресе и могут быть удалены.",
-  "channel_flow.changeUrlTitle": "Изменить URL-адрес {term}",
-  "channel_flow.channel": "Канал",
-  "channel_flow.create": "Создать {term}",
-  "channel_flow.group": "Группа",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "Покинуть канал",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "Ссылка на канал должна быть не короче 2-х буквенных символов",
   "channel_flow.invalidName": "Недопустимое имя канала",
-  "channel_flow.set_url_title": "Установить адрес {term}",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "Добавить участников",
   "channel_header.addToFavorites": "Добавить в избранное",
-  "channel_header.channel": "Канал",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Изменить заголовок канала",
-  "channel_header.delete": "Удалить {term}",
+  "channel_header.delete": "Удалить канал...",
   "channel_header.flagged": "Отмеченные сообщения",
-  "channel_header.group": "Группа",
-  "channel_header.leave": "Покинуть {term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "Покинуть канал",
   "channel_header.manageMembers": "Управление участниками",
   "channel_header.notificationPreferences": "Настройка уведомлений",
   "channel_header.recentMentions": "Недавние упоминания",
   "channel_header.removeFromFavorites": "Удалить из избранного",
-  "channel_header.rename": "Переименовать {term}",
-  "channel_header.setHeader": "Редактировать заголовок {term}",
-  "channel_header.setPurpose": "Редактировать цель {term}",
+  "channel_header.rename": "Переименовать канал",
+  "channel_header.setHeader": "Изменить заголовок канала",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "Информация",
   "channel_header.viewMembers": "Просмотреть список участников",
   "channel_header.webrtc.call": "Видеовызов",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " Добавить участников",
   "channel_members_modal.members": "Участники",
   "channel_modal.cancel": "Отмена",
-  "channel_modal.channel": "Канал",
-  "channel_modal.createNew": "Создать ",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "Создать новый канал",
   "channel_modal.descriptionHelp": "Опишите, как следует использовать {term}.",
-  "channel_modal.displayNameError": "Channel name must be 2 or more characters",
+  "channel_modal.displayNameError": "Имя канала должно быть от двух символов",
   "channel_modal.edit": "Редактировать",
-  "channel_modal.group": "Группа",
+  "channel_modal.group": "Group",
   "channel_modal.header": "Заголовок",
   "channel_modal.headerEx": "Например: \"[Заголовок ссылки](http://example.com)\"",
   "channel_modal.headerHelp": "Задайте текст, который появится в заголовке {term} рядом с названием {term}. К примеру, вы можете включить часто используемые ссылки, введя [Текст ссылки](http://example.com).",
-  "channel_modal.modalTitle": "Новый ",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "Имя",
   "channel_modal.nameEx": "Например: \"Bugs\", \"Маркетинг\", \"客户支持\"",
   "channel_modal.optional": "(необязательно)",
   "channel_modal.privateGroup1": "Создать новую приватную группу с ограниченным доступом. ",
-  "channel_modal.privateGroup2": "Создать приватную группу",
+  "channel_modal.privateGroup2": "Создать общедоступный канал",
   "channel_modal.publicChannel1": "Создать общедоступный канал",
   "channel_modal.publicChannel2": "Создать новый публичный канал. ",
   "channel_modal.purpose": "Назначение",
-  "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notification.push": "Отправить мобильное push-уведомление",
+  "channel_modal.purposeEx": "Например: \"Канал для ошибок и пожеланий\"",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "При любой активности",
   "channel_notifications.allUnread": "При любых непрочитанных сообщениях",
   "channel_notifications.globalDefault": "По умолчанию глобально ({notifyLevel})",
@@ -1229,10 +1229,10 @@
   "custom_emoji.search": "Найти кастомные Emoji",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "Отмена",
-  "delete_channel.channel": "канал",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "Подтверждение УДАЛЕНИЯ канала",
   "delete_channel.del": "Удалить",
-  "delete_channel.group": "группа",
+  "delete_channel.group": "group",
   "delete_channel.question": "Это удалит канал из команды и все его данные. Вы уверены, что хотите удалить {display_name} {term}?",
   "delete_post.cancel": "Отмена",
   "delete_post.comment": "Комментарий",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "Правка заголовка",
   "edit_channel_purpose_modal.body": "Опишите, как {type} должен использоваться. Этот текст будет виден окне, после нажатия кнопки \"Еще...\" в списке каналов и поможет другим с выбором.",
   "edit_channel_purpose_modal.cancel": "Отмена",
-  "edit_channel_purpose_modal.channel": "Канал",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "Назначение канала слишком длинное",
-  "edit_channel_purpose_modal.group": "Группа",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "Сохранить",
   "edit_channel_purpose_modal.title1": "Редактировать Назначение",
   "edit_channel_purpose_modal.title2": "Редактировать назначение для ",
@@ -1277,8 +1277,8 @@
   "emoji_list.creator": "Автор",
   "emoji_list.delete": "Удалить",
   "emoji_list.delete.confirm.button": "Удалить",
-  "emoji_list.delete.confirm.msg": "This action permanently deletes the custom emoji. Are you sure you want to delete it?",
-  "emoji_list.delete.confirm.title": "Delete Custom Emoji",
+  "emoji_list.delete.confirm.msg": "Это навсегда удалит пользовательский эмодзи. Вы точно хотите его удалить?",
+  "emoji_list.delete.confirm.title": "Удалить пользовательский эмодзи",
   "emoji_list.empty": "Не найдено загруженного эмодзи",
   "emoji_list.header": "Пользовательские эмодзи",
   "emoji_list.help": "Пользовательские смайлы доступны для всех на вашем сервере. Введите ':' в окне сообщения, чтобы открыть меню выбора смайла. Другим пользователям, возможно, потребуется обновить страницу, прежде чем появятся новые смайлы.",
@@ -1287,18 +1287,18 @@
   "emoji_list.name": "Имя",
   "emoji_list.search": "Найти кастомные Emoji",
   "emoji_list.somebody": "Кто-то в другой команде",
-  "emoji_picker.activity": "Activity",
+  "emoji_picker.activity": "Активность",
   "emoji_picker.custom": "Custom",
-  "emoji_picker.emojiPicker": "Emoji Picker",
+  "emoji_picker.emojiPicker": "Выбор эмодзи",
   "emoji_picker.flags": "Отметить",
-  "emoji_picker.food": "Food",
-  "emoji_picker.nature": "Nature",
-  "emoji_picker.objects": "Objects",
-  "emoji_picker.people": "People",
-  "emoji_picker.recent": "Recently Used",
+  "emoji_picker.food": "Еда",
+  "emoji_picker.nature": "Природа",
+  "emoji_picker.objects": "Объекты",
+  "emoji_picker.people": "Люди",
+  "emoji_picker.recent": "Недавно использованные",
   "emoji_picker.search": "Поиск",
-  "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel": "Travel",
+  "emoji_picker.symbols": "Символы",
+  "emoji_picker.travel": "Путешествия",
   "error.not_found.link_message": "Назад в Mattermost",
   "error.not_found.message": "Эта страница не существует",
   "error.not_found.title": "Страница не найдена",
@@ -1324,7 +1324,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.member": "Участник",
   "filtered_user_list.next": "Далее",
-  "filtered_user_list.prev": "Previous",
+  "filtered_user_list.prev": "Предыдущая",
   "filtered_user_list.search": "Поиск пользователей",
   "filtered_user_list.searchButton": "Поиск",
   "filtered_user_list.show": "Фильтр:",
@@ -1525,7 +1525,7 @@
   "integrations.command.description": "Команды вызывают отправляют события к внешним приложениям",
   "integrations.command.title": "Команда",
   "integrations.delete.confirm.button": "Удалить",
-  "integrations.delete.confirm.title": "Delete Integration",
+  "integrations.delete.confirm.title": "Удалить интеграцию",
   "integrations.done": "Завершено",
   "integrations.edit": "Редактировать",
   "integrations.header": "Интеграция",
@@ -1542,13 +1542,13 @@
   "intro_messages.channel": "канал",
   "intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "приватная группа",
+  "intro_messages.group": "private group",
   "intro_messages.invite": "Пригласить других в {type}",
   "intro_messages.inviteOthers": "Пригласить других в эту команду",
   "intro_messages.noCreator": "Начало общения в {name} {type}, созданная {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">{display_name} - начало общения</h4><p class=\"channel-intro__content\">{display_name}, канал для общения по нерабочим вопросам.<br/></p>",
   "intro_messages.onlyInvited": " Только приглашенные пользователи могут видеть эту приватную группу.",
-  "intro_messages.purpose": " This {type}'s purpose is: {purpose}.",
+  "intro_messages.purpose": "Назначение для {type}: {purpose}.",
   "intro_messages.setHeader": "Установить заголовок",
   "intro_messages.teammate": "Начало истории личных сообщений с участником. Личные сообщения и файлы доступны здесь и не видны за пределами этой области.",
   "invite_member.addAnother": "Добавить следующего",
@@ -1636,19 +1636,19 @@
   "mfa.setup.step2": "<strong>Шаг 2: </strong>Используйте Google Authenticator для сканирования QR кода или вручную введите секретный ключ",
   "mfa.setup.step3": "<strong>Шаг 3: </strong>Введите код, сгенерированный Google Authenticator",
   "mfa.setupTitle": "Настройка многофакторной проверки подлинности",
-  "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "Copyright 2016 Mattermost, Inc. Все права защищены",
-  "mobile.about.database": "Database: {type}",
-  "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
-  "mobile.about.serverVersionNoBuild": "Server Version: {version}",
-  "mobile.account.notifications.email.footer": "When offline or away for more than five minutes",
-  "mobile.account_notifications.mentions_footer": "Your username (\"@{username}\") will always trigger mentions.",
+  "mobile.about.appVersion": "Версия приложения: {version} (Сборка {number})",
+  "mobile.about.copyright": "Copyright 2015-{currentYear} Mattermost, Inc. Все права защищены",
+  "mobile.about.database": "Тип базы данных: {type}",
+  "mobile.about.serverVersion": "Версия сервера: {version} (Сборка {number})",
+  "mobile.about.serverVersionNoBuild": "Версия сервера: {version}",
+  "mobile.account.notifications.email.footer": "Когда отошел более чем на пять минут",
+  "mobile.account_notifications.mentions_footer": "Ваше имя (\"@{username}\") всегда вызовет оповещение.",
   "mobile.account_notifications.non-case_sensitive_words": "Other non-case sensitive words...",
-  "mobile.account_notifications.reply.header": "Send reply notifications for",
-  "mobile.account_notifications.threads_mentions": "Mentions in threads",
-  "mobile.account_notifications.threads_start": "Threads that I start",
+  "mobile.account_notifications.reply.header": "Отправлять уведомления об ответе",
+  "mobile.account_notifications.threads_mentions": "Упоминания в тредах",
+  "mobile.account_notifications.threads_start": "Ветки начатые мной",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Действительно хотите удалить {term}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
   "mobile.channel_info.alertNo": "Нет",
   "mobile.channel_info.alertTitleDeleteChannel": "Удалить {term}",
@@ -1688,7 +1688,7 @@
   "mobile.loading_posts": "Loading Messages...",
   "mobile.login_options.choose_title": "Choose your login method",
   "mobile.post.cancel": "Отмена",
-  "mobile.post.delete_question": "Действительно хотите удалить {term}?",
+  "mobile.post.delete_question": "Вы действительно хотите удалить запись?",
   "mobile.post.delete_title": "Delete Post",
   "mobile.request.invalid_response": "Received invalid response from the server.",
   "mobile.routes.channelInfo": "Info",
@@ -1720,7 +1720,7 @@
   "more_channels.join": "Присоединиться",
   "more_channels.next": "Далее",
   "more_channels.noMore": "Больше нет каналов для входа",
-  "more_channels.prev": "Previous",
+  "more_channels.prev": "Предыдущая",
   "more_channels.title": "Больше каналов",
   "more_direct_channels.close": "Закрыть",
   "more_direct_channels.message": "Сообщение",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "Файл не выбран.",
   "setting_upload.select": "Выбрать файл",
   "sidebar.channels": "Канал",
-  "sidebar.createChannel": "Создать канал",
-  "sidebar.createGroup": "Создать группу",
+  "sidebar.createChannel": "Создать общедоступный канал",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "Прямые сообщения",
   "sidebar.favorite": "Избранные",
   "sidebar.more": "Еще",
   "sidebar.moreElips": "Еще...",
   "sidebar.otherMembers": "За пределами команды",
-  "sidebar.pg": "Приватные группы",
+  "sidebar.pg": "Private Groups",
   "sidebar.removeList": "Удалить из списка",
   "sidebar.tutorialScreen1": "<h4>Каналы</h4><p><strong>Каналы</strong> предназначены для организации обсуждений на разные темы. Они открыты для всех в вашей команде. Чтобы отправлять приватные сообщения, используйте <strong>личные сообщения</strong> для диалогов или <strong>приватные группы</strong> для бесед.</p>",
   "sidebar.tutorialScreen2": "<h4>Каналы \"{townsquare}\" и \"{offtopic}\"</h4><p>Для начала вам будут доступны два публичных канала:</p><p><strong>{townsquare}</strong> используется для внутрикомандного общения. Каждый из вашей команды является участником этого канала.</p><p><strong>{offtopic}</strong> предназначен для юмора и развлечений отдельно от рабочих каналов. Вы и Ваша команда может выбрать какие другие каналы вам потребуются.</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "Другие каналы",
   "suggestion.mention.nonmembers": "Не в канале",
   "suggestion.mention.special": "Специальные функции",
-  "suggestion.search.private": "Приватные группы",
+  "suggestion.search.private": "Private Groups",
   "suggestion.search.public": "Общедоступные каналы",
   "team_export_tab.download": "cкачать",
   "team_export_tab.export": "Экспорт",
diff --git a/webapp/i18n/zh-CN.json b/webapp/i18n/zh-CN.json
index 80a3b2fee..b5c2bd07e 100644
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -328,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "系统管理员",
   "admin.general.policy.restrictPostDeleteDescription": "设置谁可以删除消息的策略。",
   "admin.general.policy.restrictPostDeleteTitle": "允许哪些用户删除消息：",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "设置谁可以创建私有组的策略。",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "开启创建私有组：",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "设置谁可以创建公开频道的策略。",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "允许创建公开频道：",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "命令符工具",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "设置谁可以删除私有组的策略。已删除的组可以使用 {commandLineToolLink} 从数据库中恢复。",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "开启删除私有组：",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以重命名以及设置标题或私有组用途的策略。",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "开启私有组重命名：",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "设置谁可以删除公共频道的策略。已删除的频道可以使用 {commandLineToolLink} 从数据库中恢复。",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "开启删除公开频道：",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "设置谁可以重命名和设置标题或公共频道用途的策略。",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "开启公开频道重命名：",
   "admin.general.policy.restrictPublicChannelCreationDescription": "设置谁可以创建公开频道的策略。",
   "admin.general.policy.restrictPublicChannelCreationTitle": "允许创建公开频道：",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "命令符工具",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "允许来自以下跨源请求网址：",
   "admin.service.developerDesc": "开启时，Javascript错误将显示在页面顶端红条里。不推荐在正式环境使用。",
   "admin.service.developerTitle": "开启开发者模式：",
-  "admin.service.enforcMfaTitle": "强制多重身份验证：",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "当设为是时，必须需要<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重验证</a>登入。新用户将在注册时候设置多重验证。已登入并未设置多重验证的用户将重指向多重验证设置页面直到配置完成。<br/><br/>如果您的系统有 AD/LDAP 或电子邮件登入方式以外的用户，多重验证必须在 Mattermost 外的验证提供商设置。",
   "admin.service.forward80To443": "映射端口 80 到 443:",
   "admin.service.forward80To443Description": "映射所有非安全流量从端口 80 到安全端口 443",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "启用传出的 Webhooks：",
   "admin.service.writeTimeout": "写入超时：",
   "admin.service.writeTimeoutDescription": "如果使用 HTTP (不安全)，这是从读取请求头结尾到写入完响应最大允许的时间。如果使用 HTTPS，这将是从接受连接到写入完响应的总时间。",
-  "admin.sidebar.addTeamSidebar": "从侧边栏菜单添加团队",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
   "admin.sidebar.authentication": "验证",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "移动推送",
   "admin.sidebar.rateLimiting": "速率限制",
   "admin.sidebar.reports": "报告",
-  "admin.sidebar.rmTeamSidebar": "从侧边栏菜单移除团队",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "安全",
   "admin.sidebar.sessions": "会话",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "团队统计",
   "admin.sidebar.storage": "储存",
   "admin.sidebar.support": "法律和支持",
-  "admin.sidebar.teams": "团队 ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "用户",
   "admin.sidebar.usersAndTeams": "成员和团队",
   "admin.sidebar.view_statistics": "站点统计",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "有发信息的的正常用户",
   "admin.team_analytics.totalPosts": "信息总数",
   "admin.true": "是",
-  "admin.userList.title": "用户 {team}",
-  "admin.userList.title2": "用户{team} ({count})",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>登入方式：</strong> 电子邮件",
   "admin.user_item.authServiceNotEmail": "<strong>登入方式：</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "如果您从系统管理角色降级且没有另一个用户拥有系统管理员权限，您则需要通过终端访问 Mattermost 服务器并运行以下命令以重新指定一个系统管理员。",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "移除多重验证",
   "admin.user_item.resetPwd": "重置密码",
   "admin.user_item.switchToEmail": "切换到电子邮件/密码",
-  "admin.user_item.sysAdmin": "系统管理员",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "团队管理员",
   "admin.webrtc.enableDescription": "当设为是时，Mattermost 允许<strong>一对一</strong>视频通话。WebRTC 通话可在 Chrome，火狐以及 Mattermost 桌面应用使用。",
   "admin.webrtc.enableTitle": "开启 Mattermost WebRTC：",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "每日活动用户",
   "analytics.system.monthlyActiveUsers": "每月活动用户",
   "analytics.system.postTypes": "发文，文件和标签",
-  "analytics.system.privateGroups": "私有组",
+  "analytics.system.privateGroups": "私有频道",
   "analytics.system.publicChannels": "公共频道",
   "analytics.system.skippedIntensiveQueries": "为了最大化性能，部分统计已屏蔽。您可以在 config.json 中重新开启他们。参见：<a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "纯文字帖文",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "Websocket 连接",
   "analytics.team.activeUsers": "有发信息的的正常用户",
   "analytics.team.newlyCreated": "新建的用户",
-  "analytics.team.privateGroups": "私有组",
+  "analytics.team.privateGroups": "私有频道",
   "analytics.team.publicChannels": "公共频道",
   "analytics.team.recentActive": "最近活跃用户",
   "analytics.team.recentUsers": "最近活跃用户",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "从收藏中移除",
   "channel_flow.alreadyExist": "已存在使用该 URL 的频道",
   "channel_flow.changeUrlDescription": "某些字符不允许出现在url中，可能被删除。",
-  "channel_flow.changeUrlTitle": "修改{term}URL",
-  "channel_flow.channel": "频道",
-  "channel_flow.create": "创建 {term}",
-  "channel_flow.group": "群组",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "私有频道",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "频道网址必须为至少2个小写英文数字字符",
   "channel_flow.invalidName": "无效的频道名称",
-  "channel_flow.set_url_title": "设置{term}URL",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "添加成员",
   "channel_header.addToFavorites": "添加到收藏",
-  "channel_header.channel": "频道",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "编辑频道标题",
-  "channel_header.delete": "删除 {term}",
+  "channel_header.delete": "删除频道",
   "channel_header.flagged": "已标记的信息",
-  "channel_header.group": "群组",
-  "channel_header.leave": "离开{term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "离开频道",
   "channel_header.manageMembers": "成员管理",
   "channel_header.notificationPreferences": "消息通知设置",
   "channel_header.recentMentions": "最近提及",
   "channel_header.removeFromFavorites": "从收藏中移除",
-  "channel_header.rename": "重命名 {term}",
-  "channel_header.setHeader": "修改 {term} 标题",
-  "channel_header.setPurpose": "修改 {term} 用途",
+  "channel_header.rename": "重命名频道",
+  "channel_header.setHeader": "编辑频道标题",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "查看信息",
   "channel_header.viewMembers": "查看成员",
   "channel_header.webrtc.call": "开始视频通话",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": "添加新成员",
   "channel_members_modal.members": " 位成员",
   "channel_modal.cancel": "取消",
-  "channel_modal.channel": "频道",
-  "channel_modal.createNew": "创建新",
-  "channel_modal.descriptionHelp": "描述{term}如何被使用。",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "创建新频道",
+  "channel_modal.descriptionHelp": "描述此频道如何被使用。",
   "channel_modal.displayNameError": "频道名必须为 2 字或更多",
   "channel_modal.edit": "编辑",
-  "channel_modal.group": "群组",
+  "channel_modal.group": "Group",
   "channel_modal.header": "标题",
   "channel_modal.headerEx": "例如：\"[链接标题](http://example.com)\"",
   "channel_modal.headerHelp": "设定在 {term} 标题里在 {term} 旁边的文字。举例，输入常见链接 [链接标题](http://example.com)。",
-  "channel_modal.modalTitle": "新建",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "名称",
   "channel_modal.nameEx": "如: \"错误\"，\"营销\"，\"客户支持\"",
   "channel_modal.optional": "(可选)",
   "channel_modal.privateGroup1": "创建一个具有限制成员资格的私人组。",
-  "channel_modal.privateGroup2": "创建一个私有组",
+  "channel_modal.privateGroup2": "创建一个公共频道",
   "channel_modal.publicChannel1": "创建一个公共频道",
   "channel_modal.publicChannel2": "创建一个任何人都能加入的新公共频道。",
   "channel_modal.purpose": "用途",
   "channel_modal.purposeEx": "例如：\"用于提交问题和建议的频道\"",
-  "channel_notification.push": "发送手机推送通知",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "所有操作",
   "channel_notifications.allUnread": "所有未读消息",
   "channel_notifications.globalDefault": "默认全局（{notifyLevel}）",
@@ -1220,7 +1220,7 @@
   "create_team.team_url.hint": "<li>简短和易记为最好的</li><li>使用小写字母，数字和连字符</li><li>必须以字母开头且不能以连字符结尾</li>",
   "create_team.team_url.regex": "只使用小写字母，数字和连字符。必须以字母开头且不能以连字符结尾。",
   "create_team.team_url.required": "此栏必须填写",
-  "create_team.team_url.taken": "这个 URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>以预留字开头</a> 或不可用。请尝试其他的。",
+  "create_team.team_url.taken": "此网址<a href=\"https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url\" target=\"_blank\">以预留字开头</a> 或不可用。请换个网址。",
   "create_team.team_url.teamUrl": "团队URL",
   "create_team.team_url.unavailable": "此网址不可用。请重新尝试。",
   "create_team.team_url.webAddress": "选择您的新团队网址：",
@@ -1229,11 +1229,11 @@
   "custom_emoji.search": "搜索自定义表情符",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "取消",
-  "delete_channel.channel": "频道",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "确认删除频道",
   "delete_channel.del": "删除",
-  "delete_channel.group": "群组",
-  "delete_channel.question": "这会从团队删除此频道并且没有用户可以读取其数据。您确定要删除 {display_name} {term}？",
+  "delete_channel.group": "group",
+  "delete_channel.question": "这会从团队删除此频道并且没有用户可以读取其数据。您确定要删除 {display_name} 频道？",
   "delete_post.cancel": "取消",
   "delete_post.comment": "评论",
   "delete_post.confirm": "确认{term}删除",
@@ -1247,11 +1247,11 @@
   "edit_channel_header_modal.save": "保存",
   "edit_channel_header_modal.title": "编辑{channel}的标题",
   "edit_channel_header_modal.title_dm": "编辑标题",
-  "edit_channel_purpose_modal.body": "描述{type}的用途。此文本出现在频道列表的“更多...”菜单中，帮助他人决定是否加入。",
+  "edit_channel_purpose_modal.body": "描述此频道的用途。此文本出现在频道列表的“更多...”菜单中，帮助他人决定是否加入。",
   "edit_channel_purpose_modal.cancel": "取消",
-  "edit_channel_purpose_modal.channel": "频道",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "频道用途过长,请长话短说",
-  "edit_channel_purpose_modal.group": "群组",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "保存",
   "edit_channel_purpose_modal.title1": "编辑用途",
   "edit_channel_purpose_modal.title2": "编辑用途",
@@ -1287,18 +1287,18 @@
   "emoji_list.name": "名称",
   "emoji_list.search": "搜索自定义表情符",
   "emoji_list.somebody": "其他团队某人",
-  "emoji_picker.activity": "Activity",
-  "emoji_picker.custom": "Custom",
-  "emoji_picker.emojiPicker": "Emoji Picker",
+  "emoji_picker.activity": "活动",
+  "emoji_picker.custom": "自定义",
+  "emoji_picker.emojiPicker": "表情选择器",
   "emoji_picker.flags": "标记",
-  "emoji_picker.food": "Food",
-  "emoji_picker.nature": "Nature",
-  "emoji_picker.objects": "Objects",
-  "emoji_picker.people": "People",
-  "emoji_picker.recent": "Recently Used",
+  "emoji_picker.food": "食物",
+  "emoji_picker.nature": "自然",
+  "emoji_picker.objects": "物品",
+  "emoji_picker.people": "人物",
+  "emoji_picker.recent": "最近使用",
   "emoji_picker.search": "搜索",
-  "emoji_picker.symbols": "Symbols",
-  "emoji_picker.travel": "Travel",
+  "emoji_picker.symbols": "符号",
+  "emoji_picker.travel": "旅游",
   "error.not_found.link_message": "返回Mattermost",
   "error.not_found.message": "您访问的页面不存在",
   "error.not_found.title": "页面未找到",
@@ -1542,7 +1542,7 @@
   "intro_messages.channel": "频道",
   "intro_messages.creator": "这是{name}{type}的开端，由{creator}于{date}建立。",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "私有组",
+  "intro_messages.group": "私有频道",
   "intro_messages.invite": "邀请其他人到{type}",
   "intro_messages.inviteOthers": "邀请其他人入组",
   "intro_messages.noCreator": "这是{name}{type}的开端，于{date}建立。",
@@ -1636,38 +1636,38 @@
   "mfa.setup.step2": "<strong>第二布：</strong>使用 Google Authenticator 扫描此 QR 码，或手动输入密码",
   "mfa.setup.step3": "<strong>第三步：</strong>输入 Google Authenticator 生成的令牌",
   "mfa.setupTitle": "多重验证设置",
-  "mobile.about.appVersion": "App Version: {version} (Build {number})",
-  "mobile.about.copyright": "版权所有 2016 Mattermost, Inc. 保留所有权利",
-  "mobile.about.database": "Database: {type}",
-  "mobile.about.serverVersion": "Server Version: {version} (Build {number})",
-  "mobile.about.serverVersionNoBuild": "Server Version: {version}",
-  "mobile.account.notifications.email.footer": "When offline or away for more than five minutes",
-  "mobile.account_notifications.mentions_footer": "Your username (\"@{username}\") will always trigger mentions.",
+  "mobile.about.appVersion": "应用版本：{version} (Build {number})",
+  "mobile.about.copyright": "版权所有 2015-{currentYear} Mattermost, Inc. 保留所有权利",
+  "mobile.about.database": "数据库：{type}",
+  "mobile.about.serverVersion": "服务端版本：{version} (Build {number})",
+  "mobile.about.serverVersionNoBuild": "服务端版本：{version}",
+  "mobile.account.notifications.email.footer": "当离线或离开超过五分钟",
+  "mobile.account_notifications.mentions_footer": "您的用户名 (\"@{username}\") 将永远触发提及。",
   "mobile.account_notifications.non-case_sensitive_words": "Other non-case sensitive words...",
-  "mobile.account_notifications.reply.header": "Send reply notifications for",
+  "mobile.account_notifications.reply.header": "发送回复通知给",
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "您确认要删除{term}{name}？",
   "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
   "mobile.channel_info.alertNo": "否",
   "mobile.channel_info.alertTitleDeleteChannel": "删除 {term}",
-  "mobile.channel_info.alertTitleLeaveChannel": "离开{term}",
-  "mobile.channel_info.alertYes": "是的",
-  "mobile.channel_info.privateChannel": "Private Channel",
+  "mobile.channel_info.alertTitleLeaveChannel": "离开 {term}",
+  "mobile.channel_info.alertYes": "是",
+  "mobile.channel_info.privateChannel": "私有频道",
   "mobile.channel_info.publicChannel": "公共频道",
   "mobile.channel_list.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
   "mobile.channel_list.alertNo": "否",
-  "mobile.channel_list.alertTitleLeaveChannel": "离开{term}",
-  "mobile.channel_list.alertYes": "是的",
-  "mobile.channel_list.closeDM": "Close Direct Message",
-  "mobile.channel_list.closeGM": "Close Group Message",
+  "mobile.channel_list.alertTitleLeaveChannel": "离开 {term}",
+  "mobile.channel_list.alertYes": "是",
+  "mobile.channel_list.closeDM": "关闭组消息",
+  "mobile.channel_list.closeGM": "关闭组消息",
   "mobile.channel_list.dm": "私信",
-  "mobile.channel_list.gm": "Group Message",
-  "mobile.channel_list.open": "Open {term}",
-  "mobile.channel_list.openDM": "Open Direct Message",
-  "mobile.channel_list.openGM": "Open Group Message",
-  "mobile.channel_list.privateChannel": "Private Channel",
+  "mobile.channel_list.gm": "组消息",
+  "mobile.channel_list.open": "打开 {term}",
+  "mobile.channel_list.openDM": "关闭组消息",
+  "mobile.channel_list.openGM": "打开组消息",
+  "mobile.channel_list.privateChannel": "私有频道",
   "mobile.channel_list.publicChannel": "公共频道",
   "mobile.components.channels_list_view.yourChannels": "您的频道：",
   "mobile.components.error_list.dismiss_all": "Dismiss All",
@@ -1675,25 +1675,25 @@
   "mobile.components.select_server_view.enterServerUrl": "输入服务器网址",
   "mobile.components.select_server_view.proceed": "继续",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
-  "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
-  "mobile.create_channel.public": "公共频道",
-  "mobile.custom_list.no_results": "No Results",
-  "mobile.edit_post.title": "Editing Message",
+  "mobile.create_channel": "创建",
+  "mobile.create_channel.private": "新私有组",
+  "mobile.create_channel.public": "新公共频道",
+  "mobile.custom_list.no_results": "无结果",
+  "mobile.edit_post.title": "编辑消息",
   "mobile.file_upload.camera": "Take Photo or Video",
-  "mobile.file_upload.library": "Photo Library",
+  "mobile.file_upload.library": "照片库",
   "mobile.file_upload.more": "更多",
-  "mobile.loading_channels": "Loading Channels...",
-  "mobile.loading_members": "Loading Members...",
-  "mobile.loading_posts": "Loading Messages...",
-  "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.loading_channels": "正在加载频道...",
+  "mobile.loading_members": "正在加载成员...",
+  "mobile.loading_posts": "正在加载消息...",
+  "mobile.login_options.choose_title": "选择您的登入方式",
   "mobile.post.cancel": "取消",
-  "mobile.post.delete_question": "您确认要删除{term}？",
-  "mobile.post.delete_title": "Delete Post",
+  "mobile.post.delete_question": "您确认要删除此消息？",
+  "mobile.post.delete_title": "删除消息",
   "mobile.request.invalid_response": "Received invalid response from the server.",
-  "mobile.routes.channelInfo": "Info",
-  "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
-  "mobile.routes.channelInfo.delete_channel": "删除频道...",
+  "mobile.routes.channelInfo": "信息",
+  "mobile.routes.channelInfo.createdBy": "{creator} 创建于 ",
+  "mobile.routes.channelInfo.delete_channel": "删除频道",
   "mobile.routes.channelInfo.favorite": "收藏",
   "mobile.routes.channel_members.action": "移除成员",
   "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
@@ -1701,18 +1701,18 @@
   "mobile.routes.channels": "频道",
   "mobile.routes.enterServerUrl": "输入服务器网址",
   "mobile.routes.login": "登录",
-  "mobile.routes.loginOptions": "Login Chooser",
+  "mobile.routes.loginOptions": "登入选择器",
   "mobile.routes.mfa": "多重验证",
   "mobile.routes.postsList": "信息列表",
   "mobile.routes.saml": "Single SignOn",
   "mobile.routes.selectTeam": "选择团队",
-  "mobile.routes.settings": "Settings",
+  "mobile.routes.settings": "设置",
   "mobile.routes.thread": "{channelName} Thread",
   "mobile.routes.thread_dm": "Direct Message Thread",
-  "mobile.routes.user_profile": "Profile",
+  "mobile.routes.user_profile": "个人资料",
   "mobile.routes.user_profile.send_message": "发送消息",
   "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
-  "mobile.server_url.invalid_format": "每个URL必须以http: //或https: //开始",
+  "mobile.server_url.invalid_format": "每个 URL 必须以 http:// 或 https:// 开头",
   "mobile.settings.team_selection": "团队选择",
   "more_channels.close": "关闭",
   "more_channels.create": "创建新频道",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "未选择文件。",
   "setting_upload.select": "选择文件",
   "sidebar.channels": "频道",
-  "sidebar.createChannel": "创建新的频道",
-  "sidebar.createGroup": "创建新组",
+  "sidebar.createChannel": "创建一个公共频道",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "私信",
   "sidebar.favorite": "收藏",
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",
   "sidebar.otherMembers": "此团队之外",
-  "sidebar.pg": "私有组",
+  "sidebar.pg": "私有频道",
   "sidebar.removeList": "从列表删除",
   "sidebar.tutorialScreen1": "<h4>频道</h4><p><strong>频道</strong>组织不同主题的会话。他们对您所在团队的每一个人开放。针对单人发送私人消息使用<strong>私信</strong>针对多人使用<strong>私人组</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>“{townsquare}”和“{offtopic}”频道</h4><p>这里启用了两个公共频道: </p><p><strong>公共频道</strong>是一个团队范围内沟通的地方。团队中的每一个人都是这个频道的一个成员。</p><p><strong>闲聊频道</strong>是一个娱乐幽默与工作无关的频道。您和您的团队可以决定创建其他频道。</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "其他频道",
   "suggestion.mention.nonmembers": "不在频道中",
   "suggestion.mention.special": "特别提及",
-  "suggestion.search.private": "私有组",
+  "suggestion.search.private": "私有频道",
   "suggestion.search.public": "公共频道",
   "team_export_tab.download": "下载",
   "team_export_tab.export": "导出",
@@ -2055,7 +2055,7 @@
   "upload_overlay.info": "拖动文件上传。",
   "user.settings.advance.embed_preview": "如果邮件中的第一个网络链接可用，在邮件下方会显示网站内容的预览",
   "user.settings.advance.embed_toggle": "显示切换所有嵌入预览",
-  "user.settings.advance.emojipicker": "Enable emoji picker in message input box",
+  "user.settings.advance.emojipicker": "在消息输入框开启表情选择器",
   "user.settings.advance.enabledFeatures": "已启用 {count, number} 项功能",
   "user.settings.advance.formattingDesc": "开启时，文章会显示链接，表情符，格式，以及添加断行。默认下，此选项时开启的。修改此设定需要刷新页面。",
   "user.settings.advance.formattingTitle": "启用帖文格式",
@@ -2233,7 +2233,7 @@
   "user.settings.notifications.desktop.unlimited": "无限制",
   "user.settings.notifications.desktopSounds": "桌面通知声音",
   "user.settings.notifications.email.disabled": "被系统管理员禁用",
-  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
+  "user.settings.notifications.email.disabled_long": "您的系统管理员已禁用邮件通知。",
   "user.settings.notifications.email.everyHour": "每小时",
   "user.settings.notifications.email.everyXMinutes": "每 {count} 分钟",
   "user.settings.notifications.email.immediately": "立刻",
diff --git a/webapp/i18n/zh-TW.json b/webapp/i18n/zh-TW.json
index 435aa01b6..917305005 100644
--- a/webapp/i18n/zh-TW.json
+++ b/webapp/i18n/zh-TW.json
@@ -328,13 +328,13 @@
   "admin.general.policy.permissionsSystemAdmin": "系統管理員",
   "admin.general.policy.restrictPostDeleteDescription": "設定誰擁有刪除訊息的權限",
   "admin.general.policy.restrictPostDeleteTitle": "允許哪個使用者刪除訊息：",
-  "admin.general.policy.restrictPrivateChannelCreationDescription": "設定誰能建立私人群組的政策。",
-  "admin.general.policy.restrictPrivateChannelCreationTitle": "允許建立私人群組：",
+  "admin.general.policy.restrictPrivateChannelCreationDescription": "設定誰能建立公開頻道的政策。",
+  "admin.general.policy.restrictPrivateChannelCreationTitle": "允許建立公開頻道：",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "命令列工具",
-  "admin.general.policy.restrictPrivateChannelDeletionDescription": "設定誰能刪除私人群組的政策。被刪除的群組可以利用 {commandLineToolLink} 從資料庫中還原。",
-  "admin.general.policy.restrictPrivateChannelDeletionTitle": "允許刪除私人群組：",
-  "admin.general.policy.restrictPrivateChannelManagementDescription": "設定誰能更名私人群組與設定其標題的政策。",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "允許更名私人群組：",
+  "admin.general.policy.restrictPrivateChannelDeletionDescription": "設定誰能刪除公開頻道的政策。被刪除的頻道可以利用 {commandLineToolLink} 從資料庫中還原。",
+  "admin.general.policy.restrictPrivateChannelDeletionTitle": "允許刪除公開頻道：",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "設定誰能更名公開頻道與設定其標題的政策。",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "允許更名公開頻道：",
   "admin.general.policy.restrictPublicChannelCreationDescription": "設定誰能建立公開頻道的政策。",
   "admin.general.policy.restrictPublicChannelCreationTitle": "允許建立公開頻道：",
   "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "命令列工具",
@@ -691,7 +691,7 @@
   "admin.service.corsTitle": "允許來自下列網址的跨站請求：",
   "admin.service.developerDesc": "啟用時，Javascript 錯誤會顯示在使用者界面頂端上的紅色橫欄。不建議在正式環境中使用。",
   "admin.service.developerTitle": "啟用開發者模式：",
-  "admin.service.enforcMfaTitle": "強制使用多重要素驗證：",
+  "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "啟用時，登入必須使用<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重要素驗證</a>。新的使用者將會在登錄時被要求設定多重要素驗證。已登入但沒有設定多重要素驗證的使用者將會被重新導向至多重要素驗證設定頁面直到完成設定為止。<br/><br/>如果使用了 AD/LDAP 與電子郵件以外的登入方式，多重要素驗證必須要在認證提供者處設定。 ",
   "admin.service.forward80To443": "轉送80通訊埠至443：",
   "admin.service.forward80To443Description": "轉送所有經由80通訊埠的不安全連線至安全的443通訊埠",
@@ -743,7 +743,7 @@
   "admin.service.webhooksTitle": "啟用傳出的 Webhook：",
   "admin.service.writeTimeout": "寫入逾時：",
   "admin.service.writeTimeoutDescription": "如果使用 HTTP (不安全)，這是從讀取請求完畢後到寫入回應之間最多所能使用的時間。如果使用 HTTPS，這是從連線被接受後到寫入回應之間最多所能使用的時間。",
-  "admin.sidebar.addTeamSidebar": "從側邊欄選單加入團隊",
+  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "進階",
   "admin.sidebar.audits": "規範與審計",
   "admin.sidebar.authentication": "認證",
@@ -784,7 +784,7 @@
   "admin.sidebar.push": "行動推播",
   "admin.sidebar.rateLimiting": "張貼速率限制",
   "admin.sidebar.reports": "報告",
-  "admin.sidebar.rmTeamSidebar": "從側邊欄選單移除團隊",
+  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "安全",
   "admin.sidebar.sessions": "工作階段",
@@ -794,7 +794,7 @@
   "admin.sidebar.statistics": "團隊統計",
   "admin.sidebar.storage": "儲存區",
   "admin.sidebar.support": "法律與支援",
-  "admin.sidebar.teams": "團隊 ({count, number})",
+  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "使用者",
   "admin.sidebar.usersAndTeams": "使用者與團隊",
   "admin.sidebar.view_statistics": "系統統計",
@@ -880,8 +880,8 @@
   "admin.team_analytics.activeUsers": "有發文的活躍使用者",
   "admin.team_analytics.totalPosts": "全部發文",
   "admin.true": "是",
-  "admin.userList.title": "{team}的使用者",
-  "admin.userList.title2": "{team} ({count})的使用者",
+  "admin.userList.title": "Users for {team}",
+  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>登入方式：</strong>電子郵件",
   "admin.user_item.authServiceNotEmail": "<strong>登入方式：</strong>{service}",
   "admin.user_item.confirmDemoteDescription": "如果將自己從系統管理員降級且不存在其它有管理員權限的使用者。則必須以終端機方式存取 Mattermost 伺服器並執行下列命令以重新指定新的系統管理員。",
@@ -901,7 +901,7 @@
   "admin.user_item.resetMfa": "移除多重要素驗證",
   "admin.user_item.resetPwd": "重置我的密碼",
   "admin.user_item.switchToEmail": "切換帳戶到電子郵件地址/密碼",
-  "admin.user_item.sysAdmin": "系統管理員",
+  "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "團隊管理員",
   "admin.webrtc.enableDescription": "啟用時，Mattermost 將可以展開<strong>一對一</strong>的視訊通話。WebRTC 通話可在 Chrome, Firefox 和 Mattermost 桌面應用程式上使用。",
   "admin.webrtc.enableTitle": "啟用 Mattermost WebRTC：",
@@ -941,7 +941,7 @@
   "analytics.system.dailyActiveUsers": "每日活躍使用者",
   "analytics.system.monthlyActiveUsers": "每月活躍使用者",
   "analytics.system.postTypes": "發文,檔案與#標籤",
-  "analytics.system.privateGroups": "私人群組",
+  "analytics.system.privateGroups": "Private Groups",
   "analytics.system.publicChannels": "公開頻道",
   "analytics.system.skippedIntensiveQueries": "部份統計已被停用以獲得最大的效能。可以在 config.json 中重新啟用它們。詳請參閱 <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "以純文字發文",
@@ -961,7 +961,7 @@
   "analytics.system.totalWebsockets": "Websocket 連線",
   "analytics.team.activeUsers": "有發文的活躍使用者",
   "analytics.team.newlyCreated": "新建的使用者",
-  "analytics.team.privateGroups": "私人群組",
+  "analytics.team.privateGroups": "Private Groups",
   "analytics.team.publicChannels": "公開頻道",
   "analytics.team.recentActive": "最近的活躍使用者",
   "analytics.team.recentUsers": "最近的活躍使用者",
@@ -1059,28 +1059,28 @@
   "channelHeader.removeFromFavorites": "從我的最愛中移除",
   "channel_flow.alreadyExist": "該網址的頻道已經存在",
   "channel_flow.changeUrlDescription": "有網址不允許使用的字元時會自動移除。",
-  "channel_flow.changeUrlTitle": "變更 {term} 網址",
-  "channel_flow.channel": "頻道",
-  "channel_flow.create": "建立 {term}",
-  "channel_flow.group": "群組",
+  "channel_flow.changeUrlTitle": "Change {term} URL",
+  "channel_flow.channel": "Channel",
+  "channel_flow.create": "離開頻道",
+  "channel_flow.group": "Group",
   "channel_flow.handleTooShort": "頻道網址必須為小寫英數字、至少兩個字元",
   "channel_flow.invalidName": "無效的頻道名稱",
-  "channel_flow.set_url_title": "設定 {term} 網址",
+  "channel_flow.set_url_title": "Set {term} URL",
   "channel_header.addMembers": "新增成員",
   "channel_header.addToFavorites": "新增至我的最愛",
-  "channel_header.channel": "頻道",
+  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "編輯頻道標題",
-  "channel_header.delete": "刪除{term}",
+  "channel_header.delete": "刪除頻道...",
   "channel_header.flagged": "被標記的訊息",
-  "channel_header.group": "群組",
-  "channel_header.leave": "退出{term}",
+  "channel_header.group": "Group",
+  "channel_header.leave": "離開頻道",
   "channel_header.manageMembers": "成員管理",
   "channel_header.notificationPreferences": "通知喜好設定",
   "channel_header.recentMentions": "最近提及",
   "channel_header.removeFromFavorites": "從我的最愛中移除",
-  "channel_header.rename": "變更{term}名稱",
-  "channel_header.setHeader": "編輯{term}標題",
-  "channel_header.setPurpose": "編輯{term}用途",
+  "channel_header.rename": "變更頻道名稱",
+  "channel_header.setHeader": "編輯頻道標題",
+  "channel_header.setPurpose": "Edit {term} Purpose",
   "channel_header.viewInfo": "檢視資訊",
   "channel_header.viewMembers": "檢視成員",
   "channel_header.webrtc.call": "開始視訊通話",
@@ -1115,26 +1115,26 @@
   "channel_members_modal.addNew": " 增加新成員",
   "channel_members_modal.members": " 成員",
   "channel_modal.cancel": "取消",
-  "channel_modal.channel": "頻道",
-  "channel_modal.createNew": "建立新的",
+  "channel_modal.channel": "Channel",
+  "channel_modal.createNew": "建立頻道",
   "channel_modal.descriptionHelp": "說明{term}如何使用。",
   "channel_modal.displayNameError": "Channel name must be 2 or more characters",
   "channel_modal.edit": "編輯",
-  "channel_modal.group": "群組",
+  "channel_modal.group": "Group",
   "channel_modal.header": "標題",
   "channel_modal.headerEx": "如：\"[連結標題](http://example.com)\"",
   "channel_modal.headerHelp": "設定除了{term}名字以外還會顯示在{term}標題的文字。舉例來說，可以輸入 [Link Title](http://example.com) 以顯示常用連結。",
-  "channel_modal.modalTitle": "新增",
+  "channel_modal.modalTitle": "New ",
   "channel_modal.name": "名字",
   "channel_modal.nameEx": "例如：\"Bugs\"、\"市場\"、\"客户支持\"",
   "channel_modal.optional": "(非必須)",
   "channel_modal.privateGroup1": "建立非開放的私人群組。 ",
-  "channel_modal.privateGroup2": "建立私人群組",
+  "channel_modal.privateGroup2": "建立公開頻道",
   "channel_modal.publicChannel1": "建立公開頻道",
   "channel_modal.publicChannel2": "建立一個人人可加入的頻道。 ",
   "channel_modal.purpose": "用途",
   "channel_modal.purposeEx": "如：\"用於歸檔錯誤跟改善的頻道\"",
-  "channel_notification.push": "發送行動推播通知",
+  "channel_notification.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "所有的活動所有的活動",
   "channel_notifications.allUnread": "全部的未讀訊息",
   "channel_notifications.globalDefault": "系統預設({notifyLevel})",
@@ -1229,10 +1229,10 @@
   "custom_emoji.search": "搜尋自訂繪文字",
   "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
   "delete_channel.cancel": "取消",
-  "delete_channel.channel": "頻道",
+  "delete_channel.channel": "channel",
   "delete_channel.confirm": "請確認刪除頻道",
   "delete_channel.del": "刪除",
-  "delete_channel.group": "群組",
+  "delete_channel.group": "group",
   "delete_channel.question": "這將會從團隊刪除頻道並且禁止所有使用者存取頻道內容。您確定要刪除{display_name}{term}？",
   "delete_post.cancel": "取消",
   "delete_post.comment": "註解",
@@ -1249,9 +1249,9 @@
   "edit_channel_header_modal.title_dm": "修改標題",
   "edit_channel_purpose_modal.body": "描述 {type} 的用途。這敘述會顯示在頻道列表的\"更多...\"選單當中，其他人可以以此決定要不要加入。",
   "edit_channel_purpose_modal.cancel": "取消",
-  "edit_channel_purpose_modal.channel": "頻道",
+  "edit_channel_purpose_modal.channel": "Channel",
   "edit_channel_purpose_modal.error": "頻道用途太長,請長話短說",
-  "edit_channel_purpose_modal.group": "群組",
+  "edit_channel_purpose_modal.group": "Group",
   "edit_channel_purpose_modal.save": "儲存",
   "edit_channel_purpose_modal.title1": "編輯用途",
   "edit_channel_purpose_modal.title2": "編輯用途。目標：",
@@ -1542,7 +1542,7 @@
   "intro_messages.channel": "頻道",
   "intro_messages.creator": "這是{name}{type}的開頭，由{creator}建立於{date}。",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
-  "intro_messages.group": "私有群組",
+  "intro_messages.group": "private group",
   "intro_messages.invite": "邀請他人來此{type}",
   "intro_messages.inviteOthers": "邀請他人來此團隊",
   "intro_messages.noCreator": "這是{name}{type}的開頭，建立於{date}。",
@@ -1648,7 +1648,7 @@
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "確定要刪除{term}嘛？",
   "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
   "mobile.channel_info.alertNo": "否",
   "mobile.channel_info.alertTitleDeleteChannel": "刪除{term}",
@@ -1892,14 +1892,14 @@
   "setting_upload.noFile": "未選取任何檔案。",
   "setting_upload.select": "選取檔案",
   "sidebar.channels": "頻道",
-  "sidebar.createChannel": "建立頻道",
-  "sidebar.createGroup": "建立群組",
+  "sidebar.createChannel": "建立公開頻道",
+  "sidebar.createGroup": "Create new group",
   "sidebar.direct": "直接訊息",
   "sidebar.favorite": "我的最愛",
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",
   "sidebar.otherMembers": "此團隊以外",
-  "sidebar.pg": "私人群組",
+  "sidebar.pg": "Private Groups",
   "sidebar.removeList": "從清單中移除",
   "sidebar.tutorialScreen1": "<h4>頻道</h4><p><strong>頻道</strong>用來展開關於各種話題的對話。頻道對團隊全體都是開放可以任意讀寫的。需要私密通訊時，對單獨一人時使用<strong>直接訊息</strong>，對多人時使用<strong>私人群組</strong>。</p>",
   "sidebar.tutorialScreen2": "<h4>\"{townsquare}\"跟\"{offtopic}\"頻道</h4><p>以下為兩個一開始就建立好的公開頻道：</p><p><strong>{townsquare}</strong>是個給團隊之間溝通的地方，您的團隊全員都是這個頻道的成員。</p><p><strong>{offtopic}</strong>是個放鬆心情、聊與工作無關事情的地方。您和團隊可以決定要建立其他怎樣的頻道。</p>",
@@ -1979,7 +1979,7 @@
   "suggestion.mention.morechannels": "其他頻道",
   "suggestion.mention.nonmembers": "不在頻道中",
   "suggestion.mention.special": "特別提及",
-  "suggestion.search.private": "私人群組",
+  "suggestion.search.private": "Private Groups",
   "suggestion.search.public": "公開頻道",
   "team_export_tab.download": "下載",
   "team_export_tab.export": "匯出",