translations PR 20160929 (#4123)

10 files changed, 1046 insertions, 146 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 0bc232a79..6708cb2ca 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -48,10 +48,6 @@
     "translation": "September"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Leeres Array unterhalb von 'certificate' in der Anfrage"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "keine Datei unter 'certificate' in der Anfrage"
   },
@@ -148,6 +144,10 @@
     "translation": "Fehler beim Verarbeiten der Vorlage %v err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "Konnte Benutzer zu Berechtigungsüberprüfung nicht abrufen."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v wurde von %v zum Channel hinzugefügt"
   },
@@ -818,10 +818,6 @@
     "translation": "Datei überschreitet die maximale Bildgröße."
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "Datei überschreitet die maximale Bildgröße."
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "Datei konnte nicht gefunden werden."
   },
@@ -1154,6 +1150,10 @@
     "translation": "Schlechter Dateiname zurückgewiesen, Dateiname=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "Kann in gelöschten Kanal senden."
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "Ungültige Kanal-ID für den Root-ID Parameter"
   },
@@ -1400,6 +1400,14 @@
     "translation": "Anfragenbegrenzereinstellung nicht korrekt konfiguriert, verwende VaryByHeader und deaktiviere VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Konnte Anfragenbegrenzer nicht initialisieren."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Konnte Anfragenbegrenzer nicht initialisieren."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "Fehler beim Starten des Servers, err:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "E-Mail-Adresse, Passwort: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "Benutzer mit vorhandenem Account verbunden: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Kann Benutzer nicht importieren: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Konnte Regex Match für @Erwähnung für Slack Benutzer {{.UserID}} {{.Username}} nicht erstellen"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Fehlerhafter Zeitstempel gefunden"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- Nachrichten vom Slack Bot werden aktuell nicht unterstützt.\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- Weitere Fehlermeldungen könnten in den Server Logs auffindbar sein.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n Notizen \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "Zip Datei konnte nicht geöffnet werden"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Fehler beim verarbeiten der Slack Kanäle. Import könnte trotzdem funktionieren."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Fehler beim Verarbeiten einiger Slach Nachrichten. Import könnte trotzdem funktionieren."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Initialisieren Status-Api-Routen"
   },
@@ -1636,6 +1664,10 @@
     "translation": "Team Anmeldung mit einer E-Mailadresse ist ausgeschaltet."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Der angegebene Benutzer ist kein Mitglied des angegebenen Teams."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "Sie haben nicht die erforderlichen Zugriffsrechte"
   },
@@ -2356,10 +2388,34 @@
     "translation": "Die Berechtigungen für die Erneuerung des Webhooks-Tokens sind ungeeignet"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "Initialisiere WebRTC-API-Routen"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "WebRTC ist auf diesem Server nicht verfügbar."
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Ungültiger {{.Name}} Parameter"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Die Möglichkeit Benutzer in ein Team einzuladen"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Benutzer einladen"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Die Möglichkeit Slash Befehle zu verwenden"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "Slash Befehle verwenden"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Feature erfordert Enterprise Lizenz. Bitte kontaktieren Sie Ihren Systemadministrator wegen Upgrade Ihrer Enterprise Lizenz."
   },
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "SAML Login war nicht erfolgreich da Verschlüsselung nicht aktiviert ist. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "Konnte existierenden SAML User nicht aktualisieren. Erlaube login trotzdem. err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "WebRTC ist auf diesem Server nicht aktiviert."
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "Ihre Lizenz beinhaltet keine Unterstützung für Mattermost WebRTC"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "Es trat ein Fehler auf beim Versuch, den WebRTC-Token zu registrieren"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "Gehe zurück zu Mattermost"
   },
@@ -3076,6 +3144,10 @@
     "translation": "Ungültige maximale Anzahl an Anmeldeversuchen in Service Einstellungen.  Muss eine positive Zahl sein."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Max burst must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Ungültige maximale Dateigröße in Dateieinstellungen. Muss 0 oder eine positive Zahl sein."
   },
@@ -3164,6 +3236,34 @@
     "translation": "Ungültige maximale Anzahl an offenen Verbindungen in SQL Einstellungen.  Muss eine positive Zahl sein."
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "Das WebRTC-Gateway-Admin-Secret muss gesetzt sein."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "Die WebRTC-Gateway-Admin-URL muss gesetzt und eine gültige URL sein sowie mit http:// oder https:// beginnen."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "Die WebRTC-Gateway-Websocket-URL muss gesetzt und eine gültige URL sein sowie mit ws:// oder wss:// beginnen."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "Die WebRTC STUN URL muss eine gültige URL sein und mit stun: beginnen."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "Der WebRTC TURN Shared Key darf nicht leer sein wenn die TURN URL gesetzt wurde."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "Die WebRTC TURN URL muss eine gültige URL sein und mit turn: beginnen"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "WebRTC TURN Benutzername darf nicht leer sein wenn eine TURN URL gesetzt wurde."
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "Erstellt am muss eine gültige Zeit sein"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 2b5a1e095..d261a9fa6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,26 +48,6 @@
     "translation": "September"
   },
   {
-    "id": "authentication.permissions.team_invite_user.name",
-    "translation": "Invite User"
-  },
-  {
-    "id": "authentication.permissions.team_invite_user.description",
-    "translation": "Ability to invite users to a team"
-  },
-  {
-    "id": "authentication.permissions.team_use_slash_commands.name",
-    "translation": "Use Slash Commands"
-  },
-  {
-    "id": "authentication.permissions.team_use_slash_commands.description",
-    "translation": "Ability to use slash commands"
-  },
-  {
-    "id": "api.auth.unable_to_get_user.app_error",
-    "translation": "Unable to get user to check permissions."
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "No file under 'certificate' in request"
   },
@@ -164,6 +144,10 @@
     "translation": "Error rendering template %v err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "Unable to get user to check permissions."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v added to the channel by %v"
   },
@@ -1480,14 +1464,6 @@
     "translation": "Server is listening on %v"
   },
   {
-    "id": "api.server.start_server.rate_limiting_memory_store",
-    "translation": "Unable to initalize rate limiting memory store. Check MemoryStoreSize config setting."
-  },
-  {
-    "id": "api.server.start_server.rate_limiting_memory_store",
-    "translation": "Unable to initalize rate limiting."
-  },
-  {
     "id": "api.server.start_server.rate.info",
     "translation": "RateLimiter is enabled"
   },
@@ -1496,6 +1472,14 @@
     "translation": "RateLimitSettings not configured properly using VaryByHeader and disabling VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting memory store. Check MemoryStoreSize config setting."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "Error starting server, err:%v"
   },
@@ -1520,14 +1504,6 @@
     "translation": "\r\n Channels Added \r\n"
   },
   {
-    "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Error parsing slack channels. Import may work anyway."
-  },
-  {
-    "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Error parsing some slack posts. Import may work anyway."
-  },
-  {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
     "translation": "Failed to add user to channel: {{.Username}}\r\n"
   },
@@ -1584,6 +1560,10 @@
     "translation": "Unable to import user: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Bad timestamp detected"
   },
@@ -1592,10 +1572,6 @@
     "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
   },
   {
-    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}"
-  },
-  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack Import Log\r\n"
   },
@@ -1628,6 +1604,14 @@
     "translation": "Unable to open zip file"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Error parsing slack channels. Import may work anyway."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Error parsing some slack posts. Import may work anyway."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Initializing status api routes"
   },
@@ -1640,10 +1624,6 @@
     "translation": "Failed to save status for user_id=%v, err=%v"
   },
   {
-    "id": "api.team.update_member_roles.not_a_member",
-    "translation": "Specified user is not a member of specified team."
-  },
-  {
     "id": "api.team.create_team.email_disabled.app_error",
     "translation": "Team sign-up with email is disabled."
   },
@@ -1760,6 +1740,10 @@
     "translation": "Team sign-up with email is disabled."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Specified user is not a member of specified team."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -2492,6 +2476,22 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Ability to invite users to a team"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Invite User"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Ability to use slash commands"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "Use Slash Commands"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
   },
@@ -3132,10 +3132,6 @@
     "translation": "Invalid connection security for email settings.  Must be '', 'TLS', or 'STARTTLS'"
   },
   {
-    "id": "model.config.is_valid.max_burst.app_error",
-    "translation": "Maximum burst size must be greater than zero."
-  },
-  {
     "id": "model.config.is_valid.encrypt_sql.app_error",
     "translation": "Invalid at rest encrypt key for SQL settings.  Must be 32 chars or more."
   },
@@ -3236,6 +3232,10 @@
     "translation": "Invalid maximum login attempts for service settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Maximum burst size must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Invalid max file size for file settings. Must be a zero or positive number."
   },
diff --git a/i18n/es.json b/i18n/es.json
index fb7082907..8ba397fb4 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -48,10 +48,6 @@
     "translation": "Septiembre"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Solicitud con matriz vacia en 'certificate'"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "No hay un archivo bajo la solicitud de 'certificate'"
   },
@@ -148,6 +144,10 @@
     "translation": "Error renderinzando la plantilla %v err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "No se puede obtener el usuario para comprobar los permisos."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v agregado al canal por %v"
   },
@@ -818,10 +818,6 @@
     "translation": "El archivo excede el tamaño máximo para una imagen."
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "El archivo excede el tamaño máximo para una imagen."
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "No se encontró el archivo."
   },
@@ -1154,6 +1150,10 @@
     "translation": "Nombre errado de archivo descartado, archivo=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "No se puede publicar en un canal eliminado."
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "Canal inválido para el parámetro RootId"
   },
@@ -1400,6 +1400,14 @@
     "translation": "La configuración del límite de velocidad no ha sido configurado apropiadamente utilizando VaryByHeader y deshabilitado VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "No se puede iniciar la limitación de velocidad."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "No se puede iniciar la limitación de velocidad."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "Error arrancando el servidor, err:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "Correo electrónico, Contraseña: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "Combinado el usuario con una cuenta existente: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "No se pudo importar el usuario: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "No se pudo compilar la coincidencia del !canal con expresión regular para el canal de Slack {{.ChannelID}} {{.ChannelName}}"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Se ha detectado la marca del tiempo errada"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- mensajes realizadados por el bot de Slack actualmente no son soportados.\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- Errores adicionales pueden ser encontrados en los registros del servidor.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n Notas \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "No se puede abrir el archivo comprimido"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Error de análisis de los canales de slack. Importación puede que funcione de todos modos."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Error en el análisis de los mensajes de slack. Importación puede que funcione de todos modos."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Inicializando rutas del API para los estatus"
   },
@@ -1636,6 +1664,10 @@
     "translation": "El registro a equipos por correo electrónico está deshabilitado."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Usuario especificado no es un miembro de equipo especificado."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "No tienes los permisos apropiados"
   },
@@ -2356,10 +2388,34 @@
     "translation": "Permisos inapropiados para regenerar un token para el Webhook saliente"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "Inicializando rutas del API para WebRTC"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "WebRTC no está disponible en este servidor."
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Parámetro {{.Name}} inválido"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Capacidad para invitar usuarios a un equipo"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Invitar Usuario"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Capacidad para usar comandos de barra"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "Usar Comandos de Barra"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "La característica requiere una licencia enterprise. Por favor, póngase en contacto con su Administrador del Sistema acerca de la actualización de su licencia enterprise."
   },
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "El inicio de sesión con SAML no tuvo éxito porque uno de sus atributos es incorrecto. Por favor, póngase en contacto con su Administrador del Sistema."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "No se puede actualizar el usuario SAML existente. Se Permite el inicio de sesión de todos modos. err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "WebRTC no está habilitado en este servidor."
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "Tu licencia no admite el uso de Mattermost WebRTC"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "Hemos encontrado un error al intentar registrar el Token de WebRTC"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "Volver a Mattermost"
   },
@@ -3076,6 +3144,10 @@
     "translation": "Número inválido de máximos intentos de inició de sesión en la configuración del servicio.  Debe ser un número positivo."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Máximo de Ráfagas debe ser mayor que cero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "El tamaño máximo de archivo para la configuración de archivos es inválido. Debe ser un cero o un número positivo."
   },
@@ -3164,6 +3236,34 @@
     "translation": "Inválida cantidad de conexiones abiertas para la configuración de SQL.  Debe ser un número positivo."
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "La clave secreta de Administración de la Puerta de enlace para WebRTC debe ser asignada."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "La dirección url de Administración de la Puerta de enlace para WebRTC debe ser una dirección válida y comenzar con http:// o https://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "La dirección url de la Puerta de enlace del Websocket para WebRTC debe ser una dirección válida y comenzar con ws:// o wss://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "El STUN URI de WebRTC debe ser un URI válido y comenzar con stun:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "La Clave Compartida del TURN de WebRTC no puede estar vacía si el TURN URI se ha establecido."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "El TURN URI de WebRTC debe ser un URI válido y comenzar con turn:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "El Nombre de usuario del TURN de WebRTC no puede estar vacío si el TURN URI se ha establecido."
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "Create debe ser un tiempo válido"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 23e02b41a..582ce3bf2 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -48,10 +48,6 @@
     "translation": "Septembre"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Tableau vide pour les 'certificats' dans la requête"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "Aucun fichier pour les 'certificats' dans la requête"
   },
@@ -148,6 +144,10 @@
     "translation": "Erreur lors de l'affichage du gabarit (template) %v err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "Unable to get user to check permissions."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v a été ajouté au canal par %v"
   },
@@ -818,10 +818,6 @@
     "translation": "Le fichier dépasse la limite de taille pour les images."
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "Le fichier dépasse la limite de taille pour les images."
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "Impossible de trouver le fichier."
   },
@@ -1154,6 +1150,10 @@
     "translation": "Nom de fichier invalide supprimé, filename=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "Can not post to deleted channel."
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "ChannelId invalide pour le paramètre RootId"
   },
@@ -1400,6 +1400,14 @@
     "translation": "RateLimitSettings pas configuré correctement avec VaryByHeader et VaryByRemoteAddr désactivé"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "Erreur de démarrage du serveur, err : %v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "Courriel, Mot de passe : {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "Merged user with existing account: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Impossible d'importer l'utilisateur : {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Échec de la compilation de la @mention correspondant à l'expression régulière pour l'utilisateur Slack {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Mauvais timestamp détecté"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- Les messages du bot Slack ne sont pas supportés pour l'instant.\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- Additional errors may be found in the server logs.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n Notes \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "Impossible d'ouvrir le fichier zip"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Error parsing slack channels. Import may work anyway."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Error parsing some slack posts. Import may work anyway."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Initialisation des routes de l'api des messages"
   },
@@ -1636,6 +1664,10 @@
     "translation": "L'inscription avec une adresse électronique est désactivée."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Specified user is not a member of specified team."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "Vous n'avez pas les permissions appropriées"
   },
@@ -2356,10 +2388,34 @@
     "translation": "Droits insuffisants pour regénérer le jeton du webhook sortant"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "Initialisation des routes de l'api webhook"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "WebRTC is not available on this server."
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Paramètre {{.Name}} invalide"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Ability to invite users to a team"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Invite User"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Ability to use slash commands"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "Use Slash Commands"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Fonctionnalité désactivée pour la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
   },
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "La connexion via SAML a échoué car un des attributs est incorrect. Veuillez contacter votre administrateur système."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "Impossible de mettre à jour l'utilisateur SAML. Connexion autorisée malgré tout. err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "WebRTC is not enabled in this server."
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "Your license does not support using Mattermost WebRTC"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "We encountered an error trying to register the WebRTC Token"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "Retourner sur Mattermost"
   },
@@ -3076,6 +3144,10 @@
     "translation": "Nombre maximum de tentatives de connexion invalide dans les paramètre de service. Doit être un entier positif."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Max burst must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Taille de fichier max invalide pour les paramètres du fichier. Doit être zéro ou un entier positif."
   },
@@ -3164,6 +3236,34 @@
     "translation": "Nombre maximum de connexions ouvertes invalide dans les paramètres SQL. Doit être un entier positif."
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "WebRTC Gateway Admin Secret must be set."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "WebRTC Gateway Admin Url must be set a valid URL and start with http:// or https://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "WebRTC Gateway Websocket Url must be a valid URL and start with ws:// or wss://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "WebRTC STUN URI must be a valid URI and start with stun:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "WebRTC TURN Shared Key cannot be empty if the TURN URI has been set."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "WebRTC TURN URI must be a valid URI and start with turn:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "WebRTC TURN Username cannot be empty if the TURN URI has been set."
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "La date de création doit être une vraie date valide"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 088518649..a44de8630 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -48,10 +48,6 @@
     "translation": "9月"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "リクエストの'certificate'以下の配列が空です"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "リクエストの'certificate'以下にファイルがありません"
   },
@@ -148,6 +144,10 @@
     "translation": "テンプレート%vの表示中にエラーが発生しました err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "権限を確認するユーザーを取得できません。"
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%vは、%vによってチャンネルに追加されました"
   },
@@ -481,7 +481,7 @@
   },
   {
     "id": "api.command_expand.desc",
-    "translation": "画像プレビューの自動折りたたみをオフにします。"
+    "translation": "画像プレビューの自動折りたたみをオフにします"
   },
   {
     "id": "api.command_expand.name",
@@ -818,10 +818,6 @@
     "translation": "ファイルが最大の画像サイズを超過しました。"
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "ファイルが最大の画像サイズを超過しました。"
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "ファイルが見付かりません。"
   },
@@ -1154,6 +1150,10 @@
     "translation": "不正なファイル名は使えません filename=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "削除済みのチャンネルには投稿できません。"
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "RootIdパラメーターのChannelIdが不正です"
   },
@@ -1400,6 +1400,14 @@
     "translation": "投稿頻度制限が正しく設定されていません。VaryByHeaderを使いVaryByRemoteAddrを無効にしてください"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "投稿頻度制限を初期化できません。"
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "投稿頻度制限を初期化できません。"
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "サーバー開始時にエラーになりました err:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "電子メールアドレス、パスワード: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "既に存在するユーザーとマージしました: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "ユーザーをインポートできません: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Slackチャンネル{{.ChannelID}} {{.ChannelName}}の!channelに一致する正規表現のコンパイルに失敗しました。"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "不正なタイムスタンプが検出されました"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- Slack botの投稿は現在サポートされていません。\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- 詳細なエラーはサーバーログを確認してください。\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n 注意事項 \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "ZIPファイルを開くことができません"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Slackのチャンネルを読み込み中にエラーが発生しました。しかしインポートは継続できます。"
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Slackの投稿を読み込み中にエラーが発生しました。しかしインポートは継続できます。"
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "状態APIルートを初期化しています"
   },
@@ -1636,6 +1664,10 @@
     "translation": "電子メールによるチームへの利用登録は無効です。"
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "指定されたユーザーは指定されたチームに所属していません。"
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "あなたには必要な権限が付与されていません"
   },
@@ -1709,7 +1741,7 @@
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermostにより、メッセージやファイルをPCやスマートフォンか共有することができます。検索やアーカイブもできます。<strong>{{.TeamDisplayName}}</strong>に参加すると、新しいチームにサインインし、以下のアドレスからいつでもこの機能にアクセスできます。: <br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermostにより、メッセージやファイルをPCやスマートフォンから共有することができます。検索やアーカイブもできます。<strong>{{.TeamDisplayName}}</strong>に参加すると、新しいチームにサインインし、以下のアドレスからいつでもこの機能にアクセスできます。: <br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
   },
   {
     "id": "api.templates.invite_body.info",
@@ -1721,7 +1753,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }}が{.SiteName}}の{{ .TeamDisplayName }}に参加するように招待しています。"
+    "translation": "{{ .SenderName }}が{{.SiteName}}の{{ .TeamDisplayName }}に参加するように招待しています。"
   },
   {
     "id": "api.templates.password_change_body.info",
@@ -2356,10 +2388,34 @@
     "translation": "外向きのウェブフックトークンを再生成するのに十分な権限が付与されていません"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "WebRTC APIルートを初期化しています"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "WebRTCはこのサーバーでは利用できません。"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "不正な{{.Name}}パラメーターです"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "チームにユーザーを招待できるようにする"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "ユーザーを招待する"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "スラッシュコマンドを使用できるようにする"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "スラッシュコマンドを使用する"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "機能にはエンタープライズライセンスが必要です。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "SAMLログインは、属性の一つが不正のため、失敗しました。システム管理者に連絡してください。"
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "既存のSAMLユーザーをアップデートすることはできません。ログインは有効です。err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "WebRTCはこのサーバーでは有効化されていません。"
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "あなたのライセンスではMattermost WebRTCを使うことはできません"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "WebRTCトークンを登録する際にエラーが発生しました"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "Mattermostに戻る"
   },
@@ -3076,6 +3144,10 @@
     "translation": "サービス設定の最大ログイン試行回数が不正です。正の数を指定してください。"
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "最大バーストには0より大きな値を指定してください。"
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "ファイル設定の最大ファイルサイズが不正です。ゼロ以上の数を指定してください。"
   },
@@ -3164,6 +3236,34 @@
     "translation": "SQL設定の最大稼働接続数が不正です。正の数を指定してください。"
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "WebRTCゲートウェイ管理者秘密情報を設定してください。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "WebRTCゲートウェイ管理者URLは、http://またはhttps://で始まる有効なURLにしてください。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "WebRTCゲートウェイウェブソケットURLは、ws://またはwss://で始まる有効なURLにしてください。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "WebRTC STUN URIは、stun:から始まる有効なURIにしてください"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "WebRTC TURN共通鍵は、TURN URIが設定されている場合には空欄にすることはできません。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "WebRTC TURN URIは、turn:で始まる有効なURIにしてください"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "WebRTC TURNユーザー名は、TURN URIが設定されている場合には空欄にすることはできません。"
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "作成日時は有効な時刻にしてください"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index fc1bad3b4..96b631ea6 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -48,16 +48,12 @@
     "translation": "9월"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "요청의 'certificate' 항목에 비어있는 배열이 있습니다"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "요청의 'certificate' 항목에 파일이 없습니다."
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "인증서를 열 수 없습니다"
+    "translation": "인증서를 열 수 없습니다."
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
@@ -148,6 +144,10 @@
     "translation": "템플릿 %v 를 렌더링하는 도중 다음 오류가 발생하였습니다: %v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "권한을 확인하기 위한 유저 정보를 가져올 수 없습니다."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v 이/가 %v에 의해 채널에 추가되었습니다"
   },
@@ -705,7 +705,7 @@
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
-    "translation": "시스템 관리자가 개인 링크들 저장을 할 수 없도록 했습니다."
+    "translation": "시스템 관리자가 이메일 배치 기능을 비활성화 했습니다."
   },
   {
     "id": "api.email_batching.check_pending_emails.finished_running",
@@ -818,10 +818,6 @@
     "translation": "파일이 최대 이미지 용량보다 큽니다."
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "파일이 최대 이미지 용량보다 큽니다."
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "파일을 찾을 수 없습니다."
   },
@@ -1154,6 +1150,10 @@
     "translation": "잘못된 파일 이름은 사용할 수 없습니다, filename=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "삭제된 채널에 등록할 수 없습니다."
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "루트 아이디 매개변수의 잘못된 채널 아이디입니다."
   },
@@ -1400,6 +1400,14 @@
     "translation": "RateLimitSettings not configured properly using VaryByHeader and disabling VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "서버 시작중 오류, err:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "이메일, 비밀번호: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "기존 사용자 정보와 병합됩니다: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "불러올 수 없는 사용자: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "잘못된 시간 서식이 있습니다."
   },
@@ -1492,6 +1508,10 @@
     "translation": "- Slack bot posts are currently not supported.\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- Additional errors may be found in the server logs.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n Notes \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "Zip 파일을 열 수 없습니다."
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "슬랙 채널 파싱 중 오류가 발생했습니다. 가져오기는 계속 진행됩니다."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "슬랙 글 파싱 중 오류가 발생했습니다. 가져오기는 계속 진행됩니다."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "상태 API 루트를 초기화 중"
   },
@@ -1636,6 +1664,10 @@
     "translation": "이메일을 통한 팀 가입이 비활성화 되어있습니다."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Specified user is not a member of specified team."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "작업을 할 수 있는 권한이 없습니다"
   },
@@ -2356,10 +2388,34 @@
     "translation": "Outgoing webhook 토큰을 재생성할 권한이 없습니다"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "WebRTC API 경로 초기화 중"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "이 서버에서 WebRTC는 사용할 수 없습니다."
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "적절하지 않은 {{.Name}} 파라미터"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "팀 사용자 초대 권한"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "사용자 초대"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "슬래시 명령어 사용 권한"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "슬래시 명령어 사용"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
@@ -2405,11 +2461,11 @@
   },
   {
     "id": "ent.cluster.incompatible_config.warn",
-    "translation": "Potential incompatibile config detected for clustering with %v"
+    "translation": "클러스터 구성환경에서 함께 쓸수 없을 수도 있는 설정이 발견되었습니다. %v"
   },
   {
     "id": "ent.cluster.licence_disable.app_error",
-    "translation": "Compliance 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
+    "translation": "클러스터링 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
   {
     "id": "ent.cluster.ping_failed.info",
@@ -2453,11 +2509,11 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "Compliance 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
+    "translation": "사용자 정의 이모티콘 제한을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "LDAP disabled or licence does not support LDAP."
+    "translation": "AD/LDAP 비활성화 되었거나 현재 라이센스에서 지원되지 않습니다."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "속성 중 하나가 올바르지 않아 SAML 로그인에 실패했습니다. 시스템 관리자에게 문의하십시오."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "이 서버에서 WebRTC를 사용할 수 없습니다."
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "당신의 라이센스는 Mattermost의 WebRTC 사용을 지원하지 않습니다."
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "WebRTC 토큰 등록 중에 에러가 발생하였습니다."
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "Mattermost로 돌아가기"
   },
@@ -3076,6 +3144,10 @@
     "translation": "Invalid maximum login attempts for service settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Max burst must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "잘못된 파일 최대 용량 설정입니다. 0보다 큰 값이여야 합니다."
   },
@@ -3164,6 +3236,34 @@
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "WebRTC Gateway Admin Secret must be set."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "WebRTC Gateway Admin Url must be set a valid URL and start with http:// or https://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "WebRTC Gateway Websocket Url must be a valid URL and start with ws:// or wss://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "WebRTC STUN URI must be a valid URI and start with stun:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "WebRTC TURN Shared Key cannot be empty if the TURN URI has been set."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "WebRTC TURN URI must be a valid URI and start with turn:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "WebRTC TURN Username cannot be empty if the TURN URI has been set."
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 9fea9d530..a0484caa1 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -48,10 +48,6 @@
     "translation": "September"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "'certificate' veld in de aanvraag is een lege array"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "Geen bestand in 'certificate' veld in aanvraag"
   },
@@ -148,6 +144,10 @@
     "translation": "Template kan niet gerenderd worden %v, fout=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "Niet mogelijk om de rechten te controleren."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v is toegevoegd aan het kanaal door %v"
   },
@@ -818,10 +818,6 @@
     "translation": "Bestand is groter dan maximale afbeeldings grootte."
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "Bestand is groter dan maximale afbeeldings grootte."
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "Kan het bestand niet vinden."
   },
@@ -1154,6 +1150,10 @@
     "translation": "Ongeldige bestandsnaam, bestandsnaam=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "Kan niet plaatsen in verwijdert kanaal."
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "Ongeldig ChannelId voor RootId parameter"
   },
@@ -1400,6 +1400,14 @@
     "translation": "RateLimitSettings niet goed geconfigureerd met behulp van inschakelen VaryByHeader en uitschakelen VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "Fout bij het starten van de server, fout:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "E-mail, Wachtwoord: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "Merged user with existing account: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Kan gebruiker niet importeren: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Mislukt om de @vermelding te maken met reguliere expressie voor Slack gebruiker {{.UserID}} {{.Username}}"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Ongeldige 'timestamp' gevonden"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- Slack bot berichten worden op dit moment niet ondersteund.\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- Additional errors may be found in the server logs.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n Notities \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "Zip bestand kan niet worden geopend"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Error parsing slack channels. Import may work anyway."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Error parsing some slack posts. Import may work anyway."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Het initialiseren van status api routes"
   },
@@ -1617,7 +1645,7 @@
   },
   {
     "id": "api.team.is_team_creation_allowed.domain.app_error",
-    "translation": "Email moet uit bepaalde domeinen komen (b.v. @voorbeeld.nl). Neem contact op met de systeem beheerder voor meer details."
+    "translation": "Email moet uit bepaalde domeinen komen (bijv. @voorbeeld.nl). Neem contact op met de systeem beheerder voor meer details."
   },
   {
     "id": "api.team.permanent_delete_team.attempting.warn",
@@ -1636,6 +1664,10 @@
     "translation": "Team aanmelding via e-mail is uitgeschakeld."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Specified user is not a member of specified team."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "U beschikt niet over de juiste rechten"
   },
@@ -2356,10 +2388,34 @@
     "translation": "Ongeldige rechten om tokens voor uitgaande webhooks opnieuw te genereren"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "Initialisatie van de WebRTC api routes"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "WebRTC is niet beschikbaar op deze server."
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Ongeldige {{.Name}} parameter"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Mogelijkheid om gebruikers uit te nodigen in een team"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Nodig Gebruiker uit"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Mogelijkheid om slash commando's te gebruiken"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "Gebruik Slash Commando's"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Deze optie vereist een enterprise licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
   },
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "SAML aanmelding is mislukt vanwege het ontbreken van encryptie. Neem contact op met de beheerder."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "Kon bestaande SAML gebruiker niet bijwerken. Inloggen toch toestaan. err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "WebRTC is niet ingeschakeld op deze server."
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "Your license does not support using Mattermost WebRTC"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "We encountered an error trying to register the WebRTC Token"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "Ga terug naar Mattermost"
   },
@@ -3076,6 +3144,10 @@
     "translation": "Maximaal aantal inlog poging bij service instellingen. Moet een getal grote dan 0 zijn."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Max burst must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Ongeldige maximale bestandsgrootte voor bestands-instellingen. Moet nul of groter zijn."
   },
@@ -3164,6 +3236,34 @@
     "translation": "Ongeldig maximaal aantal open verbindingen bij SQL instellingen. Moet een getal groter dan 0 zijn."
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "WebRTC Gateway Admin Secret must be set."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "WebRTC Gateway Admin Url must be set a valid URL and start with http:// or https://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "WebRTC Gateway Websocket Url must be a valid URL and start with ws:// or wss://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "WebRTC STUN URI must be a valid URI and start with stun:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "WebRTC TURN Shared Key cannot be empty if the TURN URI has been set."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "WebRTC TURN URI must be a valid URI and start with turn:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "WebRTC TURN Username cannot be empty if the TURN URI has been set."
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "Aangemaakt op moet een geldige tijd zijn"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 896e2f32f..5fa1b5b75 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -48,10 +48,6 @@
     "translation": "Setembro"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Matriz vazia sob o 'certificado' na requisição"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "Nenhum arquivo sob o 'certificado' na requisição"
   },
@@ -148,6 +144,10 @@
     "translation": "Erro ao renderizar o modelo de %v err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "Não foi possível obter o usuário para verificar as permissões."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v adicionado ao canal por %v"
   },
@@ -818,10 +818,6 @@
     "translation": "Arquivo excede o máximo de tamanho de imagem."
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "Arquivo excede o máximo de tamanho de imagem."
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "Não foi possível encontrar o arquivo."
   },
@@ -1154,6 +1150,10 @@
     "translation": "Nome ruim do arquivo descartado, nome do arquivo=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "Não é possível postar em um canal deletado."
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "ChannelId inválido para o parâmetro RootId"
   },
@@ -1400,6 +1400,14 @@
     "translation": "RateLimitSettings não foi configurado corretamente usando VaryByHeader e desativando VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Não foi possível inicializar o rate limiting."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Não foi possível inicializar o rate limiting."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "Erro ao iniciar o servidor, err:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "Email, Senha: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "Mesclado usuário com conta existente: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Não foi possível importar o usuário: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Falha ao compilar o !canal correspondendo a expressão regular para o canal Slack {{.ChannelID}} {{.ChannelName}}"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Data e hora ruim detectada"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- Slack bot posts não é suportado atualmente.\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- Erros adicionais podem existir no log do servidor.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n Notas \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "Não foi possível abrir o arquivo zip"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Erro ao analisar canais do slack. Importação deve funcionar de qualquer maneira."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Erro ao analisar algumas postagens do slack. Importação deve funcionar de qualquer maneira."
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "Inicializando status api routes"
   },
@@ -1636,6 +1664,10 @@
     "translation": "Inscrição com e-mail na equipe está desativado."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Usuário especificado não é um membro da equipe especificada."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "Você não tem a permissão apropriada"
   },
@@ -2356,10 +2388,34 @@
     "translation": "Permissões inadequadas para re-gerar o token do webhook de saída"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "Inicializando WebRTC api routes"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "WebRTC não está disponível neste servidor."
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Parâmetro {{.Name}} inválido"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Permissão para convidar usuários para uma equipe"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Convidar Usuário"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Permissão para usar comandos slash"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "Usar Comandos Slash"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Funcionalidade requer uma licença enterprise. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
   },
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "SAML login não foi bem sucedido porque um dos atributos está incorreto. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "Não é possível atualizar o usuário SAML existente. Permitindo o login de qualquer maneira. err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "WebRTC não está ativo neste servidor."
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "Sua licença não suporta usar Mattermost WebRTC"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "Encontrado um erro ao tentar registrar o Token WebRTC"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "Voltar ao Mattermost"
   },
@@ -3076,6 +3144,10 @@
     "translation": "Inválido máxima tentativas de login em configurações de serviço.  Deve ser um número positivo."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Max burst must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Tamanho máximo do arquivo inválido nas configurações de arquivo. Deve ser zero ou um número positivo."
   },
@@ -3164,6 +3236,34 @@
     "translation": "Inválido máximo de conexões abertas em configurações SQL.  Deve ser um número positivo."
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "Chave Secreta de Administração do WebRTC Gateway precisa ser definida."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "URL de Administração do WebRTC Gateway deve ser uma URL válida e começar com http:// ou https://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "A URL Websocket do WebRTC Gateway deve ser uma URL válida e começar com ws:// ou wss://."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "STUN URI do WebRTC deve ser uma URI e começar com stun:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "A Chave Compartilhada TURN do WebRTC não pode ser vazia se a URI TURN foi definida."
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "URI TURN do WebRTC deve ser uma URI válida e começar com turn:"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "Usuário TURN do WebRTC não pode ser vázio se a URI TURN foi definida."
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "Create deve ser um tempo válido"
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 843390a2f..5b151721c 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -48,10 +48,6 @@
     "translation": "九月"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "请求中‘certificate’为空数组"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "请求中'certificate'下的文件不存在"
   },
@@ -148,6 +144,10 @@
     "translation": "渲染模板出错 %v err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "可以让用户查看权限。"
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v 由 %v 邀请加入频道"
   },
@@ -561,7 +561,7 @@
   },
   {
     "id": "api.command_msg.hint",
-    "translation": "@用户名 '你想发送的消息'"
+    "translation": "@[用户名] '消息'"
   },
   {
     "id": "api.command_msg.list.app_error",
@@ -818,10 +818,6 @@
     "translation": "文件超过最大图像大小。"
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "文件超过最大图像大小。"
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "不能找到文件。"
   },
@@ -1154,6 +1150,10 @@
     "translation": "坏文件名已去除，filename=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "无法发信息到已删除的频道。"
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "RootId参数无效ChannelId"
   },
@@ -1293,7 +1293,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": "在"
+    "translation": " 在 "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_mention",
@@ -1400,6 +1400,14 @@
     "translation": "RateLimitSettings配置没有正确使用VaryByHeader并禁用VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "无法初始化频率限制。"
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "无法初始化频率限制。"
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "启动服务出错, err:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "Email, 密码: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "合并用户到现有帐号：{{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "不能导入用户: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "给 Slack 频道 {{.ChannelID}} {{.ChannelName}} 编译 !频道 正规表达式时失败"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "检测到错误的时间"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- Slack 机器人信息现在不支持。\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- 更多错误可以到服务器日志查看。\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n 注释 \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "不能打开zip文件"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "解析 slack 频道时出错。导入可能仍然可用。"
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "解析 slack 消息时出错。导入可能仍然可用。"
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "初始化状态 API 路由"
   },
@@ -1636,6 +1664,10 @@
     "translation": "使用电子邮件注册团队被禁用。"
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "指定的用户不属于指定的团队。"
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "您没有对应的权限"
   },
@@ -1853,7 +1885,7 @@
   },
   {
     "id": "api.templates.welcome_body.info3",
-    "translation": "Mattermost允许您通过PC或手机分享信息和文件，即时搜索和归档."
+    "translation": "Mattermost 允许您通过PC或手机分享信息和文件，即时搜索和归档。"
   },
   {
     "id": "api.templates.welcome_body.title",
@@ -1929,7 +1961,7 @@
   },
   {
     "id": "api.user.complete_switch_with_oauth.unavailable.app_error",
-    "translation": "本服务器不支持通过OAuth 2.0的{{.Service}} SSO"
+    "translation": "本服务器不支持通过 OAuth 2.0 的 {{.Service}} SSO"
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
@@ -1945,7 +1977,7 @@
   },
   {
     "id": "api.user.create_oauth_user.not_available.app_error",
-    "translation": "本服务器不支持通过OAuth 2.0的{{.Service}} SSO"
+    "translation": "本服务器不支持通过 OAuth 2.0 的 {{.Service}} SSO"
   },
   {
     "id": "api.user.create_profile_image.default_font.app_error",
@@ -2057,7 +2089,7 @@
   },
   {
     "id": "api.user.login_by_oauth.not_available.app_error",
-    "translation": "本服务器不支持通过OAuth 2.0的{{.Service}} SSO"
+    "translation": "本服务器不支持通过 OAuth 2.0 的 {{.Service}} SSO"
   },
   {
     "id": "api.user.login_by_oauth.parse.app_error",
@@ -2356,10 +2388,34 @@
     "translation": "没有权限重新生成传出webhook令牌"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "初始化 WebRTC api 路由中"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "WebRTC 在本服务器不可用。"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "无效的参数 {{.Name}}"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "可以邀请用户到团队"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "邀请用户"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "可以使用斜杠命令"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "使用斜杠命令"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "此功能需要企业授权。请联系您的系统管理员关于升级您的企业许可证。"
   },
@@ -2441,7 +2497,7 @@
   },
   {
     "id": "ent.compliance.run_finished.info",
-    "translation": "依据'{{.FilePath}}'导出{{.JobName}}'任务导出审核完成了{{.Count}}'。"
+    "translation": "合规导出任务 '{{.JobName}}' 已导出 {{.Count}} 条记录到 '{{.FilePath}}'"
   },
   {
     "id": "ent.compliance.run_limit.warning",
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "SAML登入因不正确属性而失败。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "无法更新现有SAML用户。仍允许登入。err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "WebRTC 未在本服务器开启。"
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "您的许可证不支持使用 Mattermost WebRTC"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "我们在注册 WebRTC 令牌时遇到个错误"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "返回到 Mattermost"
   },
@@ -3076,6 +3144,10 @@
     "translation": "无效的最大尝试登录数服务设置。必须是正整数。"
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "最大过载必须大于零。"
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "文件设置中最大大小无效。必须是0或者正整数。"
   },
@@ -3164,6 +3236,34 @@
     "translation": "SQL 设置中最大开启连接数无效。必须是正整数。"
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "WebRTC 网关管理密码必须设定。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "WebRTC 网关管理网址必须时有效的网址并且以 http:// 或 https:// 开头。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "WebRTC 网关 Websocket 网址必须时有效的网址并且以 ws:// 或 wss:// 开头。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "WebRTC STUN URI 必须为有效的 URI 并且以 stun: 开头"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "如果已设 TURN 网址则 WebRTC TURN 共享密钥不能留空。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "WebRTC TURN 网址必须时有效的网址并且以 turn: 开头"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "如果已设 TURN 网址则 WebRTC TURN 用户名不能留空。"
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "创建日期必须为效时间"
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 2910d9962..5a1e96169 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -48,10 +48,6 @@
     "translation": "九月"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "要求中的 'certificate' 欄位為空陣列"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "要求中的 'certificate' 欄位沒有檔案"
   },
@@ -148,6 +144,10 @@
     "translation": "樣板 %v 產生時遇到錯誤 err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "無法取得使用者以檢查權限。"
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v 由 %v 邀請加入頻道"
   },
@@ -818,10 +818,6 @@
     "translation": "檔案大小超出最大影像限制。"
   },
   {
-    "id": "api.file.file_upload.exceeds",
-    "translation": "檔案大小超出最大影像限制。"
-  },
-  {
     "id": "api.file.get_file.not_found.app_error",
     "translation": "找不到檔案。"
   },
@@ -1154,6 +1150,10 @@
     "translation": "無效的檔名，filename=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "無法發文至已刪除的頻道。"
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "RootId 參數的 ChannelId 無效"
   },
@@ -1400,6 +1400,14 @@
     "translation": "張貼速率限制沒有正確的設定，請使用 VaryByHeader 並停用 VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "無法初始化張貼速率限制。"
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "無法初始化張貼速率限制。"
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "啟動伺服器時遇到錯誤 err:%v"
   },
@@ -1468,10 +1476,18 @@
     "translation": "電子郵件，密碼： {{.Email}}，{{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "將使用者與現有帳號合併：{{.Email}}，{{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "無法匯入使用者： {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "無法為 Slack 頻道 {{.ChannelD}} {{.ChannelName}} 編譯匹配!頻道的正規表示式"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "發現錯誤的時間戳記"
   },
@@ -1492,6 +1508,10 @@
     "translation": "- 目前尚未支援 Slack bot 張貼訊息。\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- 伺服器紀錄也許有紀錄到額外的錯誤。\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n 附註 \r\n"
   },
@@ -1508,6 +1528,14 @@
     "translation": "無法開啟 zip 檔案"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "解析 Slack 頻道時發生錯誤。匯入功能有可能照樣運作。"
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "解析 Slack 訊息時發生錯誤。匯入功能有可能照樣運作。"
+  },
+  {
     "id": "api.status.init.debug",
     "translation": "正在初始化狀態 API 路徑"
   },
@@ -1636,6 +1664,10 @@
     "translation": "使用電子郵件註冊團隊已被停用。"
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "指定的使用者不是指定團隊的成員。"
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "您沒有適當的權限"
   },
@@ -2356,10 +2388,34 @@
     "translation": "沒有適當的權限重新產生傳出的 Webhook Token"
   },
   {
+    "id": "api.webrtc.init.debug",
+    "translation": "正在初始化 WebRTC API 路徑"
+  },
+  {
+    "id": "api.webrtc.not_available.app_error",
+    "translation": "此伺服器不支援 WebRTC。"
+  },
+  {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "無效的參數 {{.Name}}"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "允許邀請使用者至團隊"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "邀請使用者"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "允許使用斜線命令"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "使用斜線命令"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "此功能需要企業版授權，請聯繫系統管理員將系統升級為企業版授權。"
   },
@@ -2557,7 +2613,7 @@
   },
   {
     "id": "ent.saml.attribute.app_error",
-    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+    "translation": "由於不正確的屬性，SAML 登入失敗。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2628,6 +2684,18 @@
     "translation": "無法更新現有的 SAML 使用者。總之先允許登入。err=%v"
   },
   {
+    "id": "ent.webrtc.disabled.app_error",
+    "translation": "此伺服器未啟用 WebRTC。"
+  },
+  {
+    "id": "ent.webrtc.license_disable.app_error",
+    "translation": "授權不支援 Mattermost WebRTC"
+  },
+  {
+    "id": "ent.webrtc.register_token.app_error",
+    "translation": "嘗試註冊 WebRTC Token時發生錯誤"
+  },
+  {
     "id": "error.generic.link_message",
     "translation": "回到 Mattermost"
   },
@@ -3076,6 +3144,10 @@
     "translation": "服務設定中的最多登入嘗試次數無效。必須為正數."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Max burst must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "檔案設定中的最大大小無效。必須為0或者正數。"
   },
@@ -3164,6 +3236,34 @@
     "translation": "SQL 設定中的最高開啟連線數無效。必須為正數。"
   },
   {
+    "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
+    "translation": "必須設定 WebRTC 閘道管理員密碼。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
+    "translation": "WebRTC 閘道管理員網址必須是以 http:// 或 https:// 起始的有效網址。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
+    "translation": "WebRTC 閘道 Websocket 網址必須是以 ws:// 或 wss:// 起始的有效網址。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_stun_uri.app_error",
+    "translation": "WebRTC STUN URI 必須是以 stun: 的有效 URI。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
+    "translation": "如果已設定 TURN URI，WebRTC TURN 共享金鑰不能為空。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_uri.app_error",
+    "translation": "WebRTC TURN URI 必須是以 turn: 的有效 URI。"
+  },
+  {
+    "id": "model.config.is_valid.webrtc_turn_username.app_error",
+    "translation": "如果已設定 TURN URI，WebRTC TURN 使用者名稱不能為空。"
+  },
+  {
     "id": "model.emoji.create_at.app_error",
     "translation": "\"新增時間\"必須是一個有效時間"
   },