translations PR 20161122 (#4625)

21 files changed, 1075 insertions, 505 deletions

diff --git a/i18n/de.json b/i18n/de.json
index d221ecb3b..c3cbe03d0 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -101,7 +101,7 @@
   },
   {
     "id": "api.admin.test_email.reenter_password",
-    "translation": "Der SMTP Server, Port oder Benutzername wurde geändert. Bitte geben Sie das SMTP Passwort erneut ein um die Verbindung zu testen."
+    "translation": "Der SMTP Server, Port oder Benutzername wurde geändert. Bitte geben Sie das SMTP Passwort erneut ein, um die Verbindung zu testen."
   },
   {
     "id": "api.admin.test_email.subject",
@@ -273,7 +273,7 @@
   },
   {
     "id": "api.channel.init.debug",
-    "translation": "Initialisieren Kanal-Api-Routen"
+    "translation": "Initialisiere Kanal API Routen"
   },
   {
     "id": "api.channel.join_channel.permissions.app_error",
@@ -289,7 +289,7 @@
   },
   {
     "id": "api.channel.leave.direct.app_error",
-    "translation": "Eine Direktnachricht kann nicht verlassen werden"
+    "translation": "Ein Direktnachrichtenkanal kann nicht verlassen werden"
   },
   {
     "id": "api.channel.leave.last_member.app_error",
@@ -309,7 +309,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "Fehler beim Abrufen des Nutzers während des Sicherns der Kanal Überschrift %v"
+    "translation": "Fehler beim Abrufen des Nutzers während des Sicherns der Kanalüberschrift %v"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
@@ -357,7 +357,7 @@
   },
   {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
-    "translation": "Konnte die Ungelesen-Zahl für user_id=%v und channel_id=%v abrufen, err=%v"
+    "translation": "Konnte die Ungelesen-Zahl für user_id=%v und channel_id=%v nicht abrufen, err=%v"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -405,7 +405,7 @@
   },
   {
     "id": "api.command.init.debug",
-    "translation": "Initialisieren der Datei-Api-Routen"
+    "translation": "Initialisiere Befehle API Routen"
   },
   {
     "id": "api.command.invite_people.desc",
@@ -440,6 +440,14 @@
     "translation": "Die Berechtigungen für die Erneuerung des Befehls-Tokens sind ungeeignet"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Cannot update commands across teams"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "Setzen Sie Ihren Status auf abwesend"
   },
@@ -501,7 +509,7 @@
   },
   {
     "id": "api.command_join.fail.app_error",
-    "translation": "Beim Beitreten zu einem Kanal ist ein Fehler aufgetreten."
+    "translation": "Beim Beitreten des Kanals ist ein Fehler aufgetreten."
   },
   {
     "id": "api.command_join.hint",
@@ -525,11 +533,11 @@
   },
   {
     "id": "api.command_logout.desc",
-    "translation": "Aus Mattermost ausloggen"
+    "translation": "Von Mattermost abmelden"
   },
   {
     "id": "api.command_logout.fail_message",
-    "translation": "Ausloggen fehlgeschlagen"
+    "translation": "Abmelden fehlgeschlagen"
   },
   {
     "id": "api.command_logout.name",
@@ -803,7 +811,7 @@
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Initialisiere Emoji-Api-Routen"
+    "translation": "Initialisiere Emoji API Routen"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -827,11 +835,11 @@
   },
   {
     "id": "api.file.get_file_preview.no_thumbnail.app_error",
-    "translation": "Datei hat kein Vorschaubild."
+    "translation": "Datei hat kein Vorschaubild"
   },
   {
     "id": "api.file.get_file_thumbnail.no_thumbnail.app_error",
-    "translation": "Datei hat kein Miniaturbild."
+    "translation": "Datei hat kein Miniaturbild"
   },
   {
     "id": "api.file.get_info_for_request.no_post.app_error",
@@ -879,7 +887,7 @@
   },
   {
     "id": "api.file.init.debug",
-    "translation": "Initialisieren Datei-Api-Routen"
+    "translation": "Initialisiere Datei API Routen"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.channel.app_error",
@@ -895,7 +903,7 @@
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.get_post_again.warn",
-    "translation": "Während der Migration zur Verwendung von FileInfos konnte die Nachricht abgerufen werdne, post_id=%v, err=%v"
+    "translation": "Während der Migration zur Verwendung von FileInfos konnte die Nachricht abgerufen werden, post_id=%v, err=%v"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.info.app_error",
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "Bildupload nicht möglich. Datei ist zu groß."
+    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -999,7 +1007,7 @@
   },
   {
     "id": "api.file.write_file.s3.app_error",
-    "translation": "Beim schreiben zu S3 ist ein Fehler aufgetreten"
+    "translation": "Beim Schreiben zu S3 ist ein Fehler aufgetreten"
   },
   {
     "id": "api.file.write_file_locally.create_dir.app_error",
@@ -1011,7 +1019,7 @@
   },
   {
     "id": "api.general.init.debug",
-    "translation": "Initialisieren der Datei-API-Routen"
+    "translation": "Initialisiere allgemeine API Routen"
   },
   {
     "id": "api.import.import_post.saving.debug",
@@ -1019,7 +1027,7 @@
   },
   {
     "id": "api.import.import_user.join_team.error",
-    "translation": "Fehler beim Beitritt zum Team während des Imports Meldung=%v"
+    "translation": "Fehler beim Beitritt zum Team während des Imports err=%v"
   },
   {
     "id": "api.import.import_user.joining_default.error",
@@ -1031,7 +1039,7 @@
   },
   {
     "id": "api.import.import_user.set_email.error",
-    "translation": "Fehler beim setzen der E-Mail-Adresse als geprüft. Fehler=%v"
+    "translation": "Fehler beim Setzen der E-Mail-Adresse als geprüft. Fehler=%v"
   },
   {
     "id": "api.license.add_license.array.app_error",
@@ -1051,7 +1059,7 @@
   },
   {
     "id": "api.license.add_license.no_file.app_error",
-    "translation": "keine Datei unter 'licence' in der Anfrage"
+    "translation": "Keine Datei unter 'licence' in der Anfrage"
   },
   {
     "id": "api.license.add_license.open.app_error",
@@ -1071,7 +1079,7 @@
   },
   {
     "id": "api.license.init.debug",
-    "translation": "Initialisiere Datei-Api-Routen"
+    "translation": "Initialisiere Lizenz API Routen"
   },
   {
     "id": "api.license.remove_license.remove.app_error",
@@ -1099,11 +1107,11 @@
   },
   {
     "id": "api.oauth.allow_oauth.turn_off.app_error",
-    "translation": "Der Systemadministrator hat die OAuth2 Authentifizierung deaktiviert."
+    "translation": "Der Systemadministrator hat den OAuth2 Service Provider deaktiviert."
   },
   {
     "id": "api.oauth.authorize_oauth.disabled.app_error",
-    "translation": "Der Systemadministrator hat die OAuth2 Authentifizierung deaktiviert."
+    "translation": "Der Systemadministrator hat den OAuth2 Service Provider deaktiviert."
   },
   {
     "id": "api.oauth.authorize_oauth.missing.app_error",
@@ -1111,11 +1119,11 @@
   },
   {
     "id": "api.oauth.complete_oauth.missing_code.app_error",
-    "translation": "Der Dienstprovider {{.service}} übermittelte keinen Autorisationscode in der Weiterleitungsadresse.\n\nFür [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) stellen Sie sicher das Ihr Administrator die Google+ API aktiviert hat.\n\nFür [Office 365](https://docs.mattermost.com/deployment/sso-office.html) stellen Sie sicher das der Administrator der Microsoft Organisation die Mattermost App aktiviert hat.\n\nFür [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) stellen Sie sicher das die Einrichtungsanleitung befolgt wurde.\n\nWenn Sie die oberen Informationen überprüft haben und immer noch Probleme mit der Konfiguration haben, können Sie in unserem [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) eine Nachricht hinterlassen und wir werden Ihnen gerne bei Ihrem Anliegen helfen."
+    "translation": "Der Dienstprovider {{.service}} übermittelte keinen Autorisationscode in der Weiterleitungsadresse.\n\nFür [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) stellen Sie sicher, dass Ihr Administrator die Google+ API aktiviert hat.\n\nFür [Office 365](https://docs.mattermost.com/deployment/sso-office.html) stellen Sie sicher, dass der Administrator der Microsoft Organisation die Mattermost App aktiviert hat.\n\nFür [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) stellen Sie sicher, dass die Einrichtungsanleitung befolgt wurde.\n\nWenn Sie die oberen Informationen überprüft haben und immer noch Probleme mit der Konfiguration haben, können Sie in unserem [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) eine Nachricht hinterlassen und wir werden Ihnen gerne bei Ihrem Anliegen helfen."
   },
   {
     "id": "api.oauth.delete.permissions.app_error",
-    "translation": "Ungeeignete Berechtigungen um die OAth2 App zu entfernen"
+    "translation": "Ungeeignete Berechtigungen um die OAuth2 App zu entfernen"
   },
   {
     "id": "api.oauth.get_access_token.bad_client_id.app_error",
@@ -1135,11 +1143,11 @@
   },
   {
     "id": "api.oauth.get_access_token.disabled.app_error",
-    "translation": "Der Administrator hat die OAuth2 Authentifizierung deaktiviert."
+    "translation": "Der Administrator hat den OAuth2 Service Provider deaktiviert."
   },
   {
     "id": "api.oauth.get_access_token.expired_code.app_error",
-    "translation": "invalid_grant: Ungültiger oder abgelaufener Authorisationscode"
+    "translation": "invalid_grant: Ungültiger oder abgelaufener Autorisationscode"
   },
   {
     "id": "api.oauth.get_access_token.internal.app_error",
@@ -1167,7 +1175,7 @@
   },
   {
     "id": "api.oauth.get_access_token.redirect_uri.app_error",
-    "translation": "invalid_request: Angegebene redirect_uri entspricht nicht redirect_uri des Authorisationscodes"
+    "translation": "invalid_request: Angegebene redirect_uri entspricht nicht redirect_uri des Autorisationscodes"
   },
   {
     "id": "api.oauth.get_access_token.refresh_token.app_error",
@@ -1179,11 +1187,11 @@
   },
   {
     "id": "api.oauth.init.debug",
-    "translation": "Initialisiere OAuth-Api-Routen"
+    "translation": "Initialisiere OAuth API Routen"
   },
   {
     "id": "api.oauth.regenerate_secret.app_error",
-    "translation": "Ungeeignete Berechtigungen um den OAth2 App Schlüssel neu zu generieren"
+    "translation": "Ungeeignete Berechtigungen um den OAuth2 App Schlüssel neu zu generieren"
   },
   {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
@@ -1215,11 +1223,11 @@
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} und {{.LastUsername}} wurden erwähnt, aber sie haben keine Benachrichtigung erhalten weil sie nicht im Kanal sind."
+    "translation": "{{.Usernames}} und {{.LastUsername}} wurden erwähnt, aber sie haben keine Benachrichtigung erhalten, weil sie nicht im Kanal sind."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} wurde benachrichtigt, aber er hat keine Benachrichtigung erhalten, weil er nicht im Channel ist."
+    "translation": "{{.Username}} wurde benachrichtigt, aber er hat keine Benachrichtigung erhalten, weil er nicht im Kanal ist."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -1231,15 +1239,15 @@
   },
   {
     "id": "api.post.create_post.can_not_post_to_deleted.error",
-    "translation": "Kann in gelöschten Kanal senden."
+    "translation": "Kann nicht 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"
+    "translation": "Ungültige Kanal-ID für den Root-ID-Parameter"
   },
   {
     "id": "api.post.create_post.last_viewed.error",
-    "translation": "Fehler beim Aktualisieren der zuletzt aufgerufenen, channel_id=%s, user_id=%s, err=%v"
+    "translation": "Fehler beim Aktualisieren des Werts, Zuletzt aufgerufen“, channel_id=%s, user_id=%s, err=%v"
   },
   {
     "id": "api.post.create_post.parent_id.app_error",
@@ -1325,7 +1333,7 @@
   },
   {
     "id": "api.post.init.debug",
-    "translation": "Initialisieren Datei-Api-Routen"
+    "translation": "Initialisieren Nachrichten API Routen"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
@@ -1457,7 +1465,7 @@
   },
   {
     "id": "api.preference.init.debug",
-    "translation": "Initialisieren Datei-Api-Routen"
+    "translation": "Initialisieren Einstellungen API Routen"
   },
   {
     "id": "api.preference.save_preferences.decode.app_error",
@@ -1689,7 +1697,7 @@
   },
   {
     "id": "api.status.init.debug",
-    "translation": "Initialisieren Status-Api-Routen"
+    "translation": "Initialisieren Status API Routen"
   },
   {
     "id": "api.status.last_activity.error",
@@ -1757,7 +1765,7 @@
   },
   {
     "id": "api.team.init.debug",
-    "translation": "Initialisieren Datei-Api-Routen"
+    "translation": "Initialisieren Team API Routen"
   },
   {
     "id": "api.team.invite_members.admin",
@@ -2201,7 +2209,7 @@
   },
   {
     "id": "api.user.init.debug",
-    "translation": "Initialisieren Datei-Api-Routen"
+    "translation": "Initialisiere Benutzer API Routen"
   },
   {
     "id": "api.user.ldap_to_email.not_available.app_error",
@@ -2461,7 +2469,7 @@
   },
   {
     "id": "api.web_socket.init.debug",
-    "translation": "Initialisieren Web-Socket-Api-Routen"
+    "translation": "Initialisiere WebSocket API Routen"
   },
   {
     "id": "api.web_socket_handler.log.error",
@@ -2533,7 +2541,7 @@
   },
   {
     "id": "api.webhook.init.debug",
-    "translation": "Initialisieren webhook-Api-Routen"
+    "translation": "Initialisiere Webhook API Routen"
   },
   {
     "id": "api.webhook.regen_outgoing_token.disabled.app_error",
@@ -2549,7 +2557,7 @@
   },
   {
     "id": "api.webrtc.init.debug",
-    "translation": "Initialisiere WebRTC-API-Routen"
+    "translation": "Initialisiere WebRTC API Routen "
   },
   {
     "id": "api.webrtc.register_token.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "Benutzerdefinierte Emojireaktionen durch die aktuelle Lizenz deaktiviert. Bitte kontaktieren Sie Ihren Systemadministrator wegen eines Enterprise Lizenzupgrades."
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "Unable to create LDAP user."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP deaktiviert oder Lizenz unterstützt kein AD/LDAP."
   },
@@ -5169,7 +5181,7 @@
   },
   {
     "id": "web.init.debug",
-    "translation": "Initialisieren Datei-Api-Routen"
+    "translation": "Initialisiere Web Routen"
   },
   {
     "id": "web.login.error",
diff --git a/i18n/en.json b/i18n/en.json
index 6f82c9c16..10652ba72 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2712,14 +2712,14 @@
     "translation": "Custom emoji restrictions disabled by current license. Please contact your system administrator about upgrading your enterprise license."
   },
   {
-    "id": "ent.ldap.disabled.app_error",
-    "translation": "AD/LDAP disabled or licence does not support AD/LDAP."
-  },
-  {
     "id": "ent.ldap.create_fail",
     "translation": "Unable to create LDAP user."
   },
   {
+    "id": "ent.ldap.disabled.app_error",
+    "translation": "AD/LDAP disabled or licence does not support AD/LDAP."
+  },
+  {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
     "translation": "Unable to bind to AD/LDAP server. Check BindUsername and BindPassword."
   },
diff --git a/i18n/es.json b/i18n/es.json
index 7b63c2664..dd3a0aeba 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -365,7 +365,7 @@
   },
   {
     "id": "api.command.delete.app_error",
-    "translation": "Permisos inapropiados para utilizar el comando de borrar"
+    "translation": "Permisos inapropiados para eliminar el comando de barra"
   },
   {
     "id": "api.command.disabled.app_error",
@@ -440,6 +440,14 @@
     "translation": "Permisos inapropiados para utilizar le comando de regenerar token"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "No se puede actualizar comandos a través de equipos"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "Permisos inapropiados para actualizar el comando de barra"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "Establece tu estado como ausente"
   },
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "No se pudo subir la imagen. El archivo es demasiado grande."
+    "translation": "No se pudo subir el archivo que supera las dimensiones máximas: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "Las restricciones de los Emoticones Personalizados están desactivadas por la licencia actual. Por favor contacta a un Administrador del Sistema sobre como actualizar a una licencia enterprise."
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "No se puede crear el usuario de LDAP."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP deshabilitado o la licencia no es compatible con AD/LDAP."
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 9c92c7da9..4e65a8598 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -440,6 +440,14 @@
     "translation": "Droits insuffisants pour regénérer la clé de commande"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Cannot update commands across teams"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "Droits insuffisants pour supprimer la commande"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "Changer votre état en « Absent »."
   },
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "Impossible d'envoyer le fichier image. Le fichier est trop volumineux."
+    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "Les émoticônes personnalisées sont désactivées par la licence actuellement utilisée. Veuillez contacter votre administrateur système à propos d'une mise à niveau vers la licence entreprise."
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "Impossible de créer l'utilisateur LDAP."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP désactivé ou votre licence ne supporte pas AD/LDAP."
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index cfb389ca1..33db3ee86 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -365,7 +365,7 @@
   },
   {
     "id": "api.command.delete.app_error",
-    "translation": "削除コマンドに必要な権限が付与されていません"
+    "translation": "コマンドの削除に必要な権限が付与されていません"
   },
   {
     "id": "api.command.disabled.app_error",
@@ -440,6 +440,14 @@
     "translation": "コマンドトークンを再生成するために必要な権限が付与されていません"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Cannot update commands across teams"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "コマンドの更新に必要な権限が付与されていません"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "離席状態に設定します"
   },
@@ -629,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCTRL+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCTRL+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n#[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
+    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCTRL+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCTRL+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n~[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCMD+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCMD+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n#[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
+    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCMD+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCMD+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n~[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "画像ファイルをアップロードできません。ファイルが大き過ぎます。"
+    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "カスタム絵文字の制限機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "LDAPユーザーを作成できません。"
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAPが無効化されている、またはライセンスがAD/LDAPをサポートしていません。"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index bd639520a..4be42dd57 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -440,6 +440,14 @@
     "translation": "명령어 토큰을 재생성할 권한 없음"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Cannot update commands across teams"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "삭제 명령 권한 없음"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "현재 상태를 자리비움으로 설정합니다."
   },
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "이미지 파일을 불러올 수 없습니다. 파일이 너무 큽니다."
+    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "사용자 정의 이모티콘 제한을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "Unable to create LDAP user."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP 비활성화 되었거나 현재 라이센스에서 지원되지 않습니다."
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 982f99ebe..8adeb063a 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -440,6 +440,14 @@
     "translation": "Ongeldige rechten om commando tokens opnieuw te genereren"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Cannot update commands across teams"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "Onjuiste rechten voor het wissen van de opdracht"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "Stel uw status in naar afwezig"
   },
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "Kan bestand niet uploaden. Bestand is te groot."
+    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "Aangepaste emoji restricties is uitgeschakeld vanwege de huidige licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "Unable to create LDAP user."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP uitgeschakeld of licentie ondersteund geen AD/LDAP."
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index e6ec2bc51..27d060b36 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -440,6 +440,14 @@
     "translation": "Permissões inadequadas para re-gerar o token de comando"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Não é possível atualizar os comandos entre equipes"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "Permissões inadequadas para atualizar o comando"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "Defina seu status como ausente"
   },
@@ -629,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCTRL+CIMA (no campo de entrada vazio): Mostra a última mensagem ou comando digitado\nCTRL+BAIXO (no campo de entrada vazio): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo de entrada vazio): Edita sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começado com [caracter]\n#[caracter]+TAB: Autocompleta canal começado com [caracter]\n:[caracter]+TAB: Autocompleta emoji começado com [caracter]\n\n"
+    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCTRL+CIMA (no campo de entrada vazio): Mostra a última mensagem ou comando digitado\nCTRL+BAIXO (no campo de entrada vazio): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo de entrada vazio): Edita sua última mensagem no canal atual\n@[caractere]+TAB: Autocompleta o @usuário começado com [caractere]\n~[caractere]+TAB: Autocompleta o canal começado com [caractere]\n:[caractere]+TAB: Autocompleta o emoji começado com [caractere]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCMD+CIMA (no campo vazio de entrada): Mostra a última mensagem ou comando digitado\nCMD+BAIXO (no campo vazio de entrada): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo vazio de entrada): Edita sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta @usuário começado com [caracter]\n#[caracter]+TAB: Autocompleta channel começado com [caracter]\n:[caracter]+TAB: Autocompleta emoji começado com [caracter]\n\n"
+    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCMD+CIMA (no campo vazio de entrada): Mostra a última mensagem ou comando digitado\nCMD+BAIXO (no campo vazio de entrada): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo vazio de entrada): Edita sua última mensagem no canal atual\n@[caractere]+TAB: Autocompleta @usuário começado com [caractere]\n~[caractere]+TAB: Autocompleta o canal começado com [caractere]\n:[caractere]+TAB: Autocompleta o emoji começado com [caractere]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "Não foi possível enviar o arquivo de imagem. Arquivo muito grande."
+    "translation": "Arquivo acima das dimensões máximas não pode ser enviado: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "Emoji personalizado desabilitado pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "Não é possível criar usuário LDAP."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP desabilitado ou licença não suporta AD/LDAP."
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index aee7f9e1a..c98f11f89 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -440,6 +440,14 @@
     "translation": "Несоответствующие права для генерации нового токена"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Cannot update commands across teams"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "Несоответствующие права для команды удаления"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "Установить состояние \"Нет на месте\""
   },
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "Невозможно загрузить изображение. Файл слишком большой."
+    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "Ограничения на дополнительные эмодзи недоступны при текущей лицензии. Пожалуйста, свяжитесь с системным администратором по поводу улучшения вашей корпоративной лицензии."
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "Unable to create LDAP user."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP отключен или лицензия не поддерживает AD/LDAP."
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 0fd75134e..0a40d528e 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -440,6 +440,14 @@
     "translation": "没有重新生成命令令牌的权限"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "无法跨团队更新命令"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "无效更新命令权限"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "设置您的状态设为离开"
   },
@@ -629,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCTRL+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCTRL+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n#[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
+    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCTRL+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCTRL+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n~[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCMD+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCMD+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n#[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
+    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCMD+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCMD+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n~[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "不能上传图片文件。文件太大。"
+    "translation": "无法上传超过最大尺寸的文件：{{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "当前许可证禁用了自定义表情符。请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "无法创建 LDAP 用户。"
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "AD/LDAP 已禁用或许可证不支持 AD/LDAP。"
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index e0eca19da..8652c1f6e 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -440,6 +440,14 @@
     "translation": "沒有適當的權限重新產生命令 Token"
   },
   {
+    "id": "api.command.team_mismatch.app_error",
+    "translation": "Cannot update commands across teams"
+  },
+  {
+    "id": "api.command.update.app_error",
+    "translation": "沒有適當的權限刪除命令"
+  },
+  {
     "id": "api.command_away.desc",
     "translation": "將狀態設定為「離開」"
   },
@@ -983,7 +991,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "無法上傳圖片檔案。檔案太大。"
+    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -2672,6 +2680,10 @@
     "translation": "目前授權不提供限制自訂繪文字，請聯繫系統管理員將系統升級為企業版授權。"
   },
   {
+    "id": "ent.ldap.create_fail",
+    "translation": "Unable to create LDAP user."
+  },
+  {
     "id": "ent.ldap.disabled.app_error",
     "translation": "已停用 AD/LDAP 或授權不支援 AD/LDAP。"
   },
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 706afc55e..f4db655dc 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "Konfiguration",
   "admin.general.localization": "Lokalisation",
   "admin.general.localization.availableLocalesDescription": "Einstellen welche Sprachen für die Benutzer in den Kontoeinstellungen verfügbar sein sollen (lassen Sie dieses Feld leer um alle unterstützten Sprachen zur Verfügung zu stellen). Wenn Sie neue Sprachen manuell hinzufügen. die <strong>Standardsprache Client</strong> muss vorher geändert werden.<br /><br />Möchten Sie uns bei der Übersetzung unterstützen? Treten Sie dem <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> bei um Ihren Beitrag zu leisten.",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "Verfügbare Sprachen:",
   "admin.general.localization.clientLocaleDescription": "Standard Sprache für neu angelegte Nutzer und Seiten wo sich der Nutzer noch nicht angemeldet hat.",
   "admin.general.localization.clientLocaleTitle": "Standardsprache Client:",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "Bezeichnung Ihres S3 Bucket des AWS.",
   "admin.image.amazonS3BucketExample": "z.B.: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Erhalten Sie diesen Wert von Ihrem Amazon EC2 Administrator.",
   "admin.image.amazonS3IdExample": "z.B.: \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 Zugangsschlüssel-ID:",
   "admin.image.amazonS3RegionDescription": "AWS Region Ihres S3 Bucket.",
   "admin.image.amazonS3RegionExample": "z.B.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
+  "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": "Erhalten Sie diesen Wert von Ihrem Amazon EC2 Administrator.",
   "admin.image.amazonS3SecretExample": "z.B.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 geheimer Zugangsschlüssel:",
@@ -638,6 +644,8 @@
   "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.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Diesen Key setzen um den Titel von eingebetteten YouTube Videovorschauen anzeigen zu lassen. Ohne den Schlüssel werden YouTube Vorschauen basierend auf den Hyperlinks in Nachrichten und Kommentaren erstellt, sie werden aber nicht den Video Titel enthalten. Sehen Sie sich das <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> für eine Anleitung, wie Sie an den Schlüssel kommen, an.",
   "admin.service.googleExample": "z.B.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "Erlaube unsichere ausgehende Verbindungen: ",
   "admin.service.integrationAdmin": "Verwaltung der Integrationen auf Admins beschränken:",
   "admin.service.integrationAdminDesc": "Wenn wahr, können Webhooks und Slash-Befehle nur durch Team- und Systemadministratoren erstellt, bearbeitet oder betrachtet werden. OAuth 2.0 Anwendungen nur durch Systemadministratoren. Integrationen stehen allen Benutzern zur Verfügung nachdem ein Systemadministrator sie erstellt hat.",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Empfangs-Adresse:",
   "admin.service.listenDescription": "Die Adresse und Port an die gebunden und gehört wird. Bei Angabe von \":8065\" wird an alle Netzwerkkarten gebunden. Bei Angabe von \"127.0.0.1:8065\" wird nur an die Netzwerkkarte mit der IP Adresse gebunden. Wenn Sie einen Port eines niedrigen Levels wählen (auch \"System Ports\" oder \"Well Known Ports\" im Bereich 0-1023), müssen Sie Berechtigungen für das Binden an den Port haben. Auf Linux können Sie \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" verwenden um Mattermost das Binden an Well Known Ports zu erlauben.",
   "admin.service.listenExample": "z.B.: \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "Aktiviere ausgehende Webhooks: ",
   "admin.service.overrideDescription": "Wenn wahr, werden Webhooks, Slash-Befehlen und anderen Integrationen wie <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a> erlaubt, den Benutzernamen zu ändern, mit dem sie Nachrichten senden. Hinweis: Kombiniert mit der Erlaubnis, das Profilbild zu ändern, können Benutzer Phishing-Attacken ausführen, indem Sie sich als andere Nutzer ausgeben.",
   "admin.service.overrideTitle": "Erlaube Integrationen den Benutzernamen zu ändern:",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "Wenn Wahr werden Systemadministratoren durch E-Mails informiert, dass ein sicherheitsrelevantes Update in den letzen 12 Stunden angekündigt wurde. Setzt voraus, dass E-Mail aktiviert wurde.",
   "admin.service.securityTitle": "Sicherheitsbenachrichtigungen aktivieren: ",
   "admin.service.segmentDescription": "Segment.com ist ein Online Dienst der zur optionalen Erhebung von detaillierten Systemstatistiken. Sie können einen Schlüssel über einen kostenlosen Account bei Segment.com erhalten.",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Wenn die Authentifizierungsmethode SAML oder GitLab ist, wird der Benutzer automatisch wieder angemeldet sofern er noch bei SAML oder GitLab angemeldet ist. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
   "admin.service.testingDescription": "Wenn wahr wird der /loadtest Slash-Befehl aktiviert um Testaccounts, -daten und Textformatierungen zu laden. Änderung erfordern einen Server Neustart.",
   "admin.service.testingTitle": "Aktiviere Testkommandos: ",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "Sitzungsdauer AD/LDAP und E-Mail (in Tagen):",
   "admin.service.webSessionDaysDesc": "Die Anzahl der Tage seit der letzten Anmeldung des Benutzers bis zum Ablauf der Sitzung. Bei Änderung dieser Einstellung tritt die neue Sitzungsdauer in Kraft nachdem der Benutzer sich das nächste Mal anmeldet.",
   "admin.service.webhooksDescription": "Wenn wahr werden eingehende Webhooks erlaubt. Um Phishing Attacken vorzubeugen werden alle Posts von Webhooks mit dem BOT Tag versehen. <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>Dokumentation</a> für mehr Details.",
   "admin.service.webhooksTitle": "Aktiviere eingehende 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": "Team aus dem Seitenmenü hinzufügen",
   "admin.sidebar.advanced": "Erweitert",
   "admin.sidebar.audits": "Compliance und Prüfung",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> möchte sich mit Ihrem <strong>Mattermost</strong> Benutzerkonto verbinden",
   "backstage_list.search": "Suche",
   "backstage_navbar.backToMattermost": "Zurück zu {siteName}",
+  "backstage_sidebar.emoji": "Benutzerdefinierte Emoji",
   "backstage_sidebar.integrations": "Integration",
   "backstage_sidebar.integrations.commands": "Slash-Befehle",
   "backstage_sidebar.integrations.incoming_webhooks": "Eingehende Webhooks",
@@ -971,6 +992,8 @@
   "change_url.longer": "Muss länger als zwei Zeichen sein",
   "change_url.noUnderscore": "Darf keine zwei aufeinander folgende Unterstriche enthalten.",
   "change_url.startWithLetter": "Muss mit einem Buchstaben oder einer Nummer beginnen",
+  "channelHeader.addToFavorites": "Zu Favoriten hinzufügen",
+  "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",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "Info anzeigen",
   "channel_header.viewMembers": "Zeige Mitglieder",
   "channel_header.webrtc.call": "Videoanruf starten",
+  "channel_header.webrtc.offline": "The user is offline",
   "channel_header.webrtc.unavailable": "Neuer Anruf nicht möglich bis ihr bestehender Anruf beendet ist",
   "channel_info.about": "Über",
   "channel_info.close": "Schließen",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "Wechsel von {type} auf E-Mail-Adresse und Passwort",
   "claim.oauth_to_email.title": "Von {type} Account auf E-Mail wechseln",
   "confirm_modal.cancel": "Abbrechen",
+  "connecting_screen": "Verbindungen",
   "create_comment.addComment": "Kommentar hinzufügen...",
   "create_comment.comment": "Kommentar hinzufügen",
   "create_comment.commentLength": "Kommentarlänge muss weniger als {max} Zeichen lang sein.",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "Speichern",
   "edit_channel_purpose_modal.title1": "Zweck bearbeiten",
   "edit_channel_purpose_modal.title2": "Zweck bearbeiten für ",
+  "edit_command.save": "Update",
   "edit_post.cancel": "Abbrechen",
   "edit_post.edit": "{title} bearbeiten",
   "edit_post.editPost": "Nachricht bearbeiten...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "Ersteller",
   "emoji_list.delete": "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.",
   "emoji_list.help2": "Tipp: Wenn Sie #, ## oder ### als ersten Zeichen in einer neuen Zeile mit einem Emoji eingeben können Sie größere Emojis anzeigen lassen. Um es auszuprobieren senden Sie eine Meldung wie: '# :smile:'.",
   "emoji_list.image": "Bild",
@@ -1208,6 +1235,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 Mitglieder} one {Mitglied} other {Mitglieder}} von {total} insgesamt",
   "filtered_user_list.member": "Mitglied",
   "filtered_user_list.search": "Mit Eingabe beginnen um zu suchen",
+  "filtered_user_list.searchButton": "Suche",
   "filtered_user_list.show": "Filter:",
   "filtered_user_list.team_only": "Mitglieder dieses Teams",
   "find_team.email": "E-Mail",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Erstellt durch {creator} am {createAt, date, full}",
   "installed_integrations.delete": "Löschen",
+  "installed_integrations.edit": "Bearbeiten",
   "installed_integrations.hideSecret": "Secret ausblenden",
   "installed_integrations.regenSecret": "Secret erneuern",
   "installed_integrations.regenToken": "Token neu generieren",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "Slash-Befehle senden Events an externe Integrationen",
   "integrations.command.title": "Slash-Befehle",
   "integrations.done": "Erledigt",
+  "integrations.edit": "Bearbeiten",
   "integrations.header": "Integration",
   "integrations.incomingWebhook.description": "Eingehende Webhooks erlauben externe Integrationen Nachrichten zu senden",
   "integrations.incomingWebhook.title": "Eingehende Webhooks",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " Jedes Mitglied kann diesem Kanal beitreten und folgen.",
   "intro_messages.beginning": "Start von {name}",
   "intro_messages.channel": "Kanal",
-  "intro_messages.creator": "Dies ist der Start von {type} <strong>{name}</strong>, erstellt durch <strong>{creator}</strong> am <strong>{date}</strong>",
+  "intro_messages.creator": "Dies ist der Start von {type} {name}, erstellt am {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Start von {display_name}</h4><p class='channel-intro__content'><strong>Willkommen zu {display_name}!</strong><br/><br/>Dies ist der erste Kanal den Teammitglieder sehen sobald sie sich registrieren - verwenden Sie Ihn um Nachrichten zu senden die jeder wissen sollte.</p>",
   "intro_messages.group": "Private Gruppe",
   "intro_messages.invite": "Laden Sie andere zu {type} ein",
@@ -1418,6 +1448,7 @@
   "intro_messages.noCreator": "Dies ist der Start von {type} {name}, erstellt am {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Start von {display_name}</h4><p class=\"channel-intro__content\">Dies ist der Start von {display_name}, einem Kanal für nicht-arbeitsbezogene Unterhaltungen.<br/></p>",
   "intro_messages.onlyInvited": " Nur eingeladene Mitglieder können diese private Gruppe sehen.",
+  "intro_messages.purpose": " This {type}'s purpose is: {purpose}.",
   "intro_messages.setHeader": "Eine Überschrift setzen",
   "intro_messages.teammate": "Dies ist der Start Ihres Privatnachrichtenverlaufs mit diesem Teammitglied. Privatnachrichten und versendete Dateien sind außerhalb dieses Bereichs nicht für andere sichtbar.",
   "invite_member.addAnother": "Hinzufügen",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "Teameinstellungen",
   "navbar_dropdown.viewMembers": "Zeige Mitglieder",
   "notification.dm": "Direktnachricht",
+  "passwordRequirements": "Passwortanforderungen:",
   "password_form.change": "Mein Passwort ändern",
   "password_form.click": "Zur Anmeldung <a href={url}>hier</a> klicken.",
   "password_form.enter": "Geben Sie ein neues Passwort für den {siteName} Zugang ein.",
@@ -1553,7 +1585,7 @@
   "password_send.description": "Um Ihr Passwort zurückzusetzen, geben Sie die E-Mail-Adresse an, die Sie zur Registrierung verwendet haben",
   "password_send.email": "E-Mail",
   "password_send.error": "Bitte geben Sie eine gültige E-Mail-Adresse ein.",
-  "password_send.link": "<p>Ein Link zum Zurücksetzen des Passwortes wurde an <b>{email}</b> geschickt</p>",
+  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "Mein Passwort zurücksetzen",
   "password_send.title": "Passwort zurücksetzen",
   "pdf_preview.max_pages": "Herunterladen um mehr Seiten zu lesen.",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "Markieren",
   "rhs_comment.mobile.unflag": "Demarkieren",
   "rhs_comment.permalink": "Dauerhafter Link",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "Zurück zu markierten Nachrichten",
   "rhs_header.backToResultsTooltip": "Zurück zu den Suchergebnissen",
   "rhs_header.closeSidebarTooltip": "Sidebar schließen",
+  "rhs_header.closeTooltip": "Sidebar schließen",
   "rhs_header.details": "Nachrichtendetails",
   "rhs_header.expandSidebarTooltip": "Sidebar erweitern",
+  "rhs_header.expandTooltip": "Sidebar verkleinern",
   "rhs_header.shrinkSidebarTooltip": "Sidebar verkleinern",
   "rhs_root.del": "Löschen",
   "rhs_root.direct": "Direktnachricht",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "Ok",
   "tutorial_tip.out": "Diese Tipps deaktivieren.",
   "tutorial_tip.seen": "Wurde bereits angezeigt? ",
+  "update_command.cancel": "Abbrechen",
+  "update_command.confirm": "Slash-Befehl hinzufügen",
+  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.update": "Update",
   "upload_overlay.info": "Datei zum Hochladen hier ablegen.",
   "user.settings.advance.embed_preview": "Zeige experimentelle Vorschauen von Linkinhalten, sofern verfügbar",
   "user.settings.advance.embed_toggle": "Zeige Umschalter für alle eingebetteten Vorschauen",
@@ -1936,7 +1975,7 @@
   "user.settings.notifications.channelWide": "Kanalweite Erwähnung \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Schließen",
   "user.settings.notifications.comments": "Antwort-Benachrichtigungen",
-  "user.settings.notifications.commentsAny": "Eine Benachrichtigung auslösen für Meldungen in Diskussionsfaden welchen in gestartet habe oder teilnehme",
+  "user.settings.notifications.commentsAny": "Eine Benachrichtigung für Meldungen in Diskussionsfaden auslösen, welche ich gestartet habe oder an denen ich teilnehme",
   "user.settings.notifications.commentsInfo": "Zusätzlich zu Benachrichtigung wenn Sie erwähnt werden können Sie hier wählen ob Sie auch bei Antworten benachrichtigt werden wollen.",
   "user.settings.notifications.commentsNever": "Keine Benachrichtigung bei Antworten auslösen, sofern ich nicht erwähnt wurde.",
   "user.settings.notifications.commentsRoot": "Löse Benachrichtigungen für Mitteilungen aus die ich starte",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "Ein",
   "user.settings.notifications.onlyMentions": "Nur für Erwähnungen und Direktnachrichten",
   "user.settings.notifications.push": "Mobile Push-Nachrichten versenden",
+  "user.settings.notifications.push_notification.status": "Pushnachrichten auslösen wenn",
   "user.settings.notifications.sensitiveName": "Ihr groß-/kleinschreibungsabhängiger Vorname \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Ihr groß-/kleinschreibungsabhängiger Benutzername \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Weitere nicht groß-/kleinschreibungsabhängige Wörter, getrennt mit Komma:",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "Benachrichtigungseinstellungen",
   "user.settings.notifications.usernameMention": "Erwähnung Ihres Benutzernamens \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Wörter, welche Erwähnungen auslösen",
+  "user.settings.push_notification.allActivity": "Für alle Aktivitäten",
   "user.settings.push_notification.allActivityAway": "Für alle Aktivitäten wenn abwesend oder offline",
   "user.settings.push_notification.allActivityOffline": "Für alle Aktivitäten wenn offline",
   "user.settings.push_notification.allActivityOnline": "Für alle Aktivitäten wenn online, abwesend oder offline",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "Aus",
   "user.settings.push_notification.offline": "Offline",
   "user.settings.push_notification.online": "Online, abwesend oder offline",
+  "user.settings.push_notification.onlyMentions": "Nur für Erwähungen und Direktnachrichten",
   "user.settings.push_notification.onlyMentionsAway": "Für Erwähnungen und Direktnachrichten wenn abwesend oder offline",
   "user.settings.push_notification.onlyMentionsOffline": "Für Erwähnungen und Direktnachrichten wenn offline",
   "user.settings.push_notification.onlyMentionsOnline": "Für Erwähnungen und Direktnachrichten wenn online, abwesend oder offline",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Anmeldung durchgeführt durch GitLab",
   "user.settings.security.loginLdap": "Anmeldung via AD/LDAP",
+  "user.settings.security.loginSaml": "Anmeldung durchgeführt durch GitLab",
   "user.settings.security.logoutActiveSessions": "Zeigen und beenden von aktiven Sitzungen",
   "user.settings.security.method": "Anmeldemethode",
   "user.settings.security.newPassword": "Neues Passwort",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "Einloggen findet über AD/LDAP statt. Die Adresse kann nicht aktualisiert werden.",
   "user.settings.security.passwordMatchError": "Die eingegebenen neuen Passwörter stimmen nicht überein.",
   "user.settings.security.passwordMinLength": "Ungültige minimale Länge, kann keine Vorschau anzeigen.",
+  "user.settings.security.passwordSamlCantUpdate": "Dieses Feld wird durch Ihren Login Provider festgelegt. Wenn Sie es ändern möchten, müssen Sie dies durch den Login Provider tun.",
   "user.settings.security.retypePassword": "Passwort erneut eingeben",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Wechsel auf E-Mail-Adresse und Passwort",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "Zeige Zugriffshistorie",
   "user_list.notFound": "Keine Benutzer gefunden",
   "user_profile.webrtc.call": "Videoanruf starten",
+  "user_profile.webrtc.offline": "The user is offline",
   "user_profile.webrtc.unavailable": "Neuer Anruf nicht möglich bis ihr bestehender Anruf beendet ist",
   "view_image.loading": "Laden ",
   "view_image_popover.download": "Herunterladen",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 6028890ca..4bbd1439e 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "Configuración",
   "admin.general.localization": "Idiomas",
   "admin.general.localization.availableLocalesDescription": "Asigna que idiomas están disponibles para los usuarios en Configuración de la Cuenta (al dejar este campo en blanco todos los idiomas estarán disponibles). Si está agregando un nuevo idioma manualmente, el <strong>Idioma predeterminado para el Cliente</strong> debe ser agregado antes de guardar estos ajustes.<br /><br />Te gustaría ayudar con las traducciones? Únete al <a href='http://translate.mattermost.com/' target='_blank'>Servidor de Traducciones de Mattermost</a> para contribuir.",
+  "admin.general.localization.availableLocalesNoResults": "No se han encontrado resultados",
+  "admin.general.localization.availableLocalesNotPresent": "El idioma predefinido para el cliente debe ser incluido en la lista de idiomas disponibles",
   "admin.general.localization.availableLocalesTitle": "Idiomas disponibles:",
   "admin.general.localization.clientLocaleDescription": "Idioma predeterminado para nuevos usuarios y páginas donde el usuario no ha iniciado sesión.",
   "admin.general.localization.clientLocaleTitle": "Idioma predeterminado para el Cliente:",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "Nombre que ha seleccionado para el bucket S3 en AWS.",
   "admin.image.amazonS3BucketExample": "Ej.: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
+  "admin.image.amazonS3EndpointDescription": "Nombre de host del proveedor de Almacenamiento compatible con S3. Por defecto `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Extremo de Amazon S3:",
   "admin.image.amazonS3IdDescription": "Obetener esta credencial del administrador de tu Amazon EC2",
   "admin.image.amazonS3IdExample": "Ej.: \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "ID de Llave de acceso Amazon S3:",
   "admin.image.amazonS3RegionDescription": "Región que ha seleccionado en AWS para la creación de tu bucket S3.",
   "admin.image.amazonS3RegionExample": "Ej.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Región de Amazon S3:",
+  "admin.image.amazonS3SSLDescription": "Si es falso, permitir conexiones inseguras a Amazon S3. Por defecto permite sólo conexiones seguras.",
+  "admin.image.amazonS3SSLTitle": "Habilitar Conexiones seguras a Amazon S3:",
   "admin.image.amazonS3SecretDescription": "Obetener esta credencial del administrador de tu Amazon EC2.",
   "admin.image.amazonS3SecretExample": "Ej.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Llave secreta de Amazon S3:",
@@ -638,6 +644,8 @@
   "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.forward80To443": "Redirigir el puerto 80 a 443:",
+  "admin.service.forward80To443Description": "Redirige todo el trafico inseguro del puerto 80 al puerto seguro 443",
   "admin.service.googleDescription": "Establece esta clave para mostrar los títulos de los vídeos de YouTube incorporado en las previsualizaciones. Sin la clave, las previsualizaciones de YouTube igual serán creadas en base a los enlaces que aparecen en los mensajes o comentarios, pero no se mostrará el título de vídeo. Ve el <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Tutorial para Desarrolladores de Google</a> para ver las instrucciones sobre cómo obtener una clave.",
   "admin.service.googleExample": "Ej.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Llave del API de Google:",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "Habilitar Conexiones de Salida Inseguras: ",
   "admin.service.integrationAdmin": "Restringir la gestión de las integraciones a los Administradores:",
   "admin.service.integrationAdminDesc": "Cuando es verdadero, los webhooks y comandos de barra sólo se pueden crear, editar y visualizar por los Administradores de Equipo y Sistema, y las aplicaciones de OAuth 2.0 por Administradores de sistemas. Las integraciones están disponibles para todos los usuarios después de haber sido creadas por el Administrador.",
+  "admin.service.letsEncryptCertificateCacheFile": "Archivo de Caché de Let's Encrypt:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificados recuperados y otros datos del servicio de Let's Encrypt serán almacenados en este archivo.",
   "admin.service.listenAddress": "Dirección de escucha:",
   "admin.service.listenDescription": "La dirección y el puerto al que se debe enlazar y escuchar. Si se especifica \":8065\" se enlaza a todas las interfaces de red. Al especificar \"127.0.0.1:8065\" sólo se enlaza a la interfaz de red que tiene esa dirección IP. Si eliges un puerto de un nivel inferior (llamado \"puertos de sistema\" o \"puertos conocidos\", en el rango de 0-1023), debes tener permisos para enlazar a ese puerto. En Linux puedes usar: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" para permitir que Mattermost sea enlazado a los puertos conocidos.",
   "admin.service.listenExample": "Ej.: \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "Habilitar Webhooks de Salida: ",
   "admin.service.overrideDescription": "Cuando es verdadero, los webhooks, comandos de barra y otras integraciones, tales como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, podrán cambiar el nombre de usuario del mensaje que generan. Nota: Al combinar con el permitir a las integraciones reescribir imágenes de perfil, puede que los usuarios sean capaces de realizar ataques de phishing tratando de hacerse pasar por otros usuarios.",
   "admin.service.overrideTitle": "Permitir a las integraciones reescribir nombres de usuario:",
+  "admin.service.readTimeout": "Tiempo de Espera de Lectura:",
+  "admin.service.readTimeoutDescription": "Tiempo máximo permitido de cuando la conexión es aceptada en el momento de la solicitud hasta que el cuerpo de la solicitud es totalmente leída.",
   "admin.service.securityDesc": "Cuando es verdadero, Los Administradores del Sistema serán notificados por correo electrónico se han anunciado alertas de seguridad relevantes en las últimas 12 horas. Requiere que los correos estén habilitados.",
   "admin.service.securityTitle": "Habilitar Alertas de Seguridad: ",
   "admin.service.segmentDescription": "Segment.com es un servicio en línea que puede ser utilizado opcionalmente para el seguimiento detallado de las estadísticas del sistema. Puedes obtener una clave de registro para obtener una cuenta gratuita en Segment.com.",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Si el método de autenticación es SAML o GitLab, el usuario puede iniciar su sesión automáticamente en Mattermost si ya cuenta con una sesión activa en SAML o GitLab.  Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
   "admin.service.testingDescription": "Cuando es verdadero, el comando de barra /loadtest es habilitado para cargar cuentas de prueba, datos y formato de texto. Al cambiar este parámetro se requiere un reinicio del servidor para que el cambio tengan efecto.",
   "admin.service.testingTitle": "Habilitar Comandos de Prueba: ",
+  "admin.service.tlsCertFile": "Archivo de Certificado TLS:",
+  "admin.service.tlsCertFileDescription": "El archivo del certificado a utilizar.",
+  "admin.service.tlsKeyFile": "Archivo llave TLS:",
+  "admin.service.tlsKeyFileDescription": "El archivo de la llave privada a utilizar.",
+  "admin.service.useLetsEncrypt": "Utilizar Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Habilitar la recuperación automática de certificados del servicio Let's Encrypt. El certificado será recuperado cuando un cliente intenta conectarse desde un nuevo dominio. Esto permite que funcione con multiples dominios.",
   "admin.service.webSessionDays": "Duración de la sesión para AD/LDAP y correo electrónico (días):",
   "admin.service.webSessionDaysDesc": "El número de días desde la última vez que un usuario ingreso sus credenciales para que la sesión del usuario expire. Luego de cambiar esta configuración, la nueva duración de la sesión tendrá efecto luego de la próxima vez que el usuario ingrese sus credenciales.",
   "admin.service.webhooksDescription": "Cuando es verdadero, los webhooks de entrada serán permitidos. Para ayudar el combate contra los ataques de phishing, todos los mensajes provenientes de webhooks serán marcados con una etiqueta BOT. Revisa la <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentación</a> para obtener más información.",
   "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.advanced": "Avanzado",
   "admin.sidebar.audits": "Auditorías",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> quiere conectarse utilizando tu cuenta de usuario de <strong>Mattermost</strong>",
   "backstage_list.search": "Buscar",
   "backstage_navbar.backToMattermost": "Volver a {siteName}",
+  "backstage_sidebar.emoji": "Emoticones Personalizados",
   "backstage_sidebar.integrations": "Integraciones",
   "backstage_sidebar.integrations.commands": "Comandos de Barra",
   "backstage_sidebar.integrations.incoming_webhooks": "Webhooks de Entrada",
@@ -971,6 +992,8 @@
   "change_url.longer": "Debe ser mayor a 2 caracteres",
   "change_url.noUnderscore": "No puede tener dos guíones bajos seguidos",
   "change_url.startWithLetter": "Debe comenzar con una letra o número",
+  "channelHeader.addToFavorites": "Agregar a favoritos",
+  "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}",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "Ver Info",
   "channel_header.viewMembers": "Ver Miembros",
   "channel_header.webrtc.call": "Iniciar llamada de vídeo",
+  "channel_header.webrtc.offline": "El usuario está desconectado",
   "channel_header.webrtc.unavailable": "No se puede realizar una nueva llamada hasta que la llamada actual finalice",
   "channel_info.about": "Acerca",
   "channel_info.close": "Cerrar",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "Cambiar {type} a correo electrónico y contraseña",
   "claim.oauth_to_email.title": "Cambiar la cuenta de {type} a Correo Electrónico",
   "confirm_modal.cancel": "Cancelar",
+  "connecting_screen": "Conectando",
   "create_comment.addComment": "Agregar un comentario...",
   "create_comment.comment": "Agregar Comentario",
   "create_comment.commentLength": "El largo del Comentario debe ser menor de {max} caracteres.",
@@ -1108,7 +1133,7 @@
   "create_post.shortcutsNotSupported": "Los Accesos rápidos de teclado no son compatibles con su dispositivo.",
   "create_post.tutorialTip": "<h4>Enviar Mensajes</h4><p>Escribe aquí para redactar un mensaje y presiona <strong>RETORNO</strong> para enviarlo.</p><p>Haz clic en el botón de <strong>Adjuntar</strong> para subir una imagen o archivo.</p>",
   "create_post.write": "Escribe un mensaje...",
-  "create_team.agreement": "Al proceder con la creación de tu cuenta y utilizar {siteName}, estás de acuerdo con nuestros <a href='/static/help/terms.html'>Términos de Servicio</a> y <a href='/static/help/privacy.html'>Políticas de Privacidad</a>. Si no estás de acuerdo, no puedes utilizar {siteName}.",
+  "create_team.agreement": "Al proceder con la creación de tu cuenta y utilizar {siteName}, estás de acuerdo con nuestros <a href={TermsOfServiceLink}>Términos de Servicio</a> y <a href={PrivacyPolicyLink}>Políticas de Privacidad</a>. Si no estás de acuerdo, no puedes utilizar {siteName}.",
   "create_team.display_name.back": "Volver al paso anterior",
   "create_team.display_name.charLength": "El nombre debe ser de 2 o más caracteres hasta un máximo de 15",
   "create_team.display_name.nameHelp": "Nombre de tu equipo en cualquier idioma. El nombre del equipo se muestra en menús y encabezados.",
@@ -1116,7 +1141,7 @@
   "create_team.display_name.required": "Este campo es requerido",
   "create_team.display_name.teamName": "Nombre del Equipo",
   "create_team.team_url.back": "Volver al paso anterior",
-  "create_team.team_url.charLength": "El nombre debe ser de 2 o más caracteres hasta un máximo de 15",
+  "create_team.team_url.charLength": "El nombre debe ser de {min} o más caracteres hasta un máximo de {max}",
   "create_team.team_url.creatingTeam": "Creando equipo...",
   "create_team.team_url.finish": "Finalizar",
   "create_team.team_url.hint": "<li>Corto y memorable es mejor</li><li>Utiliza letras en minúscula, números y guiones</li><li>Debe comenzar con una letra y no puede terminar en guión</li>",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "Guardar",
   "edit_channel_purpose_modal.title1": "Editar Propósito",
   "edit_channel_purpose_modal.title2": "Editar el Propósito de ",
+  "edit_command.save": "Actualizar",
   "edit_post.cancel": "Cancelar",
   "edit_post.edit": "Editar {title}",
   "edit_post.editPost": "Editar el mensaje...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "Creado por",
   "emoji_list.delete": "Eliminar",
   "emoji_list.empty": "No se encontraron Emoticones Personalizados",
+  "emoji_list.header": "Emoticones Personalizados",
   "emoji_list.help": "Los emoticones personalizado están disponibles para todos los usuarios del servidor. Escribe ':' en el cuadro de mensaje para que aparezca el menú de selección de emoticones. Otros usuarios pueden necesitar refrescar la página antes de que los nuevos emoticones aparezcan.",
   "emoji_list.help2": "Sugerencia: Si agregas #, ##, ### como primer carácter en una nueva línea que contiene un emoticon, puede utilizar un mayor tamaño del emoticon. Para probarlo, enviar un mensaje, por ejemplo: '# :smile:'.",
   "emoji_list.image": "Imagen",
@@ -1208,6 +1235,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 miembros} one {miembro} other {miembros}} de {total} total",
   "filtered_user_list.member": "Miembro",
   "filtered_user_list.search": "Presione retorno para buscar",
+  "filtered_user_list.searchButton": "Buscar",
   "filtered_user_list.show": "Filtro:",
   "filtered_user_list.team_only": "Miembros de este Equipo",
   "find_team.email": "Correo electrónico",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Tipo de contenido: {contentType}",
   "installed_integrations.creation": "Creado por {creator} el {createAt, date, full}",
   "installed_integrations.delete": "Eliminar",
+  "installed_integrations.edit": "Editar",
   "installed_integrations.hideSecret": "Ocultar Clave Secreta",
   "installed_integrations.regenSecret": "Regenerar Secreto",
   "installed_integrations.regenToken": "Regenerar Token",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "Comandos de barra envían eventos a integraciones externar",
   "integrations.command.title": "Comando de Barra",
   "integrations.done": "Hecho",
+  "integrations.edit": "Editar",
   "integrations.header": "Integraciones",
   "integrations.incomingWebhook.description": "Webhooks de entrada permiten a las integraciones externas enviar mensajes",
   "integrations.incomingWebhook.title": "Webhook de Entrada",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " Cualquier miembro se puede unir y leer este canal.",
   "intro_messages.beginning": "Inicio de {name}",
   "intro_messages.channel": "canal",
-  "intro_messages.creator": "Este es el inicio del {type} <strong>{name}</strong>, creado por <strong>{creator}</strong> el <strong>{date}</strong>",
+  "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/>Este es el primer canal que ven tus compañeros cuando se registran - utilizalo para colocar mensajes que todos deberían leer.</p>",
   "intro_messages.group": "grupo privado",
   "intro_messages.invite": "Invita a otros a este {type}",
@@ -1418,6 +1448,7 @@
   "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.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.",
   "invite_member.addAnother": "Agregar otro",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "Configurar Equipo",
   "navbar_dropdown.viewMembers": "Ver Miembros",
   "notification.dm": "Mensaje Directo",
+  "passwordRequirements": "Requisitos de la Contraseña:",
   "password_form.change": "Cambiar mi contraseña",
   "password_form.click": " Clic <a href={url}>aquí</a> para iniciar sesión.",
   "password_form.enter": "Ingresa una nueva contraseña para tu cuenta en {siteName}.",
@@ -1553,7 +1585,7 @@
   "password_send.description": "Para reiniciar tu contraseña, ingresa la dirección de correo que utilizaste en el registro",
   "password_send.email": "Correo electrónico",
   "password_send.error": "Por favor ingresa una dirección correo electrónico válida.",
-  "password_send.link": "<p>Se ha enviado un enlace para restablecer la contraseña a <b>{email}</b></p>",
+  "password_send.link": "Si la cuenta existe, un correo electrónico para restablecer la contraseña será enviado a: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "Restablecer mi contraseña",
   "password_send.title": "Restablecer Contraseña",
   "pdf_preview.max_pages": "Descargar para leer más páginas",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "Marcar",
   "rhs_comment.mobile.unflag": "Desmarcar",
   "rhs_comment.permalink": "Enlace permanente",
+  "rhs_header.backToCallTooltip": "Volver a la llamada",
   "rhs_header.backToFlaggedTooltip": "Volver a los Mensajes Marcados",
   "rhs_header.backToResultsTooltip": "Volver a los Resultados de la Búsqueda",
   "rhs_header.closeSidebarTooltip": "Cerrar barra lateral",
+  "rhs_header.closeTooltip": "Cerrar barra lateral",
   "rhs_header.details": "Detalles del Mensaje",
   "rhs_header.expandSidebarTooltip": "Expandir barra lateral",
+  "rhs_header.expandTooltip": "Reducir barra lateral",
   "rhs_header.shrinkSidebarTooltip": "Reducir barra lateral",
   "rhs_root.del": "Borrar",
   "rhs_root.direct": "Mensaje Directo",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "Aceptar",
   "tutorial_tip.out": "No optar por estos consejos.",
   "tutorial_tip.seen": "¿Haz visto esto antes? ",
+  "update_command.cancel": "Cancelar",
+  "update_command.confirm": "Editar Comando de Barra",
+  "update_command.question": "Tus cambios puede que rompan el comando de barra existente. ¿Estás seguro de que deseas actualizar?",
+  "update_command.update": "Actualizar",
   "upload_overlay.info": "Arrastra un archivo para subirlo.",
   "user.settings.advance.embed_preview": "Mostrar vistas previas experimentales del contenido de los enlaces, cuando esté disponible",
   "user.settings.advance.embed_toggle": "Capacidad de Mostrar/Esconder las previsualizaciones",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "Encendido",
   "user.settings.notifications.onlyMentions": "Sólo para menciones y mensajes directos",
   "user.settings.notifications.push": "Notificaciones push móvil",
+  "user.settings.notifications.push_notification.status": "Activa las notificaciones push cuando",
   "user.settings.notifications.sensitiveName": "Tu nombre con distinción de mayúsculas \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Tu nombre de usuario sin distinción de mayúsculas \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Otras palabras sin distinción de mayúsculas, separadas por comas:",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "Configuracón de Notificaciones",
   "user.settings.notifications.usernameMention": "Tu nombre de usuario mencionado \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Palabras que desencadenan menciones",
+  "user.settings.push_notification.allActivity": "Para toda actividad",
   "user.settings.push_notification.allActivityAway": "Para toda la actividad cuando esté ausente o desconectado",
   "user.settings.push_notification.allActivityOffline": "Para toda la actividad cuando esté desconectado",
   "user.settings.push_notification.allActivityOnline": "De toda la actividad cuando esté en línea, ausente o desconectado",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "Apagado",
   "user.settings.push_notification.offline": "Desconectado",
   "user.settings.push_notification.online": "En línea, ausente o desconectado",
+  "user.settings.push_notification.onlyMentions": "Sólo para menciones y mensajes directos",
   "user.settings.push_notification.onlyMentionsAway": "Para las menciones y mensajes directos cuando esté ausente o desconectado",
   "user.settings.push_notification.onlyMentionsOffline": "Para las menciones y mensajes directos cuando esté desconectado",
   "user.settings.push_notification.onlyMentionsOnline": "Para las menciones y mensajes directos cuando esté en línea, ausente o desconectado",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Inicio de sesión realizado a través de GitLab",
   "user.settings.security.loginLdap": "Inicio de sesión realizado a través de AD/LDAP",
+  "user.settings.security.loginSaml": "Inicio de sesión realizado a través de SAML",
   "user.settings.security.logoutActiveSessions": "Visualizar y cerrar las sesiones activas",
   "user.settings.security.method": "Método de inicio de sesión",
   "user.settings.security.newPassword": "Nueva Contraseña",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "El inicio de sesión ocurre a través AD/LDAP. La contraseña no se puede actualizar.",
   "user.settings.security.passwordMatchError": "La nuevas contraseñas que ingresaste no coinciden.",
   "user.settings.security.passwordMinLength": "Longitud mínima no válida, no se puede mostrar la vista previa.",
+  "user.settings.security.passwordSamlCantUpdate": "La contraseña es manejada a través del proveedor de inicio de sesión. Si deseas cambiarla, deberás hacerlo a través del proveedor de identidad.",
   "user.settings.security.retypePassword": "Reescribe la Nueva Contraseña",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Cambiar para utilizar correo electrónico y contraseña",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "Visualizar historial de acceso",
   "user_list.notFound": "No se encontraron usuarios",
   "user_profile.webrtc.call": "Iniciar llamada de vídeo",
+  "user_profile.webrtc.offline": "El usuario está desconectado",
   "user_profile.webrtc.unavailable": "No se puede realizar una nueva llamada hasta que la llamada actual finalice",
   "view_image.loading": "Cargando ",
   "view_image_popover.download": "Descargar",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 8cdb8c4c9..be9d844c6 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "Configuration",
   "admin.general.localization": "Localisation",
   "admin.general.localization.availableLocalesDescription": "Définit quelles langues sont disponibles pour les utilisateurs dans Paramètres du compte (laissez ce champ vide pour laisser toutes les langues supportées disponibles). Si vous ajoutez des langues manuellement, la <strong>Langue du client par défaut</strong> doit être ajoutée avant de sauver ce paramètre.<br /><br />Vous souhaitez apporter votre aide pour traduire ? Rejoignez le <a href='http://translate.mattermost.com/' target='_blank'>Serveur de Traduction Mattermost</a> pour contribuer.",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "Langues disponibles :",
   "admin.general.localization.clientLocaleDescription": "La langue par défaut est utilisé pour les nouveaux utilisateurs et les pages créées où l'utilisateur ne s'est pas connecté.",
   "admin.general.localization.clientLocaleTitle": "Langue par défaut :",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "Nom de votre bucket S3 dans AWS.",
   "admin.image.amazonS3BucketExample": "Ex. : \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Bucket S3 Amazon :",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Demandez cette information à votre administrateur AWS.",
   "admin.image.amazonS3IdExample": "Ex. : \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Access Key ID d'Amazon S3 :",
   "admin.image.amazonS3RegionDescription": "Région AWS dans laquelle votre bucket S3 est hébergé.",
   "admin.image.amazonS3RegionExample": "Ex. : \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Région AWS S3 :",
+  "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": "Demandez cette information à votre administrateur AWS.",
   "admin.image.amazonS3SecretExample": "Ex. : \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Secret Access Key d'Amazon S3 :",
@@ -638,6 +644,8 @@
   "admin.service.corsTitle": "Autoriser les requêtes cross-origin depuis :",
   "admin.service.developerDesc": "Si activé, les erreurs Javascript sont affichées dans une barre en haut de l'interface. Ceci n'est pas recommandé sur un serveur de production. ",
   "admin.service.developerTitle": "Activer le mode développeur : ",
+  "admin.service.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Définissez cette clé pour activer l'affichage des titres pour les aperçus de vidéos YouTube. Sans la clé, les aperçus YouTube seront créés à partir des liens apparaissant des messages ou commentaires mais ils ne montreront pas le titre de la vidéo. Regardez un <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">tutoriel Google Developers</a> pour des instructions sur l'obtention d'une clé.",
   "admin.service.googleExample": "Ex. : \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Clé API Google :",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "Autoriser les connexions sortantes non-sécurisées : ",
   "admin.service.integrationAdmin": "Restreindre la gestion des intégrations aux administrateurs :",
   "admin.service.integrationAdminDesc": "Lorsqu'activé, les webhooks et commandes slash peuvent seulement être créées, éditées et vues par les administrateurs systèmes et d'équipe, et par les applications OAuth 2.0 des administrateurs systèmes. Les intégrations sont disponibles à tous les utilisateurs après qu'elles ont été créées par l'administrateur.",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Adresse IP du serveur :",
   "admin.service.listenDescription": "L'adresse et le port sur laquelle se lier et écouter. Spécifier \":8065\" se liera sur toutes les interfaces réseau. Spécifier \"127.0.0.1:8065\" se liera uniquement sur l'interface réseau disposant de cette adresse IP. Si vous choisissez un port de bas niveau (également appelés \"ports systèmes\" ou \"ports bien connus\", dans l'intervalle 0-1023), vous devez disposer des permissions pour vous lier sur ces ports. Sous Linux, vous pouvez utiliser : \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" pour autoriser Mattermost à se lier sur ces ports bien connus.",
   "admin.service.listenExample": "Ex. : \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "Activer les webhooks sortants : ",
   "admin.service.overrideDescription": "Lorsqu'activé, les webhooks, commandes slash et autres intégrations, telles que <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, seront autorisées à changer le nom d'utilisateur à partir duquel elles émettent des messages. Note : Si les intégrations sont également autorisées à redéfinir les photos de profil utilisateur, des utilisateurs pourraient effectuer des attaques de phishing en se faisant passer pour d'autres utilisateurs.",
   "admin.service.overrideTitle": "Permettre des intégrations pour remplacer les noms d'utilisateur:",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "Si activé, les administrateurs système sont notifiés par courriel si une alerte de sécurité a été annoncée ces 12 dernières heures. La messagerie doit être activée.",
   "admin.service.securityTitle": "Activer les alertes de sécurité : ",
   "admin.service.segmentDescription": "Segment.com est un service en ligne qui peut éventuellement être utilisé pour le suivi des statistiques détaillées du système. Vous pouvez obtenir une clé de signature -up pour un compte gratuit à Segment.com.",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "Le nombre de jours entre la dernière fois qu'un utilisateur a entré ses identifiants et l'expiration de la session de l'utilisateur. Si la méthode d'authentification est SAML ou GitLab, l'utilisateur pourra être automatiquement connecté à nouveau dans Mattermost s'ils sont déjà connectés dans SAML ou GitLab. Après le changement de ce paramètre, il prendra effet la prochaine fois que les utilisateurs entreront leurs identifiants.",
   "admin.service.testingDescription": "(Option de développement) Si activé, la commande \"/loadtest\" est active et charge des données de test. Changer ce paramètre nécessite de redémarrer le serveur.",
   "admin.service.testingTitle": "Activer les commandes de test : ",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "Longueur de la session LDAP et email (jours) :",
   "admin.service.webSessionDaysDesc": "Le nombre de jours entre la dernière fois qu'un utilisateur a entré ses identifiants et l'expiration de la session de l'utilisateur. Après le changement de ce paramètre, la nouvelle durée de session prendra effet la prochaine fois que les utilisateurs entreront leurs identifiants.",
   "admin.service.webhooksDescription": "Si activé, les webhooks entrants seront autorisés. Pour aider à combattre les attaques d'hameçonnage, tous les messages de webhooks seront étiquetés par un label BOT. Consultez la <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentation</a> pour en apprendre davantage.",
   "admin.service.webhooksTitle": "Activer les webhooks entrants : ",
+  "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": "Afficher l'équipe dans le menu",
   "admin.sidebar.advanced": "Options avancées",
   "admin.sidebar.audits": "Conformité et vérification",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> voudrait se connecter à votre compte utilisateur <strong>Mattermost</strong>",
   "backstage_list.search": "Rechercher",
   "backstage_navbar.backToMattermost": "retour à {siteName}",
+  "backstage_sidebar.emoji": "Emoji personnalisés",
   "backstage_sidebar.integrations": "Intégrations",
   "backstage_sidebar.integrations.commands": "Commande Slash",
   "backstage_sidebar.integrations.incoming_webhooks": "Webhooks entrants",
@@ -971,6 +992,8 @@
   "change_url.longer": "Doit comporter plus de 2 caractères",
   "change_url.noUnderscore": "Ne peux pas contenir deux tirets de suite.",
   "change_url.startWithLetter": "Doit commencer par une lettre ou un nombre",
+  "channelHeader.addToFavorites": "Ajouter aux favoris",
+  "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 de {term}",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "Informations",
   "channel_header.viewMembers": "Voir les membres",
   "channel_header.webrtc.call": "Démarrer un appel vidéo",
+  "channel_header.webrtc.offline": "The user is offline",
   "channel_header.webrtc.unavailable": "Passer un nouvel appel n'est pas possible tant que l'appel en cours n'a pas été terminé",
   "channel_info.about": "À propos",
   "channel_info.close": "Fermer",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "Basculer de {type} vers adresse électronique et mot de passe",
   "claim.oauth_to_email.title": "Basculer du compte {type} vers l'adresse électronique",
   "confirm_modal.cancel": "Annuler",
+  "connecting_screen": "Connexions",
   "create_comment.addComment": "Commenter...",
   "create_comment.comment": "Ajouter un commentaire",
   "create_comment.commentLength": "Le commentaire doit faire moins de {max} caractères.",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "Enregistrer",
   "edit_channel_purpose_modal.title1": "Modifier la description",
   "edit_channel_purpose_modal.title2": "Modifier la description de ",
+  "edit_command.save": "Update",
   "edit_post.cancel": "Annuler",
   "edit_post.edit": "Modifier {title}",
   "edit_post.editPost": "Modifier le message...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "Auteur",
   "emoji_list.delete": "Supprimer",
   "emoji_list.empty": "Aucun emoji personnalisé",
+  "emoji_list.header": "Emoji personnalisés",
   "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.",
   "emoji_list.help2": "Astuce : si vous ajoutez #, ## ou ### comme premier caractère d'une nouvelle ligne contenant un emoji, vous pourrez utiliser un emoji plus grand. Pour essayer, envoyez un message tel que '# :smile:'.",
   "emoji_list.image": "Image",
@@ -1208,6 +1235,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} au total",
   "filtered_user_list.member": "Membre",
   "filtered_user_list.search": "Appuyez sur Entrée pour rechercher",
+  "filtered_user_list.searchButton": "Rechercher",
   "filtered_user_list.show": "Filtre :",
   "filtered_user_list.team_only": "Membre de l’équipe",
   "find_team.email": "Adresse électronique",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Créé par {creator} le {createAt, date, full}",
   "installed_integrations.delete": "Supprimer",
+  "installed_integrations.edit": "Modifier",
   "installed_integrations.hideSecret": "Cacher le secret",
   "installed_integrations.regenSecret": "Générer une nouvelle clé secrète",
   "installed_integrations.regenToken": "Re-générer le jeton",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "Les commandes Slash envoient des évènements à des intégrations extérieures",
   "integrations.command.title": "Commande Slash",
   "integrations.done": "Effectué",
+  "integrations.edit": "Modifier",
   "integrations.header": "Intégrations",
   "integrations.incomingWebhook.description": "Les webhooks entrants permettent des intégrations externes afin d'envoyer des messages",
   "integrations.incomingWebhook.title": "Webhooks entrants",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " Tout membre peut rejoindre et lire ce canal.",
   "intro_messages.beginning": "Début de {name}",
   "intro_messages.channel": "canal",
-  "intro_messages.creator": "Voici le début de <strong>{name}</strong> {type}, créé par <strong>{creator}</strong> le <strong>{date}</strong>",
+  "intro_messages.creator": "Ceci est le début de {name} {type}, créé le {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Bienvenue sur {display_name}</h4><p class='channel-intro__content'><strong>Bienvenue sur {display_name}!</strong><br/><br/>Ceci est le premier canal que les membres de votre équipe verront lors de leur inscription. Utilisez-le pour poster des informations que tout le monde doit voir.</p>",
   "intro_messages.group": "Groupe privé",
   "intro_messages.invite": "Inviter d'autres membres sur ce {type}",
@@ -1418,6 +1448,7 @@
   "intro_messages.noCreator": "Ceci est le début de {name} {type}, créé le {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Début de {display_name}</h4><p class=\"channel-intro__content\">Ceci est le début de {display_name}, un canal destiné aux conversations extra-professionnelles.<br/></p>",
   "intro_messages.onlyInvited": " Seuls les membres invités peuvent voir ce groupe privé.",
+  "intro_messages.purpose": " This {type}'s purpose is: {purpose}.",
   "intro_messages.setHeader": "Définir l'en-tête",
   "intro_messages.teammate": "Vous êtes au début de votre historique de messages avec cette personne. Les messages privés et les fichiers partagés ici ne sont visibles pour personne d'autre.",
   "invite_member.addAnother": "Ajouter un autre",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "Configuration de l'équipe",
   "navbar_dropdown.viewMembers": "Voir les membres",
   "notification.dm": "Message privé",
+  "passwordRequirements": "Gestion des mots de passe :",
   "password_form.change": "Modifier mon mot de passe",
   "password_form.click": "Cliquez <a href={url}>ici</a> pour vous connecter.",
   "password_form.enter": "Saisissez un nouveau mot de passe pour votre compte {siteName}.",
@@ -1553,7 +1585,7 @@
   "password_send.description": "Pour réinitialiser votre mot de passe, saisissez l'adresse électronique que vous avez utilisé pour vous inscrire.",
   "password_send.email": "Adresse électronique",
   "password_send.error": "Veuillez indiquer un courriel valide.",
-  "password_send.link": "<p>Un lien de réinitialisation de mot de passe a été envoyé à <b>{email}</b></p>",
+  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "Réinitialiser mon mot de passe",
   "password_send.title": "Réinitialisation mot de passe",
   "pdf_preview.max_pages": "Télécharger pour lire plus de pages",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "Ajouter un indicateur",
   "rhs_comment.mobile.unflag": "Supprimer l'indicateur",
   "rhs_comment.permalink": "Lien permanent",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "Retourner aux messages avec indicateur",
   "rhs_header.backToResultsTooltip": "Retour aux résultats",
   "rhs_header.closeSidebarTooltip": "Fermer la barre latérale",
+  "rhs_header.closeTooltip": "Fermer la barre latérale",
   "rhs_header.details": "Détails du message",
   "rhs_header.expandSidebarTooltip": "Étendre la barre latérale",
+  "rhs_header.expandTooltip": "Réduire la barre latérale",
   "rhs_header.shrinkSidebarTooltip": "Réduire la barre latérale",
   "rhs_root.del": "Supprimer",
   "rhs_root.direct": "Messages privés",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "D'accord",
   "tutorial_tip.out": "Ne plus voir ces astuces.",
   "tutorial_tip.seen": "Déjà vu ? ",
+  "update_command.cancel": "Annuler",
+  "update_command.confirm": "Ajout de la commande Slash",
+  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.update": "Update",
   "upload_overlay.info": "Faites glisser un fichier pour le télécharger.",
   "user.settings.advance.embed_preview": "Voir des aperçus des contenus des liens, si disponibles",
   "user.settings.advance.embed_toggle": "Voir un aperçu pour tous les messages inclus",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "Activé",
   "user.settings.notifications.onlyMentions": "Seulement pour les mentions et messages privés",
   "user.settings.notifications.push": "Notifications push mobile",
+  "user.settings.notifications.push_notification.status": "Déclencher des notifications push lorsque",
   "user.settings.notifications.sensitiveName": "Votre prénom (respectant la casse) \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Votre nom d'utilisateur (insensible à la casse) \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Autres mots insensibles à la casse, séparés par des virgules :",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "Paramètres de notification",
   "user.settings.notifications.usernameMention": "Votre nom d'utilisateur mentionné \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Mots qui déclenchent des mentions",
+  "user.settings.push_notification.allActivity": "Pour toute l'activit",
   "user.settings.push_notification.allActivityAway": "Pour toutes les activités lorsque vous etes en absent ou hors ligne",
   "user.settings.push_notification.allActivityOffline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
   "user.settings.push_notification.allActivityOnline": "Pour toutes les activités lorsque vous etes en déplacement ou hors ligne",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "Désactivé",
   "user.settings.push_notification.offline": "Hors ligne",
   "user.settings.push_notification.online": "En ligne, absent(e) ou hors ligne",
+  "user.settings.push_notification.onlyMentions": "Seulement pour les mentions et messages privés",
   "user.settings.push_notification.onlyMentionsAway": "Pour les mentions et messages privés lorsqu'absent ou hors-ligne",
   "user.settings.push_notification.onlyMentionsOffline": "Pour mentions et messages directs en mode hors connexion",
   "user.settings.push_notification.onlyMentionsOnline": "Pour les mentions et messages privés lorsque présent, absent ou hors-ligne",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Connexion avec GitLab",
   "user.settings.security.loginLdap": "Connexion avec LDAP",
+  "user.settings.security.loginSaml": "Connexion avec GitLab",
   "user.settings.security.logoutActiveSessions": "Consulter et déconnecter les sessions actives",
   "user.settings.security.method": "Méthode de connexion",
   "user.settings.security.newPassword": "Nouveau mot de passe",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "La connexion se produit via LDAP . Le mot de passe ne peut pas être mis à jour.",
   "user.settings.security.passwordMatchError": "Les nouveaux mots de passe que vous avez saisis ne correspondent pas.",
   "user.settings.security.passwordMinLength": "Longueur minimum invalide, impossible d'afficher l'aperçu.",
+  "user.settings.security.passwordSamlCantUpdate": "Ce champ est géré par le service d'authentification. Si vous souhaitez le modifier, vous devez le faire par le biais de votre service d'authentification.",
   "user.settings.security.retypePassword": "Saisissez le nouveau mot de passe",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Utilisation de l'adresse électronique et du mot de passe",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "Voir l'historique des accès",
   "user_list.notFound": "Aucun utilisateur trouvé.",
   "user_profile.webrtc.call": "Démarrer un appel vidéo",
+  "user_profile.webrtc.offline": "The user is offline",
   "user_profile.webrtc.unavailable": "Passer un nouvel appel n'est pas possible tant que l'appel en cours n'a pas été terminé",
   "view_image.loading": "Chargement ",
   "view_image_popover.download": "Télécharger",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index f0d560085..03a64e401 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "設定",
   "admin.general.localization": "言語",
   "admin.general.localization.availableLocalesDescription": "アカウント設定でユーザーが利用可能な言語を設定してください（空欄にすると全てのサポート済み言語が利用可能になります）。手作業で新しい言語を追加する場合、この設定を保存する前に<strong>デフォルトのクライアント言語</strong>を追加しなくてはいけません。<br /><br />翻訳を手伝っていただけますか？ 是非、<a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a>に参加してください。",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "利用可能な言語:",
   "admin.general.localization.clientLocaleDescription": "新規作成ユーザーやログインしていない時に使用するデフォルト言語を選択してください。",
   "admin.general.localization.clientLocaleTitle": "デフォルトのクライアントの言語:",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "AWSでのS3バケットの名前を指定します。",
   "admin.image.amazonS3BucketExample": "例: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3バケット:",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Amazon EC2の管理者から認証情報を入手してください。",
   "admin.image.amazonS3IdExample": "例: \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3アクセスキーID:",
   "admin.image.amazonS3RegionDescription": "AWS S3バケットを作成した際に選択したリージョンを指定します。",
   "admin.image.amazonS3RegionExample": "例: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3リージョン:",
+  "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": "Amazon EC2の管理者から認証情報を入手してください。",
   "admin.image.amazonS3SecretExample": "例: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3秘密アクセスキー:",
@@ -638,6 +644,8 @@
   "admin.service.corsTitle": "クロスオリジンリクエストを許可する:",
   "admin.service.developerDesc": "有効 にした場合、JavaScriptのエラーはユーザーインターフェイスの上部に赤いバーとして表示されます。本番環境ではお勧めできません。",
   "admin.service.developerTitle": "開発者モードを有効にする: ",
+  "admin.service.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "このキーを設定することで、YouTubeビデオプレビューのタイトルが表示されます。キーを設定しない場合、投稿かコメントにハイパーリンクが含まれると、タイトルが表示されない形式でYouTubeビデオのプレビューが生成されます。キーの取得方法については<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a>を参照してください。",
   "admin.service.googleExample": "例: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google APIキー:",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "安全ではない外向きの接続を有効にする: ",
   "admin.service.integrationAdmin": "統合機能の管理を管理者のみに制限する:",
   "admin.service.integrationAdminDesc": "有効な場合、ウェブフックとスラッシュコマンドはチーム管理者とシステム管理者のみが、OAuth 2.0アプリケーションはシステム管理者のみが作成、編集、閲覧できるようになります。統合機能は管理者によって作成された後、全てのユーザーが利用できます。",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "接続待ちアドレス:",
   "admin.service.listenDescription": "使用するIPアドレスとポート番号を設定します。\":8065\"と入力することで全てのインターフェイスのIPアドレスでアクセスを待ちます。\"127.0.0.1:8065\"と指定することで、一つのIPアドレスでアクセスを待ちます。\"システムポート\"や\"ウェルノウンポート\"と呼ばれる 0～1023 までの範囲のポート番号を選んだ場合、そのポートを使用する権限が必要になります。Linuxでは、Mattermostがウェルノウンポートを使用するために \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" を利用することができます。",
   "admin.service.listenExample": "例: \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "外向きのウェブフックを有効にする: ",
   "admin.service.overrideDescription": "有効な場合、ウェブフックとスラッシュコマンド、その他の統合機能(<a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>など)が、投稿に使用されたユーザー名を変更することを許可します。注意: 統合機能にプロフィール画像の変更も許可した場合、フィッシング攻撃を許してしまう可能性があります。",
   "admin.service.overrideTitle": "統合機能によるユーザー名の上書きを許可する:",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "有効な場合、システム管理者は関係のあるセキュリティー修正が発生した場合、12時間以内に電子メールでお知らせを受信できます。電子メールが有効になっている必要があります。",
   "admin.service.securityTitle": "セキュリティー通知を有効にする: ",
   "admin.service.segmentDescription": "システムの詳細な利用状況を追跡するオンラインサービスであるSegment.comを利用することができます。Segment.comに無料で利用登録し、キーを入手してください。",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "ユーザーが最後に認証情報を入力したときから、そのユーザーのセッションが期限切れとなるまでの日数です。SAMLかGitLabによる認可の場合、SAMLかGitLabに既にログインしていれば、ユーザーは自動的にMattermostへ再ログインされます。この設定を変更した場合、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.testingDescription": "有効な場合、テストアカウントとテストデータによる /loadtest スラッシュコマンドが使用可能になります。この設定を変更した場合、サーバーを再起動するまで設定は反映されません。",
   "admin.service.testingTitle": "コマンドのテストを有効にする: ",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "AD/LDAPと電子メールのセッション維持期間 (日数):",
   "admin.service.webSessionDaysDesc": "ユーザーが最後に認証情報を入力してから、そのユーザーのセッションが期限切れとなるまでの日数です。この設定を変更した後の新しいセッション維持期間は、次にユーザーが認証情報を入力してから有効になります。",
   "admin.service.webhooksDescription": "有効な場合、内向きのウェブフックが使用できます。フィッシング攻撃対策のため、ウェブフックからの投稿にはBOTタグが表示されます。詳しくは<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>説明文書</a>を参照してください。",
   "admin.service.webhooksTitle": "内向きのウェブフックを有効にする: ",
+  "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": "サイドバーメニューからチームを追加する",
   "admin.sidebar.advanced": "詳細",
   "admin.sidebar.audits": "コンプライアンスと監査",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong>はあなたの<strong>Mattermost</strong>ユーザーアカウントに接続します。",
   "backstage_list.search": "検索",
   "backstage_navbar.backToMattermost": "{siteName}に戻る",
+  "backstage_sidebar.emoji": "カスタム絵文字",
   "backstage_sidebar.integrations": "統合機能",
   "backstage_sidebar.integrations.commands": "スラッシュコマンド",
   "backstage_sidebar.integrations.incoming_webhooks": "内向きのウェブフック",
@@ -971,6 +992,8 @@
   "change_url.longer": "2文字より長くしてください",
   "change_url.noUnderscore": "列には2つのアンダーバーを含められません",
   "change_url.startWithLetter": "英数字で始めてください",
+  "channelHeader.addToFavorites": "お気に入りに追加する",
+  "channelHeader.removeFromFavorites": "お気に入りから削除する",
   "channel_flow.alreadyExist": "このURLを持つチャンネルは既に存在しています",
   "channel_flow.changeUrlDescription": "URLで使用できない文字が使われている場合、削除されます。",
   "channel_flow.changeUrlTitle": "{term}のURLを変更する",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "情報を表示する",
   "channel_header.viewMembers": "メンバーを見る",
   "channel_header.webrtc.call": "ビデオ通話の開始",
+  "channel_header.webrtc.offline": "ユーザーはオフラインです",
   "channel_header.webrtc.unavailable": "あなたの現在の通話を終了するまで新しい通話を利用することはできません",
   "channel_info.about": "チャンネル情報",
   "channel_info.close": "閉じる",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "{type}を電子メールアドレスとパスワードでのログインに切り替える",
   "claim.oauth_to_email.title": "{type}アカウントを電子メールアドレスに切り替える",
   "confirm_modal.cancel": "キャンセル",
+  "connecting_screen": "接続",
   "create_comment.addComment": "コメントを追加する…",
   "create_comment.comment": "コメントを追加する",
   "create_comment.commentLength": "コメントの長さは{max}文字以下にしてください。",
@@ -1108,7 +1133,7 @@
   "create_post.shortcutsNotSupported": "このデバイスではキーボードショートカットはサポートされていません。",
   "create_post.tutorialTip": "<h4>メッセージを送信する</h4><p>ここにメッセージを書き、<strong>ENTER</strong>を押すことで投稿します。</p><p><strong>添付</strong>ボタンを押すことで画像やファイルをアップロードします。</p>",
   "create_post.write": "メッセージを書き込んでいます…",
-  "create_team.agreement": "アカウントを作成し{siteName}を利用する前に<a href='/static/help/terms.html'>使用条件</a>と<a href='/static/help/privacy.html'>プライバシーポリシー</a>に同意してください。同意できない場合は{siteName}は使用できません。",
+  "create_team.agreement": "アカウントを作成し{siteName}を利用する前に<a href={TermsOfServiceLink}>使用条件</a>と<a href={PrivacyPolicyLink}>プライバシーポリシー</a>に同意してください。同意できない場合は{siteName}は使用できません。",
   "create_team.display_name.back": "前のステップに戻る",
   "create_team.display_name.charLength": "名前は2文字以上の15文字以下にしてください",
   "create_team.display_name.nameHelp": "チーム名はどんな言語でも使うことができます。チーム名はメニューと画面上部に表示されます。",
@@ -1116,7 +1141,7 @@
   "create_team.display_name.required": "この項目は必須です",
   "create_team.display_name.teamName": "チーム名",
   "create_team.team_url.back": "前のステップに戻る",
-  "create_team.team_url.charLength": "名前は2文字以上の15文字以下にしてください",
+  "create_team.team_url.charLength": "名前は{min}文字以上の{max}文字以下にしてください",
   "create_team.team_url.creatingTeam": "チームを作成中です…",
   "create_team.team_url.finish": "完了",
   "create_team.team_url.hint": "<li>短く覚えやすいものがベストです</li><li>英小文字、数字、ダッシュを使ってください</li><li>英小文字で始めてください。ダッシュで終わることはできません</li>",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "保存する",
   "edit_channel_purpose_modal.title1": "目的を編集する",
   "edit_channel_purpose_modal.title2": "目的を編集する。対象: ",
+  "edit_command.save": "更新",
   "edit_post.cancel": "キャンセル",
   "edit_post.edit": "{title}を編集する",
   "edit_post.editPost": "投稿を編集する…",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "作成者",
   "emoji_list.delete": "削除",
   "emoji_list.empty": "カスタム絵文字がありません。",
+  "emoji_list.header": "カスタム絵文字",
   "emoji_list.help": "カスタム絵文字はサーバー上の全員が利用可能です。絵文字選択メニューを表示するために、メッセージボックスに':'を入力してみてください。新しい絵文字を表示するには、ページを再読み込みする必要があります。",
   "emoji_list.help2": "Tip: 絵文字を含む行の先頭に#, ##, ###のいずれかを追加すると、大きな絵文字を利用できます。'# :smile:'のような投稿で試してみてください。",
   "emoji_list.image": "画像",
@@ -1207,7 +1234,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} 合計",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} 合計",
   "filtered_user_list.member": "メンバー",
-  "filtered_user_list.search": "検索するにはEnterを押してください",
+  "filtered_user_list.search": "Enterを押して検索",
+  "filtered_user_list.searchButton": "検索",
   "filtered_user_list.show": "フィルター:",
   "filtered_user_list.team_only": "このチームのメンバー",
   "find_team.email": "電子メールアドレス",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "{creator}により{createAt, date, full}に作成されました",
   "installed_integrations.delete": "削除",
+  "installed_integrations.edit": "編集",
   "installed_integrations.hideSecret": "秘密情報を隠す",
   "installed_integrations.regenSecret": "秘密情報を再生成する",
   "installed_integrations.regenToken": "トークンを再生成する",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "スラッシュコマンドは外部の統合機能にイベントを送信します",
   "integrations.command.title": "スラッシュコマンド",
   "integrations.done": "完了",
+  "integrations.edit": "編集",
   "integrations.header": "統合機能",
   "integrations.incomingWebhook.description": "内向きのウェブフックは外部の統合機能がメッセージを投稿するのに使います",
   "integrations.incomingWebhook.title": "内向きのウェブフック",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " このチャンネルには誰でも参加して投稿を閲覧することができます。",
   "intro_messages.beginning": "{name}のはじまり",
   "intro_messages.channel": "チャンネル",
-  "intro_messages.creator": "ここは<strong>{name}</strong> {type}のはじまりです。<strong>{creator}</strong> によって<strong>{date}</strong>に作成されました",
+  "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.invite": "他の人をこの{type}に招待する",
@@ -1418,6 +1448,7 @@
   "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.setHeader": "ヘッダーを設定する",
   "intro_messages.teammate": "あなたのダイレクトメッセージの履歴の最初です。ダイレクトメッセージとそこで共有されているファイルは、この領域の外のユーザーからは見ることができません。",
   "invite_member.addAnother": "他の人を追加する",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "チームの設定",
   "navbar_dropdown.viewMembers": "メンバーを見る",
   "notification.dm": "ダイレクトメッセージ",
+  "passwordRequirements": "パスワードの要件:",
   "password_form.change": "パスワードを変更する",
   "password_form.click": "<a href={url}>ここ</a>をクリックしてログインする。",
   "password_form.enter": "{siteName}のアカウントの新しいパスワードを入力してください。",
@@ -1553,7 +1585,7 @@
   "password_send.description": "パスワードを初期化するには、利用登録した電子メールアドレスを入力してください",
   "password_send.email": "電子メールアドレス",
   "password_send.error": "有効な電子メールアドレスを入力してください。",
-  "password_send.link": "<p>パスワード初期化リンクが<b>{email}</b>に送信されました</p>",
+  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "自分のパスワードを初期化する",
   "password_send.title": "パスワードの初期化",
   "pdf_preview.max_pages": "より多くのページを読むためにダウンロードする",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "フラグ",
   "rhs_comment.mobile.unflag": "フラグを消す",
   "rhs_comment.permalink": "パーマリンク",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "フラグの立てられた投稿へ戻る",
   "rhs_header.backToResultsTooltip": "検索結果に戻る",
   "rhs_header.closeSidebarTooltip": "サイドバーを閉じる",
+  "rhs_header.closeTooltip": "サイドバーを閉じる",
   "rhs_header.details": "メッセージの詳細",
   "rhs_header.expandSidebarTooltip": "サイドバーを開く",
+  "rhs_header.expandTooltip": "サイドバーを閉じる",
   "rhs_header.shrinkSidebarTooltip": "サイドバーを閉じる",
   "rhs_root.del": "削除する",
   "rhs_root.direct": "ダイレクトメッセージ",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "OK",
   "tutorial_tip.out": "コツを表示しない。",
   "tutorial_tip.seen": "以前に見ましたか? ",
+  "update_command.cancel": "キャンセル",
+  "update_command.confirm": "スラッシュコマンドを編集する",
+  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.update": "更新",
   "upload_overlay.info": "ファイルをアップロードするためにドラッグアンドドロップします。",
   "user.settings.advance.embed_preview": "利用可能な場合、リンク先の内容を試験的にプレビューする",
   "user.settings.advance.embed_toggle": "全ての埋め込まれたプレビューの表示非表示を切り替える",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "オン",
   "user.settings.notifications.onlyMentions": "あなたについての投稿とダイレクトメッセージに関してのみ",
   "user.settings.notifications.push": "モバイルプッシュ通知",
+  "user.settings.notifications.push_notification.status": "プッシュ通知をトリガーする場合",
   "user.settings.notifications.sensitiveName": "あなたの名(ファーストネーム)は大文字小文字を区別して\"{first_name}\"です",
   "user.settings.notifications.sensitiveUsername": "あなたのユーザー名は、大文字小文字を区別せず\"{username}\"です",
   "user.settings.notifications.sensitiveWords": "他の単語をカンマで区切って入力してください。大文字小文字は区別されません:",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "通知の設定",
   "user.settings.notifications.usernameMention": "あなたのユーザー名についての「@{username}」",
   "user.settings.notifications.wordsTrigger": "あなたについての投稿となる単語",
+  "user.settings.push_notification.allActivity": "全てのアクティビティーについて",
   "user.settings.push_notification.allActivityAway": "離席中もしくはオフライン時の全てのアクティビティーについて",
   "user.settings.push_notification.allActivityOffline": "オフライン時の全てのアクティビティーについて",
   "user.settings.push_notification.allActivityOnline": "オンライン、離席中もしくはオフライン時の全てのアクティビティーについて",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "オフ",
   "user.settings.push_notification.offline": "オフライン",
   "user.settings.push_notification.online": "オンライン、離席中もしくはオフライン",
+  "user.settings.push_notification.onlyMentions": "あなたについての投稿とダイレクトメッセージに関して",
   "user.settings.push_notification.onlyMentionsAway": "離席中もしくはオフライン時のあなたについての投稿とダイレクトメッセージについて",
   "user.settings.push_notification.onlyMentionsOffline": "オフライン時のあなたについての投稿とダイレクトメッセージについて",
   "user.settings.push_notification.onlyMentionsOnline": "オンライン、離席中もしくはオフライン時のあなたについての投稿とダイレクトメッセージについて",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "GitLabでログインしました",
   "user.settings.security.loginLdap": "AD/LDAPでログインする",
+  "user.settings.security.loginSaml": "GitLabでログインしました",
   "user.settings.security.logoutActiveSessions": "アクティブなセッションを見てログアウトする",
   "user.settings.security.method": "サインイン方法",
   "user.settings.security.newPassword": "新しいパスワード",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "AD/LDAPでログインしています。パスワードは更新できません。",
   "user.settings.security.passwordMatchError": "あなたの入力した新しいパスワードが一致しません。",
   "user.settings.security.passwordMinLength": "最小の長さが不正です。プレビューを表示できません。",
+  "user.settings.security.passwordSamlCantUpdate": "この欄はあなたのログインプロバイダーで使用されます。変更したい場合、ログインプロバイダーに通じて変更してください。",
   "user.settings.security.retypePassword": "新しいパスワードをもう一度入力してください",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "電子メールアドレスとパスワードでのログインに切り替える",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "アクセス履歴を見る",
   "user_list.notFound": "ユーザーが見付かりません",
   "user_profile.webrtc.call": "ビデオ通話の開始",
+  "user_profile.webrtc.offline": "ユーザーはオフラインです",
   "user_profile.webrtc.unavailable": "あなたの現在の通話を終了するまで新しい通話を利用することはできません",
   "view_image.loading": "読み込み中です ",
   "view_image_popover.download": "ダウンロードする",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index f1b1a28dd..235750e70 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -11,10 +11,10 @@
   "about.licensed": "다음 사용자에게 허가되었습니다:",
   "about.number": "빌드 넘버:",
   "about.teamEditionLearn": "Mattermost 커뮤니티에 참여 ",
-  "about.teamEditionSt": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 쉽고 빠르게 접근할 수 있습니다.",
+  "about.teamEditionSt": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 빠르게 찾고 공유할 수 있습니다.",
   "about.teamEditiont0": "팀 에디션",
   "about.teamEditiont1": "엔터프라이즈 에디션",
-  "about.title": "Mattermost에 대해",
+  "about.title": "Mattermost에 대하여",
   "about.version": "버전:",
   "access_history.title": "접근 기록",
   "activity_log.activeSessions": "활성 세션",
@@ -35,14 +35,14 @@
   "add_command.autocompleteDescription.help": "(선택사항) 자동완성 목록에서 보여질 부가적인 설명을 입력하세요.",
   "add_command.autocompleteDescription.placeholder": "예시: \"환자 기록에 대한 검색결과를 보여줍니다\"",
   "add_command.autocompleteHint": "자동완성 힌트",
-  "add_command.autocompleteHint.help": "(선택사항) 자동완성 목록에서 보여질, 명령어와 관련된 매개변수 도움말을 입력하세요.",
+  "add_command.autocompleteHint.help": "(선택사항) 자동완성 목록에서 보여질, 명령어 매개변수의 도움말을 입력하세요.",
   "add_command.autocompleteHint.placeholder": "예시: [환자 이름]",
   "add_command.cancel": "취소",
   "add_command.description": "설명",
   "add_command.description.help": "명령어에 대한 설명을 입력하세요.",
   "add_command.displayName": "표시명",
   "add_command.displayName.help": "명령어의 표시명을 64글자 이내로 입력하세요.",
-  "add_command.doneHelp": "Your slash command has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">documentation</a> for further details).",
+  "add_command.doneHelp": "명령어 설정이 완료되었습니다. 다음 토큰이 이벤트 요청과 같이 보내질 것입니다. 요청이 유효한 팀에서 보내진 요청인지 검증해주세요. (자세한 내용은 <a href=\"https://docs.mattermost.com/developer/slash-commands.html\">문서</a>를 참고하세요).",
   "add_command.iconUrl": "응답 아이콘",
   "add_command.iconUrl.help": "(선택사항) 명령어 응답 글에 사용될 프로필 사진을 선택합니다. 128 x 128 픽셀 이상의 .png 또는 .jpg 이미지의 URL을 입력하세요.",
   "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png",
@@ -53,78 +53,78 @@
   "add_command.save": "저장",
   "add_command.token": "<b>토큰</b>: {token}",
   "add_command.trigger": "명령어 트리거 단어",
-  "add_command.trigger.help": "트리거 단어는 고유한 값이여야 하며, 슬래시로 시작하거나 공백을 포함할 수 없습니다.",
-  "add_command.trigger.helpExamples": "예시: client, employee, patient, weather",
+  "add_command.trigger.help": "트리거 단어는 고유한 값이여야 하며, 슬래시(/)로 시작되거나 공백을 포함할 수 없습니다.",
+  "add_command.trigger.helpExamples": "예시: 고객, 직원, 환자, 날씨",
   "add_command.trigger.helpReserved": "사용할 수 없음: {link}",
   "add_command.trigger.helpReservedLinkText": "내장된 명령어 목록을 확인하세요.",
-  "add_command.trigger.placeholder": "명령어 트리거 예시. \"hello\"",
+  "add_command.trigger.placeholder": "명령어 트리거 예시: \"인사\"",
   "add_command.triggerInvalidLength": "단어가 {min}글자 이상, {max}글자 이하여야 합니다.",
-  "add_command.triggerInvalidSlash": "단어 앞에 /를 사용할 수 없습니다.",
+  "add_command.triggerInvalidSlash": "단어 앞에 슬래시(/)를 사용할 수 없습니다.",
   "add_command.triggerInvalidSpace": "단어에 공백을 포함할 수 없습니다.",
   "add_command.triggerRequired": "단어가 필요합니다.",
   "add_command.url": "요청 URL",
-  "add_command.url.help": "The callback URL to receive the HTTP POST or GET event request when the slash command is run.",
+  "add_command.url.help": "명령이 실행될 때 이벤트 요청(HTTP POST 또는 GET)을 받을 콜백 URL을 입력하세요.",
   "add_command.url.placeholder": "URL 주소는 http:// 또는 https:// 로 시작되어야 합니다",
   "add_command.urlRequired": "요청 URL을 입력하세요.",
   "add_command.username": "응답 유저 이름",
-  "add_command.username.help": "Choose a username override for responses for this slash command. Usernames can consist of up to 22 characters consisting of lowercase letters, numbers and they symbols \"-\", \"_\", and \".\" .",
-  "add_command.username.placeholder": "사용자 이름",
+  "add_command.username.help": "명령 응답에 보일 사용자명을 입력하세요. 사용자명은 22글자여 이하여야 하며, 영문 소문자, 숫자, 특수문자 \"-\", \"_\", \".\"만 포함할 수 있습니다.",
+  "add_command.username.placeholder": "사용자명",
   "add_emoji.cancel": "취소",
   "add_emoji.header": "추가",
   "add_emoji.image": "이미지",
   "add_emoji.image.button": "선택",
-  "add_emoji.image.help": "이모티콘에 사용할 이미지를 선택하세요. 128px * 128px, 64KB 이하 gif, png, jpeg 이미지만 가능합니다.",
+  "add_emoji.image.help": "이모티콘으로 사용할 이미지를 선택하세요. gif, png, jpg 이미지를 사용할 수 있으며, 너비:128px, 높이:128px, 64KB를 초과할 수 없습니다.",
   "add_emoji.imageRequired": "이모티콘 이미지가 필요합니다.",
   "add_emoji.name": "이름",
-  "add_emoji.name.help": "이모티콘 이름은 64글자 이하 소문자, 숫자, 특수문자 '-' 와 '_' 만 사용할 수 있습니다.",
-  "add_emoji.nameInvalid": "이모티콘 이름은 문자, 숫자, 특수문자 '-' 와 '_' 만 포함할 수 있습니다.",
+  "add_emoji.name.help": "이모티콘 이름으로 64글자 이하 영문 소문자, 숫자, 특수문자 '-' 와 '_'를 사용할 수 있습니다.",
+  "add_emoji.nameInvalid": "이모티콘 이름은 영문 소문자, 숫자, 특수문자 '-' 와 '_' 만 포함할 수 있습니다.",
   "add_emoji.nameRequired": "이모티콘 이름이 필요합니다.",
-  "add_emoji.nameTaken": "이미 시스템 이모티콘에서 사용되는 이름입니다. 다른 이름을 사용하세요.",
+  "add_emoji.nameTaken": "이미 시스템 이모티콘에서 사용하는 이름입니다. 다른 이름을 사용하세요.",
   "add_emoji.preview": "미리보기",
-  "add_emoji.preview.sentence": "This is a sentence with {image} in it.",
+  "add_emoji.preview.sentence": "이모티콘({image})이 포함된 문장입니다.",
   "add_emoji.save": "저장",
   "add_incoming_webhook.cancel": "취소",
   "add_incoming_webhook.channel": "채널",
-  "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.channel.help": "공개 채널이나 프라이빗 그룹은 웹훅 페이로드를 받습니다. 웹훅 설정 시 프라이빗 그룹에 소속되어 있어야 합니다.",
   "add_incoming_webhook.channelRequired": "유효한 채널을 선택하세요.",
   "add_incoming_webhook.description": "설명",
   "add_incoming_webhook.description.help": "Incoming webhook에 대한 설명을 입력하세요.",
   "add_incoming_webhook.displayName": "표시명",
   "add_incoming_webhook.displayName.help": "Incoming webhook의 표시명을 64글자 이내로 입력하세요.",
-  "add_incoming_webhook.doneHelp": "Your incoming webhook has been set up. Please send data to the following URL (see <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">documentation</a> for further details).",
+  "add_incoming_webhook.doneHelp": "Incoming Webhook 설정이 완료되었습니다. 다음 URL로 데이터를 보내세요. (더 자세한 내용은 <a href=\"https://docs.mattermost.com/developer/webhooks-incoming.html\">문서</a>를 참고하세요).",
   "add_incoming_webhook.name": "이름",
   "add_incoming_webhook.save": "저장",
   "add_incoming_webhook.url": "<b>URL</b>: {url}",
   "add_oauth_app.callbackUrls.help": "The redirect URIs to which the service will redirect users after accepting or denying authorization of your application, and which will handle authorization codes or access tokens. Must be a valid URL and start with http:// or https://.",
-  "add_oauth_app.callbackUrlsRequired": "하나 이상의 콜백 URL들이 필요합니다.",
+  "add_oauth_app.callbackUrlsRequired": "하나 이상의 콜백 URL이 필요합니다.",
   "add_oauth_app.clientId": "<b>클라이언트 ID</b>: {id}",
-  "add_oauth_app.clientSecret": "<b>클라이언트 Secret</b>: {secret}",
-  "add_oauth_app.description.help": "OAuth 2.0 애플리케이션을 위한 설명",
-  "add_oauth_app.descriptionRequired": "OAuth 2.0 애플리케이션을 위한 설명은 필수 항목입니다.",
-  "add_oauth_app.doneHelp": "귀하의 OAuth 2.0 응용 프로그램이 설정되었습니다. 응용 프로그램에 대한 승인을 요청할 때 다음과 같은 클라이언트 ID 및 클라이언트 시크릿을 사용하십시오. (더 자세한 내용은 <a href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">문서</a>를 확인하십시오.)",
-  "add_oauth_app.doneUrlHelp": "The following are your authorized redirect URL(s).",
+  "add_oauth_app.clientSecret": "<b>클라이언트 시크릿</b>: {secret}",
+  "add_oauth_app.description.help": "OAuth 2.0 애플리케이션 설명",
+  "add_oauth_app.descriptionRequired": "OAuth 2.0 애플리케이션 설명은 필수 항목입니다.",
+  "add_oauth_app.doneHelp": "귀하의 OAuth 2.0 애플리케이션이 설정되었습니다. 애플리케이션에 대한 승인을 요청할 때 다음과 같은 클라이언트 ID 및 클라이언트 시크릿을 사용하십시오. (더 자세한 내용은 <a href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">문서</a>를 참고하세요.)",
+  "add_oauth_app.doneUrlHelp": "다음 리디렉트 URL이 승인되었습니다.",
   "add_oauth_app.header": "추가",
   "add_oauth_app.homepage.help": "The URL for the homepage of the OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
-  "add_oauth_app.homepageRequired": "OAuth 2.0 어플리케이션을 위한 홈페이지가 필요합니다.",
+  "add_oauth_app.homepageRequired": "OAuth 2.0 애플리케이션 홈페이지는 필수 항목입니다.",
   "add_oauth_app.icon.help": "(Optional) The URL of the image used for your OAuth 2.0 application. Make sure you use HTTP or HTTPS in your URL.",
   "add_oauth_app.name.help": "OAuth 2.0 어플리케이션의 표시될 이름은 최대 64문자로 구성됩니다.",
-  "add_oauth_app.nameRequired": "OAuth 2.0 어플리케이션을 위한 이름이 필요합니다.",
-  "add_oauth_app.trusted.help": "When true, the OAuth 2.0 application is considered trusted by the Mattermost server and doesn't require the user to accept authorization. When false, an additional window will appear, asking the user to accept or deny the authorization.",
-  "add_oauth_app.url": "<b>URL(s)</b>: {url}",
-  "add_outgoing_webhook.callbackUrls": "Callback URLs (One Per Line)",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to.",
+  "add_oauth_app.nameRequired": "OAuth 2.0 어플리케이션 이름이 필요합니다.",
+  "add_oauth_app.trusted.help": "\"네\"를 선택하면, OAuth 2.0 애플리케이션 접근 허용을 위한 추가 과정이 필요하지 않습니다. \"아니요\" 선택 시, 추가 인증을 위한 창이 나타나 권한 허용여부를 물어보게 됩니다.",
+  "add_oauth_app.url": "<b>URL</b>: {url}",
+  "add_outgoing_webhook.callbackUrls": "콜백 URL (한 줄에 하나 씩)",
+  "add_outgoing_webhook.callbackUrls.help": "메시지가 보내질 URL을 입력하세요.",
   "add_outgoing_webhook.callbackUrlsRequired": "하나 이상의 콜백 URL이 필요합니다.",
   "add_outgoing_webhook.cancel": "취소",
   "add_outgoing_webhook.channel": "채널",
   "add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
-  "add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
+  "add_outgoing_webhook.contentType.help1": "응답이 보내질 컨텐트 타입을 선택하세요.",
   "add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
-  "add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
+  "add_outgoing_webhook.contentType.help3": "If applcation/json is chosen, the server assumes you will posting JSON data.",
   "add_outgoing_webhook.content_Type": "콘텐츠 형식",
   "add_outgoing_webhook.description": "설명",
   "add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
   "add_outgoing_webhook.displayName": "표시명",
-  "add_outgoing_webhook.displayName.help": "Display name for your outgoing webhook made of up to 64 characters.",
+  "add_outgoing_webhook.displayName.help": "Outgoing webhook의 표시될 이름은 최대 64문자로 구성됩니다.",
   "add_outgoing_webhook.doneHelp": "Your outgoing webhook has been set up. The following token will be sent in the outgoing payload. Please use it to verify the request came from your Mattermost team (see <a href=\"https://docs.mattermost.com/developer/webhooks-outgoing.html\">documentation</a> for further details).",
   "add_outgoing_webhook.name": "이름",
   "add_outgoing_webhook.save": "저장",
@@ -132,13 +132,13 @@
   "add_outgoing_webhook.triggerWords": "트리거 단어 (줄 당 하나씩 입력합니다)",
   "add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "유효한 채널과 트리거 단어 목록을 입력하세요",
-  "add_outgoing_webhook.triggerWordsTriggerWhen": "Trigger When",
+  "add_outgoing_webhook.triggerWordsTriggerWhen": "트리거 조건",
   "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
   "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
   "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
   "admin.advance.cluster": "고 가용성 (베타)",
-  "admin.audits.reload": "Reload User Activity Logs",
-  "admin.audits.title": "User Activity Logs",
+  "admin.audits.reload": "사용자 활동 기록 새로고침",
+  "admin.audits.title": "사용자 활동 기록",
   "admin.authentication.email": "이메일 인증",
   "admin.authentication.gitlab": "GitLab",
   "admin.authentication.ldap": "AD/LDAP",
@@ -148,28 +148,28 @@
   "admin.cluster.enableDescription": "활성화 하면 Mattermost가 고 가용성 모드로 동작합니다. 고 가용성 모드 설정에 대한 자세한 내용은 이 <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">문서</a>를 참고하세요.",
   "admin.cluster.enableTitle": "고 가용성 모드:",
   "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.",
-  "admin.cluster.interNodeListenAddressEx": "E.g.: \":8075\"",
+  "admin.cluster.interNodeListenAddressEx": "예시 \":8075\"",
   "admin.cluster.interNodeListenAddressTitle": "Inter-Node Listen Address:",
   "admin.cluster.interNodeUrlsDesc": "The internal/private URLs of all the Mattermost servers separated by commas.",
-  "admin.cluster.interNodeUrlsEx": "예시: \"http://10.10.10.30, http://10.10.10.31\"",
+  "admin.cluster.interNodeUrlsEx": "예시 \"http://10.10.10.30, http://10.10.10.31\"",
   "admin.cluster.interNodeUrlsTitle": "내부 노드 URL:",
   "admin.cluster.loadedFrom": "This configuration file was loaded from Node ID {clusterId}. Please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> if you are accessing the System Console through a load balancer and experiencing issues.",
   "admin.cluster.noteDescription": "Changing properties in this section will require a server restart before taking effect. When High Availability mode is enabled, the System Console is set to read-only and can only be changed from the configuration file.",
   "admin.cluster.should_not_change": "WARNING: These settings may not sync with the other servers in the cluster. High Availability inter-node communication will not start until you modify the config.json to be identical on all servers and restart Mattermost. Please see the <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> on how to add or remove a server from the cluster. If you are accessing the System Console through a load balancer and experiencing issues, please see the Troubleshooting Guide in our <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a>.",
   "admin.cluster.status_table.config_hash": "Config File MD5",
-  "admin.cluster.status_table.hostname": "Hostname",
+  "admin.cluster.status_table.hostname": "호스트명",
   "admin.cluster.status_table.id": "Node ID",
   "admin.cluster.status_table.reload": " Reload Cluster Status",
   "admin.cluster.status_table.status": "상태",
   "admin.cluster.status_table.url": "Inter-Node URL",
   "admin.cluster.status_table.version": "버전:",
   "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
-  "admin.compliance.directoryExample": "예시: \"./data/\"",
-  "admin.compliance.directoryTitle": "Compliance Report Directory:",
+  "admin.compliance.directoryExample": "예시 \"./data/\"",
+  "admin.compliance.directoryTitle": "감사 보고서 경로:",
   "admin.compliance.enableDailyDesc": "When true, Mattermost will generate a daily compliance report.",
   "admin.compliance.enableDailyTitle": "일일 보고:",
   "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> to learn more.",
-  "admin.compliance.enableTitle": "Enable Compliance Reporting:",
+  "admin.compliance.enableTitle": "감사 보고:",
   "admin.compliance.false": "비활성화",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance 는 엔터프라이즈 에디션의 기능입니다. 현재 라이센스는 Compliance 기능을 지원하지 않습니다. <a href=\"http://mattermost.com\" target=\"_blank\">이 곳</a>에서 엔터프라이즈 라이센스에 대한 정보를 확인하세요.</p>",
   "admin.compliance.save": "저장",
@@ -188,7 +188,7 @@
   "admin.compliance_reports.run": "Run Compliance Report",
   "admin.compliance_reports.title": "Compliance Reports",
   "admin.compliance_reports.to": "수신:",
-  "admin.compliance_reports.to_placeholder": "예시. \"2016-03-15\"",
+  "admin.compliance_reports.to_placeholder": "예시 \"2016-03-15\"",
   "admin.compliance_table.desc": "설명",
   "admin.compliance_table.download": "다운로드",
   "admin.compliance_table.params": "Params",
@@ -211,10 +211,10 @@
   "admin.customization.androidAppDownloadLinkTitle": "안드로이드 앱 다운로드 링크:",
   "admin.customization.appDownloadLinkDesc": "Add a link to a download page for the Mattermost apps. When a link is present, an option to \"Download Mattermost Apps\" will be added in the Main Menu so users can find the download page. Leave this field blank to hide the option from the Main Menu.",
   "admin.customization.appDownloadLinkTitle": "Mattermost Apps Download Page Link:",
-  "admin.customization.customBrand": "사용자 정의 브랜딩",
-  "admin.customization.customEmoji": "사용자 정의 이모티콘",
+  "admin.customization.customBrand": "커스텀 브랜딩",
+  "admin.customization.customEmoji": "커스텀 이모티콘",
   "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting \"Custom Emoji\".",
-  "admin.customization.enableCustomEmojiTitle": "사용자 정의 이모티콘 활성화:",
+  "admin.customization.enableCustomEmojiTitle": "커스텀 이모티콘:",
   "admin.customization.iosAppDownloadLinkDesc": "Add a link to download the iOS app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.",
   "admin.customization.iosAppDownloadLinkTitle": "iOS 앱 다운로드 링크:",
   "admin.customization.nativeAppLinks": "Mattermost 애플리케이션 링크",
@@ -223,11 +223,11 @@
   "admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.",
   "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow System Admins to create custom emoji",
   "admin.customization.restrictCustomEmojiCreationTitle": "이모티콘 생성 제한:",
-  "admin.customization.support": "Legal and Support",
+  "admin.customization.support": "법적 사항 및 지원",
   "admin.database.title": "데이터베이스 설정",
   "admin.developer.title": "개발자 설정",
   "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.",
-  "admin.email.allowEmailSignInDescription": "설정 시, Mattermost는 사용자들이 그들의 이메일과 비밀번호로 로그인할 수 있게 합니다.",
+  "admin.email.allowEmailSignInDescription": "설정 시, Mattermost는 사용자들이 그들의 이메일과 패스워드로 로그인할 수 있게 합니다.",
   "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
   "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password.  This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.",
   "admin.email.allowSignupTitle": "Enable account creation with email: ",
@@ -255,7 +255,7 @@
   "admin.email.notificationDisplayExample": "예시 \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "알림 표시명:",
   "admin.email.notificationEmailDescription": "Email address displayed on email account used when sending notification emails from Mattermost.",
-  "admin.email.notificationEmailExample": "예시: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
+  "admin.email.notificationEmailExample": "예시 \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
   "admin.email.notificationEmailTitle": "알림 이메일 주소:",
   "admin.email.notificationOrganization": "Notification Footer Mailing Address:",
   "admin.email.notificationOrganizationDescription": "Organization name and address displayed on email notifications from Mattermost, such as \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\". If the field is left empty, the organization name and address will not be displayed.",
@@ -265,21 +265,21 @@
   "admin.email.passwordSaltExample": "예시 \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Password Reset Salt:",
   "admin.email.pushContentDesc": "Selecting \"Send generic description with user and channel names\" provides push notifications with generic messages, including names of users and channels but no specific details from the message text.<br /><br />Selecting \"Send full message snippet\" sends excerpts from messages triggering notifications with specifics and may include confidential information sent in messages. If your Push Notification Service is outside your firewall, it is HIGHLY RECOMMENDED this option only be used with an \"https\" protocol to encrypt the connection.",
-  "admin.email.pushContentTitle": "Push Notification Contents:",
+  "admin.email.pushContentTitle": "푸시 알림 콘텐츠:",
   "admin.email.pushDesc": "Typically set to true in production. When true, Mattermost attempts to send iOS and Android push notifications through the push notification server.",
   "admin.email.pushOff": "Do not send push notifications",
   "admin.email.pushOffHelp": "Please see <a href=\"http://docs.mattermost.com/deployment/push.html#push-notifications-and-mobile-devices\" target=\"_blank\">documentation on push notifications</a> to learn more about setup options.",
   "admin.email.pushServerDesc": "Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.",
   "admin.email.pushServerEx": "예시 \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "푸시 알림 서버:",
-  "admin.email.pushTitle": "Enable Push Notifications: ",
+  "admin.email.pushTitle": "모바일 푸시 알림: ",
   "admin.email.requireVerificationDescription": "Typically set to true in production. When true, Mattermost requires email verification after account creation prior to allowing login. Developers may set this field to false so skip sending verification emails for faster development.",
-  "admin.email.requireVerificationTitle": "Require Email Verification: ",
+  "admin.email.requireVerificationTitle": "이메일 검증: ",
   "admin.email.selfPush": "Manually enter Push Notification Service location",
   "admin.email.smtpPasswordDescription": " Obtain this credential from administrator setting up your email server.",
   "admin.email.smtpPasswordExample": "예시 \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "SMTP 서버 비밀번호:",
-  "admin.email.smtpPortDescription": "Port of SMTP email server.",
+  "admin.email.smtpPasswordTitle": "SMTP 서버 패스워드:",
+  "admin.email.smtpPortDescription": "SMTP 이메일 서버의 포트를 입력하세요.",
   "admin.email.smtpPortExample": "예시 \"25\", \"465\"",
   "admin.email.smtpPortTitle": "SMTP 서버 포트:",
   "admin.email.smtpServerDescription": "Location of SMTP email server.",
@@ -298,6 +298,8 @@
   "admin.general.configuration": "환경설정",
   "admin.general.localization": "지역화",
   "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the <strong>Default Client Language</strong> must be added before saving this setting.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "Available Languages:",
   "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
   "admin.general.localization.clientLocaleTitle": "클라이언트 기본 언어:",
@@ -319,15 +321,15 @@
   "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.",
   "admin.gitlab.EnableHtmlDesc": "<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Then use \"Application Secret Key\" and \"Application ID\" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>",
   "admin.gitlab.authDescription": "Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize).   Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
-  "admin.gitlab.authExample": "예: \"https://<your-gitlab-url>/api/v3/user\"",
+  "admin.gitlab.authExample": "예시 \"https://<your-gitlab-url>/api/v3/user\"",
   "admin.gitlab.authTitle": "인증 엔드포인트:",
   "admin.gitlab.clientIdDescription": "Obtain this value via the instructions above for logging into GitLab",
-  "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
+  "admin.gitlab.clientIdExample": "예시 \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.gitlab.clientIdTitle": "애플리케이션 ID:",
-  "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "Application Secret Key:",
+  "admin.gitlab.clientSecretExample": "예시 \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
+  "admin.gitlab.clientSecretTitle": "애플리케이션 시크릿 키:",
   "admin.gitlab.enableDescription": "When true, Mattermost allows team creation and account signup using GitLab OAuth.",
-  "admin.gitlab.enableTitle": "Enable authentication with GitLab: ",
+  "admin.gitlab.enableTitle": "GitLab 계정으로 인증: ",
   "admin.gitlab.settingsTitle": "GitLab 설정",
   "admin.gitlab.tokenDescription": "GitLab 연동을 위해 다음 URL https://<your-gitlab-url>/api/v3/user 을 입력하십시오.   서버 설정에 따라 HTTP와 HTTPS 중 올바른 것을 사용하여야 합니다.",
   "admin.gitlab.tokenExample": "예시 \"https://<your-gitlab-url>/api/v3/user\"",
@@ -338,103 +340,107 @@
   "admin.google.EnableHtmlDesc": "<ol><li><a href='https://accounts.google.com/login'>Log in</a> to your Google account.</li><li>Go to <a href='https://console.developers.google.com'>https://console.developers.google.com</a>, click <strong>Credentials</strong> in the left hand sidebar and enter \"Mattermost - your-company-name\" as the <strong>Project Name</strong>, then click <strong>Create</strong>.</li><li>Click the <strong>OAuth consent screen</strong> header and enter \"Mattermost\" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.</li><li>Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.</li><li>Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.</li><li>Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.</li><li>Finally, go to <a href='https://console.developers.google.com/apis/api/plus/overview'>Google+ API</a> and click <strong>Enable</strong>. This might take a few minutes to propagate through Google's systems.</li></ol>",
   "admin.google.authTitle": "Auth Endpoint:",
   "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.",
-  "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
+  "admin.google.clientIdExample": "예시 \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"",
   "admin.google.clientIdTitle": "클라이언트 ID",
   "admin.google.clientSecretDescription": "The Client Secret you received when registering your application with Google.",
   "admin.google.clientSecretExample": "예시 \"H8sz0Az-dDs2p15-7QzD231\"",
-  "admin.google.clientSecretTitle": "Client Secret",
-  "admin.google.tokenTitle": "Token Endpoint:",
+  "admin.google.clientSecretTitle": "클라이언트 시크릿",
+  "admin.google.tokenTitle": "토큰 엔드포인트:",
   "admin.google.userTitle": "사용자 API 엔드포인트:",
   "admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
   "admin.image.amazonS3BucketExample": "예시 \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.",
   "admin.image.amazonS3IdExample": "예시 \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
   "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
   "admin.image.amazonS3RegionExample": "예시 \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
+  "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.",
-  "admin.image.amazonS3SecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
+  "admin.image.amazonS3SecretExample": "예시 \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
   "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
-  "admin.image.localExample": "예시: \"./data/\"",
+  "admin.image.localExample": "예시 \"./data/\"",
   "admin.image.localTitle": "로컬 저장소 경로:",
   "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
   "admin.image.maxFileSizeTitle": "최대 파일 크기:",
   "admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewHeightExample": "E.g.: \"0\"",
+  "admin.image.previewHeightExample": "예시 \"0\"",
   "admin.image.previewHeightTitle": "이미지 미리보기 높이:",
   "admin.image.previewWidthDescription": "Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.",
-  "admin.image.previewWidthExample": "E.g.: \"1024\"",
+  "admin.image.previewWidthExample": "예시 \"1024\"",
   "admin.image.previewWidthTitle": "이미지 미리보기 너비:",
   "admin.image.profileHeightDescription": "Height of profile picture.",
-  "admin.image.profileHeightExample": "E.g.: \"0\"",
+  "admin.image.profileHeightExample": "예시 \"0\"",
   "admin.image.profileHeightTitle": "프로필 사진 높이:",
   "admin.image.profileWidthDescription": "Width of profile picture.",
-  "admin.image.profileWidthExample": "E.g.: \"1024\"",
+  "admin.image.profileWidthExample": "예시 \"1024\"",
   "admin.image.profileWidthTitle": "프로필 사진 너비:",
   "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Regenerate\" to create new salt.",
-  "admin.image.publicLinkExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
-  "admin.image.publicLinkTitle": "Public Link Salt:",
+  "admin.image.publicLinkExample": "예시 \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
+  "admin.image.publicLinkTitle": "공개 링크 Salt:",
   "admin.image.shareDescription": "Allow users to share public links to files and images.",
-  "admin.image.shareTitle": "Enable Public File Links: ",
+  "admin.image.shareTitle": "공개 파일 링크: ",
   "admin.image.storeAmazonS3": "Amazon S3",
   "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
-  "admin.image.storeLocal": "Local File System",
-  "admin.image.storeTitle": "File Storage System:",
+  "admin.image.storeLocal": "로컬 파일 시스템",
+  "admin.image.storeTitle": "파일 저장소 시스템:",
   "admin.image.thumbHeightDescription": "Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
-  "admin.image.thumbHeightExample": "E.g.: \"100\"",
-  "admin.image.thumbHeightTitle": "Attachment Thumbnail Height:",
+  "admin.image.thumbHeightExample": "예시 \"100\"",
+  "admin.image.thumbHeightTitle": "첨부파일 썸네일 높이:",
   "admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
-  "admin.image.thumbWidthExample": "E.g.: \"120\"",
-  "admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
+  "admin.image.thumbWidthExample": "예시 \"120\"",
+  "admin.image.thumbWidthTitle": "첨부파일 썸네일 너비:",
   "admin.integrations.custom": "Custom Integrations",
   "admin.integrations.external": "외부 서비스",
   "admin.integrations.webrtc": "Mattermost WebRTC",
   "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.",
-  "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
+  "admin.ldap.baseEx": "예시 \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
   "admin.ldap.bindPwdDesc": "Password of the user given in \"Bind Username\".",
   "admin.ldap.bindPwdTitle": "Bind Password:",
   "admin.ldap.bindUserDesc": "The username used to perform the LDAP search. This should typically be an account created specifically for use with Mattermost. It should have access limited to read the portion of the LDAP tree specified in the BaseDN field.",
   "admin.ldap.bindUserTitle": "Bind Username:",
   "admin.ldap.emailAttrDesc": "The attribute in the LDAP server that will be used to populate the email addresses of users in Mattermost.",
-  "admin.ldap.emailAttrEx": "Ex \"mail\" or \"userPrincipalName\"",
+  "admin.ldap.emailAttrEx": "예시 \"mail\" or \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "이메일 속성:",
   "admin.ldap.enableDesc": "활성화하면, LDAP으로 접속 할 수 있습니다.",
   "admin.ldap.enableTitle": "LDAP으로 접속을 허용:",
   "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost. When set, users will not be able to edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their own first name in Account Settings.",
-  "admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
-  "admin.ldap.firstnameAttrTitle": "First Name Attribute",
+  "admin.ldap.firstnameAttrEx": "예시 \"givenName\"",
+  "admin.ldap.firstnameAttrTitle": "이름 속성",
   "admin.ldap.idAttrDesc": "The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a user’s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the \"LDAP Username\" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.",
   "admin.ldap.idAttrEx": "예시 \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID 속성: ",
   "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost. When set, users will not be able to edit their last name, since it is synchronized with the LDAP server. When left blank, users can set their own last name in Account Settings.",
-  "admin.ldap.lastnameAttrEx": "E.g.: \"sn\"",
-  "admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
+  "admin.ldap.lastnameAttrEx": "예시 \"sn\"",
+  "admin.ldap.lastnameAttrTitle": "성 속성:",
   "admin.ldap.ldap_test_button": "AD/LDAP 테스트",
   "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"LDAP Username\".",
   "admin.ldap.loginNameEx": "예시 \"LDAP Username\"",
   "admin.ldap.loginNameTitle": "Login Field Name:",
-  "admin.ldap.maxPageSizeEx": "E.g.: \"2000\"",
+  "admin.ldap.maxPageSizeEx": "예시 \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "한번에 AD/LDAP서버로부터 요청할 Mattermost 서버의 최대 유저 숫자 값입니다. 0은 무제한을 뜻합니다.",
   "admin.ldap.maxPageSizeTitle": "최대 페이지 크기",
   "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost. When set, users will not be able to edit their nickname, since it is synchronized with the LDAP server. When left blank, users can set their own nickname in Account Settings.",
   "admin.ldap.nicknameAttrEx": "예시 \"nickname\"",
   "admin.ldap.nicknameAttrTitle": "별명 속성:",
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance 는 엔터프라이즈 에디션의 기능입니다. 현재 라이센스는 Compliance 기능을 지원하지 않습니다. <a href=\"http://mattermost.com\" target=\"_blank\">이 곳</a>에서 엔터프라이즈 라이센스에 대한 정보를 확인하세요.</p>",
-  "admin.ldap.portDesc": "Mettermost가 AD/LDAP서버에 연결할 때 사용될 포트 값입니다. 기본값은 389입니다.",
-  "admin.ldap.portEx": "E.g.: \"389\"",
+  "admin.ldap.portDesc": "Mettermost가 AD/LDAP서버에 연결할 때 사용될 포트입니다. 기본값은 389입니다.",
+  "admin.ldap.portEx": "예시 \"389\"",
   "admin.ldap.portTitle": "AD/LDAP 포트:",
   "admin.ldap.queryDesc": "AD/LDAP서버 조회를 할때 사용되는 timeout 값입니다.. 만양 느린 AD/LDAP 서버에 의해 timout 에러가 발생한다면 증가시키십시오.",
-  "admin.ldap.queryEx": "E.g.: \"60\"",
+  "admin.ldap.queryEx": "예시 \"60\"",
   "admin.ldap.queryTitle": "Query Timeout (초):",
   "admin.ldap.serverDesc": "LDAP 서버의 도메인 또는 IP 주소",
-  "admin.ldap.serverEx": "Ex \"10.0.0.23\"",
+  "admin.ldap.serverEx": "예시 \"10.0.0.23\"",
   "admin.ldap.serverTitle": "AD/LDAP 서버:",
-  "admin.ldap.skipCertificateVerification": "Skip Certificate Verification",
+  "admin.ldap.skipCertificateVerification": "인증서 검증 생략",
   "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
   "admin.ldap.syncFailure": "동기화 실패: {error}",
   "admin.ldap.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
@@ -479,10 +485,10 @@
   "admin.log.formatMessage": "메시지",
   "admin.log.formatPlaceholder": "Enter your file format",
   "admin.log.formatSource": "Source",
-  "admin.log.formatTime": "Time (15:04:05 MST)",
-  "admin.log.formatTitle": "File Log Format:",
+  "admin.log.formatTime": "시간 (15:04:05 MST)",
+  "admin.log.formatTitle": "파일 로그 포맷:",
   "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
-  "admin.log.levelTitle": "Console Log Level:",
+  "admin.log.levelTitle": "콘솔 로그 레벨:",
   "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
   "admin.log.locationPlaceholder": "파일 위치를 지정하세요.",
   "admin.log.locationTitle": "파일 로그 경로:",
@@ -499,51 +505,51 @@
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
-  "admin.oauth.office365": "Office 365 (Beta)",
+  "admin.oauth.office365": "Office 365 (베타)",
   "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <a href=\"https://docs.mattermost.com/developer/oauth-2-0-applications.html\">documentation</a> to learn more.",
-  "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
+  "admin.oauth.providerTitle": "OAuth 2.0 서비스 제공자: ",
   "admin.oauth.select": "Select OAuth 2.0 service provider:",
   "admin.office365.EnableHtmlDesc": "<ol><li>여러분의 마이크로소프트 또는 오피스 365 계정에 <a href='https://login.microsoftonline.com/'>로그인</a> 하십시요. 로그인하는 계정은 <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>테넌트</a>의 >계정과 동일해야 합니다.</li><li><a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>을 방문하셔서, <strong>Go to app list</strong>의 <strong>Add an app</strong>를 클릭한 다음 \"Mattermost - 여러분의 회사 이름\"을 <strong>어플리케이션 이름</strong>으로 사용하십시요. </li><li><strong>Application Secrets</strong>에서, <strong>Generate New Password</strong>를 클릭한 다음 아래<strong>Application Secret Password</strong> 필드에 그 값을 복사하여 붙여넣으십시요.</li><li><strong>Platforms</strong>에서, <strong>Add Platform</strong>을 클릭한 다음, <strong>Web</strong>을 선택하고 <strong>your-mattermost-url/signup/office365/complete</strong> (예시: http://localhost:8065/signup/office365/complete)을 <strong>Redirect URIs</strong>에 기입하십시요. 또한 <strong>Allow Implicit Flow</strong>의 체크를 해제하십시요.</li><li>마지막으로, <strong>Save</strong>를 클릭한 다음 아래의 <strong>Application ID</strong>붙여넣으십시요.</li></ol>",
   "admin.office365.authTitle": "인증 엔드포인트:",
   "admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
-  "admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
+  "admin.office365.clientIdExample": "예시 \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
   "admin.office365.clientIdTitle": "애플리케이션 ID:",
   "admin.office365.clientSecretDescription": "The Application Secret Password you generated when registering your application with Microsoft.",
-  "admin.office365.clientSecretExample": "Ex \"shAieM47sNBfgl20f8ci294\"",
-  "admin.office365.clientSecretTitle": "Application Secret Password:",
-  "admin.office365.tokenTitle": "Token 엔드포인트:",
+  "admin.office365.clientSecretExample": "예시 \"shAieM47sNBfgl20f8ci294\"",
+  "admin.office365.clientSecretTitle": "애플리케이션 시크릿 패스워드:",
+  "admin.office365.tokenTitle": "토큰 엔드포인트:",
   "admin.office365.userTitle": "사용자 API 엔드포인트:",
   "admin.password.lowercase": "At least one lowercase letter",
-  "admin.password.minimumLength": "Minimum Password Length:",
+  "admin.password.minimumLength": "패스워드 최소 길이:",
   "admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.",
-  "admin.password.minimumLengthExample": "E.g.: \"5\"",
+  "admin.password.minimumLengthExample": "예시 \"5\"",
   "admin.password.number": "At least one number",
   "admin.password.preview": "Error message preview",
   "admin.password.requirements": "Password Requirements:",
   "admin.password.requirementsDescription": "Character types required in a valid password.",
-  "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
+  "admin.password.symbol": "At least one symbol (예시 \"~!@#$%^&*()\")",
   "admin.password.uppercase": "At least one uppercase letter",
   "admin.privacy.showEmailDescription": "When false, hides email address of users from other users in the user interface, including team owners and team administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.",
-  "admin.privacy.showEmailTitle": "Show Email Address: ",
+  "admin.privacy.showEmailTitle": "이메일 표시: ",
   "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and team administrators. Username is shown in place of full name.",
-  "admin.privacy.showFullNameTitle": "Show Full Name: ",
+  "admin.privacy.showFullNameTitle": "본명 표시: ",
   "admin.rate.enableLimiterDescription": "활성화하면 API 호출이 아래에 설정된 속도로 조절됩니다.",
   "admin.rate.enableLimiterTitle": "Enable Rate Limiting: ",
   "admin.rate.httpHeaderDescription": "When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to \"X-Real-IP\", when configuring AmazonELB set to \"X-Forwarded-For\").",
-  "admin.rate.httpHeaderExample": "Ex \"X-Real-IP\", \"X-Forwarded-For\"",
+  "admin.rate.httpHeaderExample": "예시 \"X-Real-IP\", \"X-Forwarded-For\"",
   "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header",
   "admin.rate.maxBurst": "Maximum Burst Size:",
   "admin.rate.maxBurstDescription": "Maximum number of requests allowed beyond the per second query limit.",
-  "admin.rate.maxBurstExample": "E.g.: \"100\"",
+  "admin.rate.maxBurstExample": "예시 \"100\"",
   "admin.rate.memoryDescription": "Maximum number of users sessions connected to the system as determined by \"Vary rate limit by remote address\" and \"Vary rate limit by HTTP header\" settings below.",
-  "admin.rate.memoryExample": "E.g.: \"10000\"",
+  "admin.rate.memoryExample": "예시 \"10000\"",
   "admin.rate.memoryTitle": "Memory Store Size:",
   "admin.rate.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
   "admin.rate.noteTitle": "Note:",
   "admin.rate.queriesDescription": "설정된 값만큼 초당 API 호출을 조절합니다.",
-  "admin.rate.queriesExample": "E.g.: \"10\"",
+  "admin.rate.queriesExample": "예시 \"10\"",
   "admin.rate.queriesTitle": "Maximum Queries per Second:",
-  "admin.rate.remoteDescription": "true로 설정하면, IP 주소에 따라 API 호출 속도를 조절합니다.",
+  "admin.rate.remoteDescription": "활성화하면 IP 주소에 따라 API 호출 속도를 조절합니다.",
   "admin.rate.remoteTitle": "Vary rate limit by remote address: ",
   "admin.rate.title": "Rate Limit Settings",
   "admin.recycle.button": "Recycle Database Connections",
@@ -556,46 +562,46 @@
   "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.",
   "admin.reload.reloadFail": "연결을 실패했습니다: {error}",
   "admin.reset_password.close": "닫기",
-  "admin.reset_password.newPassword": "새 비밀번호",
+  "admin.reset_password.newPassword": "새 패스워드",
   "admin.reset_password.select": "선택",
   "admin.reset_password.submit": "최소 {chars}글자 이상 입력하세요.",
-  "admin.reset_password.titleReset": "Reset Password",
-  "admin.reset_password.titleSwitch": "Switch Account to Email/Password",
+  "admin.reset_password.titleReset": "패스워드 리셋",
+  "admin.reset_password.titleSwitch": "이메일과 패스워드를 사용하도록 변경",
   "admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.",
-  "admin.saml.assertionConsumerServiceURLEx": "Ex \"https://<your-mattermost-url>/login/sso/saml\"",
+  "admin.saml.assertionConsumerServiceURLEx": "예시 \"https://<your-mattermost-url>/login/sso/saml\"",
   "admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:",
   "admin.saml.bannerDesc": "If a user attribute changes on the SAML server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.",
   "admin.saml.emailAttrDesc": "The attribute in the SAML Assertion that will be used to populate the email addresses of users in Mattermost.",
-  "admin.saml.emailAttrEx": "Ex \"Email\" or \"PrimaryEmail\"",
-  "admin.saml.emailAttrTitle": "Email Attribute:",
+  "admin.saml.emailAttrEx": "예시 \"Email\" 또는 \"PrimaryEmail\"",
+  "admin.saml.emailAttrTitle": "이메일 속성:",
   "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.",
-  "admin.saml.enableTitle": "Enable Login With SAML:",
+  "admin.saml.enableTitle": "SAML 계정으로 인증:",
   "admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.",
-  "admin.saml.encryptTitle": "Enable Encryption:",
+  "admin.saml.encryptTitle": "암호화:",
   "admin.saml.firstnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the nickname of users in Mattermost.",
-  "admin.saml.firstnameAttrEx": "Ex \"FirstName\"",
-  "admin.saml.firstnameAttrTitle": "First Name Attribute:",
+  "admin.saml.firstnameAttrEx": "예시 \"FirstName\"",
+  "admin.saml.firstnameAttrTitle": "이름 속성:",
   "admin.saml.idpCertificateFileDesc": "The public authentication certificate issued by your Identity Provider.",
   "admin.saml.idpCertificateFileRemoveDesc": "Remove the public authentication certificate issued by your Identity Provider.",
   "admin.saml.idpCertificateFileTitle": "Identity Provider Public Certificate:",
   "admin.saml.idpDescriptorUrlDesc": "The issuer URL for the Identity Provider you use for SAML requests.",
-  "admin.saml.idpDescriptorUrlEx": "Ex \"https://idp.example.org/SAML2/issuer\"",
+  "admin.saml.idpDescriptorUrlEx": "예시 \"https://idp.example.org/SAML2/issuer\"",
   "admin.saml.idpDescriptorUrlTitle": "Identity Provider Issuer URL:",
   "admin.saml.idpUrlDesc": "The URL where Mattermost sends a SAML request to start login sequence.",
-  "admin.saml.idpUrlEx": "Ex \"https://idp.example.org/SAML2/SSO/Login\"",
+  "admin.saml.idpUrlEx": "예시 \"https://idp.example.org/SAML2/SSO/Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
   "admin.saml.lastnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the language of users in Mattermost.",
-  "admin.saml.lastnameAttrEx": "Ex \"LastName\"",
-  "admin.saml.lastnameAttrTitle": "Last Name Attribute:",
+  "admin.saml.lastnameAttrEx": "예시 \"LastName\"",
+  "admin.saml.lastnameAttrTitle": "성 속성:",
   "admin.saml.localeAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the language of users in Mattermost.",
-  "admin.saml.localeAttrEx": "Ex \"Locale\" or \"PrimaryLanguage\"",
+  "admin.saml.localeAttrEx": "예시 \"Locale\" 또는 \"PrimaryLanguage\"",
   "admin.saml.localeAttrTitle": "Preferred Language Attribute:",
   "admin.saml.loginButtonTextDesc": "(Optional) The text that appears in the login button on the login page. Defaults to \"With SAML\".",
-  "admin.saml.loginButtonTextEx": "Ex \"With OKTA\"",
-  "admin.saml.loginButtonTextTitle": "Login Button Text:",
+  "admin.saml.loginButtonTextEx": "예시 \"With OKTA\"",
+  "admin.saml.loginButtonTextTitle": "로그인 버튼 문구:",
   "admin.saml.nicknameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the nickname of users in Mattermost.",
-  "admin.saml.nicknameAttrEx": "Ex \"Nickname\"",
-  "admin.saml.nicknameAttrTitle": "Nickname Attribute:",
+  "admin.saml.nicknameAttrEx": "예시 \"Nickname\"",
+  "admin.saml.nicknameAttrTitle": "별명 속성:",
   "admin.saml.privateKeyFileFileDesc": "The private key used to decrypt SAML Assertions from the Identity Provider.",
   "admin.saml.privateKeyFileFileRemoveDesc": "Remove the private key used to decrypt SAML Assertions from the Identity Provider.",
   "admin.saml.privateKeyFileTitle": "Service Provider Private Key:",
@@ -610,16 +616,16 @@
   "admin.saml.uploading.certificate": "Uploading Certificate...",
   "admin.saml.uploading.privateKey": "Uploading Private Key...",
   "admin.saml.usernameAttrDesc": "The attribute in the SAML Assertion that will be used to populate the username field in Mattermost.",
-  "admin.saml.usernameAttrEx": "Ex \"Username\"",
-  "admin.saml.usernameAttrTitle": "Username Attribute:",
+  "admin.saml.usernameAttrEx": "예시 \"Username\"",
+  "admin.saml.usernameAttrTitle": "사용자명 속성:",
   "admin.saml.verifyDescription": "When true, Mattermost verifies that the signature sent from the SAML Response matches the Service Provider Login URL",
-  "admin.saml.verifyTitle": "Verify Signature:",
+  "admin.saml.verifyTitle": "시그니처 검증:",
   "admin.save": "저장",
   "admin.saving": "설정 저장 중...",
   "admin.security.connection": "연결",
   "admin.security.inviteSalt.disabled": "Invite salt cannot be changed while sending emails is disabled.",
   "admin.security.login": "로그인",
-  "admin.security.password": "비밀번호",
+  "admin.security.password": "패스워드",
   "admin.security.passwordResetSalt.disabled": "Password reset salt cannot be changed while sending emails is disabled.",
   "admin.security.public_links": "공개 링크",
   "admin.security.requireEmailVerification.disabled": "Email verification cannot be changed while sending emails is disabled.",
@@ -629,17 +635,19 @@
   "admin.select_team.select": "선택",
   "admin.select_team.selectTeam": "팀 선택",
   "admin.service.attemptDescription": "Number of login attempts allowed before a user is locked out and required to reset their password via email.",
-  "admin.service.attemptExample": "E.g.: \"10\"",
-  "admin.service.attemptTitle": "Maximum Login Attempts:",
+  "admin.service.attemptExample": "예시 \"10\"",
+  "admin.service.attemptTitle": "최대 로그인 시도:",
   "admin.service.cmdsDesc": "When true, custom slash commands will be allowed. See <a href='http://docs.mattermost.com/developer/slash-commands.html' target='_blank'>documentation</a> to learn more.",
-  "admin.service.cmdsTitle": "사용자 정의 슬래시 명령어 활성화: ",
+  "admin.service.cmdsTitle": "커스텀 명령어: ",
   "admin.service.corsDescription": "Enable HTTP Cross origin request from a specific domain. Use \"*\" if you want to allow CORS from any domain or leave it blank to disable it.",
   "admin.service.corsEx": "http://example.com",
-  "admin.service.corsTitle": "Enable cross-origin requests from:",
+  "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": "Enable Developer Mode: ",
+  "admin.service.developerTitle": "개발자 모드: ",
+  "admin.service.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> for instructions on how to obtain a key.",
-  "admin.service.googleExample": "Ex \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
+  "admin.service.googleExample": "예시 \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
   "admin.service.iconDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.",
   "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
@@ -647,48 +655,60 @@
   "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
   "admin.service.integrationAdmin": "Restrict managing integrations to Admins:",
   "admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Listen Address:",
   "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" to allow Mattermost to bind to well-known ports.",
-  "admin.service.listenExample": "E.g.: \":8065\"",
+  "admin.service.listenExample": "예시 \":8065\"",
   "admin.service.mfaDesc": "When true, users will be given the option to add multi-factor authentication to their account. They will need a smartphone and an authenticator app such as Google Authenticator.",
   "admin.service.mfaTitle": "Enable Multi-factor Authentication:",
   "admin.service.mobileSessionDays": "Session length for mobile apps (days):",
   "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed. See <a href='http://docs.mattermost.com/developer/webhooks-outgoing.html' target='_blank'>documentation</a> to learn more.",
-  "admin.service.outWebhooksTitle": "Outgoing webhook 허용: ",
+  "admin.service.outWebhooksTitle": "Outgoing Webhook: ",
   "admin.service.overrideDescription": "When true, webhooks, slash commands and other integrations, such as <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.",
   "admin.service.overrideTitle": "Enable integrations to override usernames:",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.",
-  "admin.service.securityTitle": "Enable Security Alerts: ",
+  "admin.service.securityTitle": "보안 경고: ",
   "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
-  "admin.service.segmentExample": "Ex \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
+  "admin.service.segmentExample": "예시 \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Segment Write Key:",
-  "admin.service.sessionCache": "Session Cache (minutes):",
+  "admin.service.sessionCache": "세션 캐시 (분):",
   "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
-  "admin.service.sessionDaysEx": "E.g.: \"30\"",
-  "admin.service.siteURL": "Site URL:",
+  "admin.service.sessionDaysEx": "예시 \"30\"",
+  "admin.service.siteURL": "사이트 URL:",
   "admin.service.siteURLDescription": "The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.",
-  "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"",
+  "admin.service.siteURLExample": "예시 \"https://mattermost.example.com:1234\"",
   "admin.service.ssoSessionDays": "Session length for mobile apps (days):",
   "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.",
-  "admin.service.testingDescription": "(개발자 옵션) true로 설정하면, /loadtest 슬래시 명령을 사용할 수 있습니다. 이 명령을 사용하여 테스트를 위한 계정과 데이터를 불러들일 수 있습니다. 이 설정이 적용되려면 서버를 재시작해야 합니다.",
-  "admin.service.testingTitle": "Enable Testing Commands: ",
+  "admin.service.testingDescription": "(개발자 옵션) 활성화하면 /loadtest 명령어를 사용하여 테스트를 위한 계정과 데이터를 불러들일 수 있습니다. 이 설정이 적용되려면 서버를 재시작해야 합니다.",
+  "admin.service.testingTitle": "테스트 명령어: ",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "Session length LDAP and email (days):",
   "admin.service.webSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.",
   "admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentation</a> to learn more.",
-  "admin.service.webhooksTitle": "Incoming webhook 허용: ",
+  "admin.service.webhooksTitle": "Incoming Webhook: ",
+  "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": "고급",
-  "admin.sidebar.audits": "감사",
+  "admin.sidebar.audits": "활동",
   "admin.sidebar.authentication": "인증",
-  "admin.sidebar.cluster": "High Availability (Beta)",
-  "admin.sidebar.compliance": "Compliance",
+  "admin.sidebar.cluster": "고가용성 (베타)",
+  "admin.sidebar.compliance": "감사",
   "admin.sidebar.configuration": "환경설정",
   "admin.sidebar.connections": "연결",
-  "admin.sidebar.customBrand": "사용자 정의 브랜딩",
-  "admin.sidebar.customEmoji": "사용자 정의 이모티콘",
-  "admin.sidebar.customIntegrations": "Custom Integrations",
-  "admin.sidebar.customization": "사용자 정의",
+  "admin.sidebar.customBrand": "커스텀 브랜딩",
+  "admin.sidebar.customEmoji": "커스텀 이모티콘",
+  "admin.sidebar.customIntegrations": "통합 기능",
+  "admin.sidebar.customization": "커스터마이징",
   "admin.sidebar.database": "데이터베이스",
   "admin.sidebar.developer": "개발자 설정",
   "admin.sidebar.email": "이메일",
@@ -709,7 +729,7 @@
   "admin.sidebar.notifications": "알림",
   "admin.sidebar.oauth": "OAuth 2.0",
   "admin.sidebar.other": "기타",
-  "admin.sidebar.password": "비밀번호",
+  "admin.sidebar.password": "패스워드",
   "admin.sidebar.policy": "정책",
   "admin.sidebar.privacy": "개인",
   "admin.sidebar.publicLinks": "공개 링크",
@@ -723,31 +743,31 @@
   "admin.sidebar.settings": "설정",
   "admin.sidebar.signUp": "가입",
   "admin.sidebar.sign_up": "가입",
-  "admin.sidebar.statistics": "팀 통계",
+  "admin.sidebar.statistics": "통계",
   "admin.sidebar.storage": "저장소",
   "admin.sidebar.support": "지원",
   "admin.sidebar.teams": "팀 ({count, number})",
   "admin.sidebar.users": "사용자",
   "admin.sidebar.usersAndTeams": "팀과 사용자",
   "admin.sidebar.view_statistics": "사이트 통계",
-  "admin.sidebar.webrtc": "WebRTC (Beta)",
+  "admin.sidebar.webrtc": "WebRTC (베타)",
   "admin.sidebarHeader.systemConsole": "관리자 도구",
   "admin.sql.dataSource": "Data Source:",
   "admin.sql.driverName": "Driver Name:",
   "admin.sql.keyDescription": "32-character salt available to encrypt and decrypt sensitive fields in database.",
-  "admin.sql.keyExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
+  "admin.sql.keyExample": "예시 \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.sql.keyTitle": "At Rest Encrypt Key:",
   "admin.sql.maxConnectionsDescription": "Maximum number of idle connections held open to the database.",
-  "admin.sql.maxConnectionsExample": "E.g.: \"10\"",
+  "admin.sql.maxConnectionsExample": "예시 \"10\"",
   "admin.sql.maxConnectionsTitle": "Maximum Idle Connections:",
   "admin.sql.maxOpenDescription": "Maximum number of open connections held open to the database.",
-  "admin.sql.maxOpenExample": "E.g.: \"10\"",
+  "admin.sql.maxOpenExample": "예시 \"10\"",
   "admin.sql.maxOpenTitle": "Maximum Open Connections:",
   "admin.sql.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
   "admin.sql.noteTitle": "Note:",
   "admin.sql.replicas": "Data Source Replicas:",
   "admin.sql.traceDescription": "(Development Mode) When true, executing SQL statements are written to the log.",
-  "admin.sql.traceTitle": "Trace: ",
+  "admin.sql.traceTitle": "추적: ",
   "admin.sql.warning": "Warning: regenerating this salt may cause some columns in the database to return empty results.",
   "admin.support.aboutDesc": "Link to About page for more information on your Mattermost deployment, for example its purpose and audience within your organization. Defaults to Mattermost information page.",
   "admin.support.aboutTitle": "About link:",
@@ -763,56 +783,56 @@
   "admin.support.problemTitle": "Report a Problem link:",
   "admin.support.termsDesc": "Link to the terms under which users may use your online service. By default, this includes the \"Mattermost Conditions of Use (End Users)\" explaining the terms under which Mattermost software is provided to end users. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Conditions of Use (End User) for Mattermost software.",
   "admin.support.termsTitle": "Terms of Service link:",
-  "admin.system_analytics.activeUsers": "Active Users With Posts",
+  "admin.system_analytics.activeUsers": "활성 사용자(글 작성 기준)",
   "admin.system_analytics.title": "the System",
-  "admin.system_analytics.totalPosts": "Total Posts",
+  "admin.system_analytics.totalPosts": "전체 글",
   "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": "모든 팀 커뮤니케이션을 한 곳에서 확인하고, 검색하고, 접근할 수 있습니다.",
   "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.",
-  "admin.team.brandDescriptionTitle": "Site Description",
-  "admin.team.brandImageTitle": "Custom Brand Image:",
+  "admin.team.brandDescriptionTitle": "사이트 설명",
+  "admin.team.brandImageTitle": "브랜드 이미지:",
   "admin.team.brandTextDescription": "Text that will appear below your custom brand image on your login screen. Supports Markdown-formatted text. Maximum 500 characters allowed.",
-  "admin.team.brandTextTitle": "Custom Brand Text:",
-  "admin.team.brandTitle": "Enable Custom Branding: ",
-  "admin.team.chooseImage": "Choose New Image",
+  "admin.team.brandTextTitle": "브랜드 문구:",
+  "admin.team.brandTitle": "커스텀 브랜딩: ",
+  "admin.team.chooseImage": "이미지 선택",
   "admin.team.dirDesc": "When true, teams that are configured to show in team directory will show on main page inplace of creating a new team.",
   "admin.team.dirTitle": "Enable Team Directory: ",
   "admin.team.maxChannelsDescription": "Maximum total number of users per team, including both active and inactive users.",
-  "admin.team.maxChannelsExample": "Ex \"100\"",
-  "admin.team.maxChannelsTitle": "팀 당 최대 채널",
+  "admin.team.maxChannelsExample": "예시 \"100\"",
+  "admin.team.maxChannelsTitle": "팀 당 최대 채널: ",
   "admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.",
-  "admin.team.maxUsersExample": "E.g.: \"25\"",
-  "admin.team.maxUsersTitle": "Max Users Per Team:",
+  "admin.team.maxUsersExample": "예시 \"25\"",
+  "admin.team.maxUsersTitle": "팀 최대 인원:",
   "admin.team.noBrandImage": "브랜드 이미지가 업로드되지 않았습니다.",
   "admin.team.openServerDescription": "When true, anyone can signup for a user account on this server without the need to be invited.",
-  "admin.team.openServerTitle": "Enable Open Server: ",
+  "admin.team.openServerTitle": "공개 서버: ",
   "admin.team.restrictDescription": "Teams and user accounts can only be created from a specific domain (e.g. \"mattermost.org\") or list of comma-separated domains (e.g. \"corp.mattermost.com, mattermost.org\").",
   "admin.team.restrictDirectMessage": "Enable users to open Direct Message channels with:",
   "admin.team.restrictDirectMessageDesc": "'Any user on the Mattermost server' enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. 'Any member of the team' limits the ability to open Direct Message channels to only users who are in the same team.",
-  "admin.team.restrictExample": "Ex \"corp.mattermost.com, mattermost.org\"",
+  "admin.team.restrictExample": "예시 \"corp.mattermost.com, mattermost.org\"",
   "admin.team.restrictNameDesc": "When true, You cannot create a team name with reserved words like www, admin, support, test, channel, etc",
-  "admin.team.restrictNameTitle": "Restrict Team Names: ",
+  "admin.team.restrictNameTitle": "팀 이름 제한: ",
   "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
   "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
-  "admin.team.siteNameExample": "예: \"Mattermost\"",
+  "admin.team.siteNameExample": "예시 \"Mattermost\"",
   "admin.team.siteNameTitle": "사이트 이름:",
   "admin.team.teamCreationDescription": "When false, only System Administrators can create teams.",
-  "admin.team.teamCreationTitle": "Enable Team Creation: ",
-  "admin.team.upload": "Upload",
+  "admin.team.teamCreationTitle": "팀 생성: ",
+  "admin.team.upload": "업로드",
   "admin.team.uploadDesc": "Customize your user experience by adding a custom image to your login screen. Recommended maximum image size is less than 2 MB.",
-  "admin.team.uploaded": "Uploaded!",
-  "admin.team.uploading": "Uploading..",
+  "admin.team.uploaded": "업로드 완료!",
+  "admin.team.uploading": "업로드 중..",
   "admin.team.userCreationDescription": "When false, the ability to create accounts is disabled. The create account button displays error when pressed.",
-  "admin.team.userCreationTitle": "Enable Account Creation: ",
-  "admin.team_analytics.activeUsers": "Active Users With Posts",
-  "admin.team_analytics.totalPosts": "Total Posts",
+  "admin.team.userCreationTitle": "계정 생성: ",
+  "admin.team_analytics.activeUsers": "활성 사용자(글 작성 기준)",
+  "admin.team_analytics.totalPosts": "전체 글",
   "admin.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.authServiceEmail": ", <strong>인증 방식:</strong> 이메일",
+  "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.",
   "admin.user_item.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
   "admin.user_item.confirmDemotion": "Confirm Demotion",
@@ -821,73 +841,73 @@
   "admin.user_item.inactive": "비활성화",
   "admin.user_item.makeActive": "활성화",
   "admin.user_item.makeInactive": "비활성화",
-  "admin.user_item.makeMember": "Make Member",
-  "admin.user_item.makeSysAdmin": "Make System Admin",
-  "admin.user_item.makeTeamAdmin": "Make Team Admin",
+  "admin.user_item.makeMember": "회원으로 변경",
+  "admin.user_item.makeSysAdmin": "시스템 관리자로 변경",
+  "admin.user_item.makeTeamAdmin": "팀 관리자로 변경",
   "admin.user_item.member": "회원",
-  "admin.user_item.mfaNo": ", <strong>MFA</strong>: No",
-  "admin.user_item.mfaYes": ", <strong>MFA</strong>: Yes",
-  "admin.user_item.resetMfa": "Remove MFA",
-  "admin.user_item.resetPwd": "Reset Password",
-  "admin.user_item.switchToEmail": "Switch to Email/Password",
+  "admin.user_item.mfaNo": ", <strong>MFA</strong>: 아니요",
+  "admin.user_item.mfaYes": ", <strong>MFA</strong>: 예",
+  "admin.user_item.resetMfa": "MFA 제거",
+  "admin.user_item.resetPwd": "패스워드 리셋",
+  "admin.user_item.switchToEmail": "이메일/패스워드로 변경",
   "admin.user_item.sysAdmin": "시스템 관리자",
   "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": "Enable Mattermost WebRTC: ",
+  "admin.webrtc.enableTitle": "Mattermost WebRTC: ",
   "admin.webrtc.gatewayAdminSecretDescription": "Enter your admin secret password to access the Gateway Admin URL.",
-  "admin.webrtc.gatewayAdminSecretExample": "E.g.: \"PVRzWNN1Tg6szn7IQWvhpAvLByScWxdy\"",
+  "admin.webrtc.gatewayAdminSecretExample": "예시 \"PVRzWNN1Tg6szn7IQWvhpAvLByScWxdy\"",
   "admin.webrtc.gatewayAdminSecretTitle": "Gateway Admin Secret:",
   "admin.webrtc.gatewayAdminUrlDescription": "Enter https://<mattermost-webrtc-gateway-url>:<port>/admin. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. Mattermost WebRTC uses this URL to obtain valid tokens for each peer to establish the connection.",
-  "admin.webrtc.gatewayAdminUrlExample": "E.g.: \"https://webrtc.mattermost.com:7089/admin\"",
+  "admin.webrtc.gatewayAdminUrlExample": "예시 \"https://webrtc.mattermost.com:7089/admin\"",
   "admin.webrtc.gatewayAdminUrlTitle": "Gateway Admin URL:",
   "admin.webrtc.gatewayWebsocketUrlDescription": "Enter wss://<mattermost-webrtc-gateway-url>:<port>. Make sure you use WS or WSS in your URL depending on your server configuration. This is the websocket used to signal and establish communication between the peers.",
-  "admin.webrtc.gatewayWebsocketUrlExample": "E.g.: \"wss://webrtc.mattermost.com:8189\"",
+  "admin.webrtc.gatewayWebsocketUrlExample": "예시 \"wss://webrtc.mattermost.com:8189\"",
   "admin.webrtc.gatewayWebsocketUrlTitle": "Gateway Websocket URL:",
   "admin.webrtc.stunUriDescription": "Enter your STUN URI as stun:<your-stun-url>:<port>. STUN is a standardized network protocol to allow an end host to assist devices to access its public IP address if it is located behind a NAT.",
-  "admin.webrtc.stunUriExample": "E.g.: \"stun:webrtc.mattermost.com:5349\"",
+  "admin.webrtc.stunUriExample": "예시 \"stun:webrtc.mattermost.com:5349\"",
   "admin.webrtc.stunUriTitle": "STUN URI",
   "admin.webrtc.turnSharedKeyDescription": "Enter your TURN Server Shared Key. This is used to created dynamic passwords to establish the connection. Each password is valid for a short period of time.",
-  "admin.webrtc.turnSharedKeyExample": "E.g.: \"bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg=\"",
+  "admin.webrtc.turnSharedKeyExample": "예시 \"bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg=\"",
   "admin.webrtc.turnSharedKeyTitle": "TURN Shared Key:",
   "admin.webrtc.turnUriDescription": "Enter your TURN URI as turn:<your-turn-url>:<port>. TURN is a standardized network protocol to allow an end host to assist devices to establish a connection by using a relay public IP address if it is located behind a symmetric NAT.",
-  "admin.webrtc.turnUriExample": "E.g.: \"turn:webrtc.mattermost.com:5349\"",
+  "admin.webrtc.turnUriExample": "예시 \"turn:webrtc.mattermost.com:5349\"",
   "admin.webrtc.turnUriTitle": "TURN URI",
   "admin.webrtc.turnUsernameDescription": "Enter your TURN Server Username.",
-  "admin.webrtc.turnUsernameExample": "Ex \"Username\"",
+  "admin.webrtc.turnUsernameExample": "예시 \"Username\"",
   "admin.webrtc.turnUsernameTitle": "TURN Username:",
   "admin.webserverModeDisabled": "Disabled",
   "admin.webserverModeDisabledDescription": "The Mattermost server will not serve static files.",
   "admin.webserverModeGzip": "gzip",
   "admin.webserverModeGzipDescription": "The Mattermost server will serve static files compressed with gzip.",
   "admin.webserverModeHelpText": "gzip compression applies to static content files. It is recommended to enable gzip to improve performance unless your environment has specific restrictions, such as a web proxy that distributes gzip files poorly. This setting requires a server restart to take effect.",
-  "admin.webserverModeTitle": "Webserver Mode:",
-  "admin.webserverModeUncompressed": "Uncompressed",
+  "admin.webserverModeTitle": "웹 서버 모드:",
+  "admin.webserverModeUncompressed": "압축하지 않음",
   "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
   "analytics.chart.loading": "로딩 중...",
   "analytics.chart.meaningful": "Not enough data for a meaningful representation.",
-  "analytics.system.activeUsers": "Active Users With Posts",
+  "analytics.system.activeUsers": "활성 사용자 (글 작성 기준)",
   "analytics.system.channelTypes": "Channel Types",
   "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
-  "analytics.system.postTypes": "Posts, Files and Hashtags",
+  "analytics.system.postTypes": "글, 파일, 해시태그",
   "analytics.system.privateGroups": "비공개 그룹",
   "analytics.system.publicChannels": "공개 채널",
-  "analytics.system.textPosts": "Posts with Text-only",
+  "analytics.system.textPosts": "텍스트 글 수",
   "analytics.system.title": "시스템 통계",
   "analytics.system.totalChannels": "전체 채널",
   "analytics.system.totalCommands": "전체 명령어",
-  "analytics.system.totalFilePosts": "Posts with Files",
-  "analytics.system.totalHashtagPosts": "Posts with Hashtags",
-  "analytics.system.totalIncomingWebhooks": "Incoming Webhook",
-  "analytics.system.totalMasterDbConnections": "Master DB Conns",
-  "analytics.system.totalOutgoingWebhooks": "Outgoing Webhook",
+  "analytics.system.totalFilePosts": "파일이 포함된 글 수",
+  "analytics.system.totalHashtagPosts": "해시태그가 포함된 글 수",
+  "analytics.system.totalIncomingWebhooks": "전체 Incoming Webhook",
+  "analytics.system.totalMasterDbConnections": "마스터 DB 연결",
+  "analytics.system.totalOutgoingWebhooks": "전체 Outgoing Webhook",
   "analytics.system.totalPosts": "전체 글",
-  "analytics.system.totalReadDbConnections": "Replica DB Conns",
+  "analytics.system.totalReadDbConnections": "레플리카 DB 연결",
   "analytics.system.totalSessions": "전체 세션",
   "analytics.system.totalTeams": "전체 팀",
   "analytics.system.totalUsers": "전체 사용자",
-  "analytics.system.totalWebsockets": "Websocket Conns",
-  "analytics.team.activeUsers": "Active Users With Posts",
+  "analytics.system.totalWebsockets": "웹소켓 연결",
+  "analytics.team.activeUsers": "활성 사용자 (글 작성 기준)",
   "analytics.team.newlyCreated": "Newly Created Users",
   "analytics.team.privateGroups": "비공개 그룹",
   "analytics.team.publicChannels": "공개 채널",
@@ -896,8 +916,8 @@
   "analytics.team.title": "{team} 팀 통계",
   "analytics.team.totalPosts": "전체 글",
   "analytics.team.totalUsers": "전체 사용자",
-  "audit_table.accountActive": "Account made active",
-  "audit_table.accountInactive": "Account made inactive",
+  "audit_table.accountActive": "계정이 활성화 됨",
+  "audit_table.accountInactive": "계정이 비활성화 됨",
   "audit_table.action": "활동",
   "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access",
   "audit_table.attemptedLicenseAdd": "Attempted to add new license",
@@ -915,7 +935,7 @@
   "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",
-  "audit_table.failedLogin": "FAILED login attempt",
+  "audit_table.failedLogin": "실패한 로그인 시도",
   "audit_table.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback",
   "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",
@@ -947,21 +967,22 @@
   "audit_table.updatePicture": "Updated your profile picture",
   "audit_table.updatedRol": "Updated user role(s) to ",
   "audit_table.userAdded": "Added {username} to the {channelName} channel/group",
-  "audit_table.userId": "User ID",
+  "audit_table.userId": "사용자 ID",
   "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",
+  "authorize.allow": "허용하기",
   "authorize.app": "The app <strong>{appName}</strong> would like the ability to access and modify your basic information.",
-  "authorize.deny": "Deny",
+  "authorize.deny": "차단하기",
   "authorize.title": "<strong>{appName}</strong> would like to connect to your <strong>Mattermost</strong> user account",
   "backstage_list.search": "검색",
   "backstage_navbar.backToMattermost": "{siteName}(으)로 돌아가기",
+  "backstage_sidebar.emoji": "커스텀 이모티콘",
   "backstage_sidebar.integrations": "통합 기능",
   "backstage_sidebar.integrations.commands": "슬래시 명령어",
-  "backstage_sidebar.integrations.incoming_webhooks": "Incoming Webhooks",
+  "backstage_sidebar.integrations.incoming_webhooks": "Incoming Webhook",
   "backstage_sidebar.integrations.oauthApps": "OAuth 2.0 애플리케이션",
-  "backstage_sidebar.integrations.outgoing_webhooks": "Outgoing Webhooks",
+  "backstage_sidebar.integrations.outgoing_webhooks": "Outgoing Webhook",
   "calling_screen": "Calling",
   "center_panel.recent": "Click here to jump to recent messages. ",
   "chanel_header.addMembers": "회원 추가",
@@ -971,6 +992,8 @@
   "change_url.longer": "Must be longer than two characters",
   "change_url.noUnderscore": "Can not contain two underscores in a row.",
   "change_url.startWithLetter": "Must start with a letter or number",
+  "channelHeader.addToFavorites": "즐겨찾기에 추가",
+  "channelHeader.removeFromFavorites": "즐겨찾기에서 제거",
   "channel_flow.alreadyExist": "이미 존재하는 채널 URL입니다.",
   "channel_flow.changeUrlDescription": "일부 URL로 사용할 수 없는 문자들은 제거될 수 있습니다.",
   "channel_flow.changeUrlTitle": "{term} URL 변경",
@@ -980,9 +1003,9 @@
   "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
   "channel_flow.invalidName": "잘못된 채널 이름",
   "channel_flow.set_url_title": "{term} URL 설정",
-  "channel_header.addToFavorites": "Add to Favorites",
+  "channel_header.addToFavorites": "즐겨찾기에 추가",
   "channel_header.channel": "채널",
-  "channel_header.channelHeader": "Edit Channel Header",
+  "channel_header.channelHeader": "채널 헤더 설정...",
   "channel_header.delete": "{term} 삭제...",
   "channel_header.flagged": "중요 메시지",
   "channel_header.group": "그룹",
@@ -990,13 +1013,14 @@
   "channel_header.manageMembers": "회원 관리",
   "channel_header.notificationPreferences": "알림 설정",
   "channel_header.recentMentions": "최근 멘션",
-  "channel_header.removeFromFavorites": "Remove from Favorites",
+  "channel_header.removeFromFavorites": "즐겨찾기에서 제거",
   "channel_header.rename": "{term}의 이름을 변경...",
-  "channel_header.setHeader": "Edit {term} Header",
-  "channel_header.setPurpose": "Edit {term} Purpose",
+  "channel_header.setHeader": "{term}의 헤더 설정...",
+  "channel_header.setPurpose": "{term}의 설명 설정...",
   "channel_header.viewInfo": "정보 보기",
   "channel_header.viewMembers": "회원 보기",
-  "channel_header.webrtc.call": "Start Video Call",
+  "channel_header.webrtc.call": "영상 통화 시작하기",
+  "channel_header.webrtc.offline": "사용자가 오프라인입니다",
   "channel_header.webrtc.unavailable": "New call unavailable until your existing call ends",
   "channel_info.about": "About",
   "channel_info.close": "닫기",
@@ -1033,7 +1057,7 @@
   "channel_modal.headerHelp": "{term} 상단 이름 옆에 표시될 텍스트를 입력하세요. 예를 들면, 다음과 같이 자주 사용되는 링크를 등록할 수 있습니다. [Link Title](http://example.com).",
   "channel_modal.modalTitle": "새로운 ",
   "channel_modal.name": "이름",
-  "channel_modal.nameEx": "예시: \"Bugs\", \"Marketing\", \"고객지원\"",
+  "channel_modal.nameEx": "예시: \"버그\", \"마케팅\", \"고객지원\"",
   "channel_modal.optional": "(선택사항)",
   "channel_modal.privateGroup1": "일부 회원만 접근할 수 있는 비공개 그룹을 만듭니다. ",
   "channel_modal.privateGroup2": "비공개 그룹 만들기",
@@ -1053,7 +1077,7 @@
   "channel_select.placeholder": "--- 채널을 선택하세요 ---",
   "channel_switch_modal.dm": "(개인 메시지)",
   "channel_switch_modal.help": "채널 이름을 입력하세요. ↑↓ 방향키와 TAB키를 이용하여 선택하세요, ↵ 엔터키를 누르면 확인, ESC키를 누르면 취소됩니다.",
-  "channel_switch_modal.not_found": "No matches found.",
+  "channel_switch_modal.not_found": "일치하는 채널이 없습니다.",
   "channel_switch_modal.submit": "변경",
   "channel_switch_modal.title": "채널 변경",
   "claim.account.noEmail": "No email specified",
@@ -1061,42 +1085,43 @@
   "claim.email_to_ldap.enterPwd": "Enter the password for your {site} email account",
   "claim.email_to_ldap.ldapId": "AD/LDAP ID",
   "claim.email_to_ldap.ldapIdError": "AD/LDAP ID를 입력하세요.",
-  "claim.email_to_ldap.ldapPasswordError": "LDAP 비밀번호를 입력하세요.",
-  "claim.email_to_ldap.ldapPwd": "LDAP 비밀번호",
-  "claim.email_to_ldap.pwd": "비밀번호",
-  "claim.email_to_ldap.pwdError": "비밀번호를 입력하세요.",
+  "claim.email_to_ldap.ldapPasswordError": "LDAP 패스워드를 입력하세요.",
+  "claim.email_to_ldap.ldapPwd": "LDAP 패스워드",
+  "claim.email_to_ldap.pwd": "패스워드",
+  "claim.email_to_ldap.pwdError": "패스워드를 입력하세요.",
   "claim.email_to_ldap.ssoNote": "You must already have a valid LDAP account",
   "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with LDAP",
   "claim.email_to_ldap.switchTo": "LDAP 계정으로 변경",
-  "claim.email_to_ldap.title": "이메일/비밀번호 계정을 LDAP 계정으로 변경",
+  "claim.email_to_ldap.title": "이메일/패스워드 계정을 LDAP 계정으로 변경",
   "claim.email_to_oauth.enterPwd": "Enter the password for your {site} account",
-  "claim.email_to_oauth.pwd": "비밀번호",
-  "claim.email_to_oauth.pwdError": "비밀번호를 입력하세요.",
+  "claim.email_to_oauth.pwd": "패스워드",
+  "claim.email_to_oauth.pwdError": "패스워드를 입력하세요.",
   "claim.email_to_oauth.ssoNote": "You must already have a valid {type} account",
   "claim.email_to_oauth.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
   "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
-  "claim.email_to_oauth.title": "이메일/비밀번호 계정을 {uiType} 계정으로 변경",
-  "claim.ldap_to_email.confirm": "비밀번호 확인",
+  "claim.email_to_oauth.title": "이메일/패스워드 계정을 {uiType} 계정으로 변경",
+  "claim.ldap_to_email.confirm": "패스워드 확인",
   "claim.ldap_to_email.email": "You will use the email {email} to login",
   "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account",
   "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
-  "claim.ldap_to_email.ldapPasswordError": "LDAP 비밀번호를 입력하세요.",
-  "claim.ldap_to_email.ldapPwd": "LDAP 비밀번호",
-  "claim.ldap_to_email.pwd": "비밀번호",
-  "claim.ldap_to_email.pwdError": "비밀번호를 입력하세요.",
-  "claim.ldap_to_email.pwdNotMatch": "비밀번호가 일치하지 않습니다.",
+  "claim.ldap_to_email.ldapPasswordError": "LDAP 패스워드를 입력하세요.",
+  "claim.ldap_to_email.ldapPwd": "LDAP 패스워드",
+  "claim.ldap_to_email.pwd": "패스워드",
+  "claim.ldap_to_email.pwdError": "패스워드를 입력하세요.",
+  "claim.ldap_to_email.pwdNotMatch": "패스워드가 일치하지 않습니다.",
   "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password",
-  "claim.oauth_to_email.confirm": "비밀번호 확인",
+  "claim.oauth_to_email.confirm": "패스워드 확인",
   "claim.oauth_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.",
   "claim.oauth_to_email.enterNewPwd": "Enter a new password for your {site} email account",
-  "claim.oauth_to_email.enterPwd": "비밀번호를 입력하세요.",
-  "claim.oauth_to_email.newPwd": "새로운 비밀번호",
-  "claim.oauth_to_email.pwdNotMatch": "비밀번호가 일치하지 않습니다.",
+  "claim.oauth_to_email.enterPwd": "패스워드를 입력하세요.",
+  "claim.oauth_to_email.newPwd": "새로운 패스워드",
+  "claim.oauth_to_email.pwdNotMatch": "패스워드가 일치하지 않습니다.",
   "claim.oauth_to_email.switchTo": "Switch {type} to email and password",
   "claim.oauth_to_email.title": "Switch {type} Account to Email",
   "confirm_modal.cancel": "취소",
+  "connecting_screen": "연결",
   "create_comment.addComment": "답글 달기...",
   "create_comment.comment": "답글 달기",
   "create_comment.commentLength": "답글의 길이는 {max}글자를 초과할 수 없습니다.",
@@ -1111,7 +1136,7 @@
   "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
   "create_team.display_name.back": "이전 단계로 돌아가기",
   "create_team.display_name.charLength": "Name must be 4 or more characters up to a maximum of 15",
-  "create_team.display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.",
+  "create_team.display_name.nameHelp": "팀 이름을 자유롭게 입력하세요. 설정한 팀 이름은 메뉴와 상단의 헤더에 표시됩니다.",
   "create_team.display_name.next": "다음",
   "create_team.display_name.required": "필수 항목입니다.",
   "create_team.display_name.teamName": "팀 이름",
@@ -1125,16 +1150,16 @@
   "create_team.team_url.taken": "URL이 이미 있거나 예약된 단어입니다.",
   "create_team.team_url.teamUrl": "팀 URL",
   "create_team.team_url.unavailable": "This URL is unavailable. Please try another.",
-  "create_team.team_url.webAddress": "Choose the web address of your new team:",
-  "custom_emoji.empty": "사용자 정의 이모티콘이 없습니다.",
-  "custom_emoji.header": "사용자 정의 이모티콘",
-  "custom_emoji.search": "사용자 정의 이모티콘 검색하기",
+  "create_team.team_url.webAddress": "팀의 웹 주소:",
+  "custom_emoji.empty": "커스텀 이모티콘이 없습니다.",
+  "custom_emoji.header": "커스텀 이모티콘",
+  "custom_emoji.search": "커스텀 이모티콘 검색",
   "delete_channel.cancel": "취소",
   "delete_channel.channel": "채널",
   "delete_channel.confirm": "채널 삭제 확인",
   "delete_channel.del": "삭제",
   "delete_channel.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_channel.question": "정말 {display_name} {term}을 삭제하시겠습니까?",
   "delete_post.cancel": "취소",
   "delete_post.comment": "답글",
   "delete_post.confirm": "{term} 삭제 확인",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "저장",
   "edit_channel_purpose_modal.title1": "설명 편집",
   "edit_channel_purpose_modal.title2": "설명 편집: ",
+  "edit_command.save": "Update",
   "edit_post.cancel": "취소",
   "edit_post.edit": "{title} 편집",
   "edit_post.editPost": "글 편집하기...",
@@ -1163,8 +1189,8 @@
   "email_signup.address": "이메일 주소",
   "email_signup.createTeam": "팀 만들기",
   "email_signup.emailError": "유효한 이메일 주소를 입력하세요.",
-  "email_signup.find": "나의 팀 찾기",
-  "email_verify.almost": "{siteName}: You are almost done",
+  "email_signup.find": "팀 찾기",
+  "email_verify.almost": "{siteName}: 거의 완료되었습니다.",
   "email_verify.failed": " 검증메일 발송을 실패했습니다.",
   "email_verify.notVerifiedBody": "Please verify your email address. Check your inbox for an email.",
   "email_verify.resend": "다시 보내기",
@@ -1173,17 +1199,18 @@
   "email_verify.verifiedBody": "<p>이메일 검증이 완료되었습니다! <a href={url}>여기</a>를 클릭하여 로그인하세요.</p>",
   "email_verify.verifyFailed": "이메일 검증을 실패했습니다.",
   "emoji_list.actions": "액션",
-  "emoji_list.add": "사용자 정의 이모티콘",
+  "emoji_list.add": "이모티콘 추가",
   "emoji_list.creator": "만든 사람",
   "emoji_list.delete": "삭제",
-  "emoji_list.empty": "사용자 정의 이모티콘이 없습니다.",
-  "emoji_list.help": "사용자 정의 이모티콘은 서버의 모두가 사용할 수 있습니다. 메시지 창에 ':'를 입력하여 이모티콘 선택 메뉴를 활성화 할 수 있습니다. 새로운 이모티콘을 등록하면 다른 사용자들은 사용하기 위해 페이지를 새로고침 해야할 수 있습니다.",
+  "emoji_list.empty": "커스텀 이모티콘이 없습니다.",
+  "emoji_list.header": "커스텀 이모티콘",
+  "emoji_list.help": "커스텀 이모티콘은 서버의 모두가 사용할 수 있습니다. 메시지 창에 ':'를 입력하여 이모티콘 선택 메뉴를 활성화 할 수 있습니다. 새로운 이모티콘을 등록하면 다른 사용자들은 사용하기 위해 페이지를 새로고침 해야할 수 있습니다.",
   "emoji_list.help2": "팁: 첫 글자로 #, ##, ### 를 입력하면 이모티콘을 더 크게 새로운 행에서 사용할 수 있습니다. '# :smile:'로 메시지를 보내 확인해보세요.",
   "emoji_list.image": "이미지",
   "emoji_list.name": "이름",
-  "emoji_list.search": "사용자 정의 이모티콘 검색하기",
+  "emoji_list.search": "커스텀 이모티콘 검색",
   "emoji_list.somebody": "다른 팀의 사용자",
-  "error.not_found.link_message": "Mattermost로 돌아가기",
+  "error.not_found.link_message": "Mattermost(으)로 돌아가기",
   "error.not_found.message": "The page you were trying to reach does not exist",
   "error.not_found.title": "페이지를 찾을 수 없습니다.",
   "error.not_supported.message": "비밀모드는 지원되지 않습니다.",
@@ -1207,9 +1234,10 @@
   "filtered_user_list.countTotal": "{total}명 중 {count}{count, plural, =0 {0명} one {명} other {명}}",
   "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.search": "Press enter to search",
+  "filtered_user_list.search": "ENTER 키를 눌러 검색",
+  "filtered_user_list.searchButton": "검색",
   "filtered_user_list.show": "필터:",
-  "filtered_user_list.team_only": "팀의 회원만",
+  "filtered_user_list.team_only": "팀의 회원",
   "find_team.email": "이메일",
   "find_team.findDescription": "An email was sent with links to any teams to which you are a member.",
   "find_team.findTitle": "팀 찾기",
@@ -1219,7 +1247,7 @@
   "find_team.submitError": "유효한 이메일 주소를 입력하세요.",
   "flag_post.flag": "중요 메시지로 지정",
   "flag_post.unflag": "중요 메시지 해제",
-  "general_tab.chooseName": "사용자 이름을 선택하세요.",
+  "general_tab.chooseName": "사용자명을 선택하세요.",
   "general_tab.codeDesc": "가입 링크를 변경하려면 '편집'을 클릭하세요.",
   "general_tab.codeLongDesc": "The Invite Code is used as part of the URL in the team invitation link created by <strong>Get Team Invite Link</strong> in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.",
   "general_tab.codeTitle": "가입 링크",
@@ -1250,9 +1278,9 @@
   "get_link.copy": "링크 복사",
   "get_post_link_modal.help": "아래 링크를 통해 허용된 사용자가 내 글을 볼 수 있습니다.",
   "get_post_link_modal.title": "바로가기 링크 복사",
-  "get_team_invite_link_modal.help": "아래 링크를 통해 팀에 가입할 수 있습니다. 팀 가입 링크는 여러 사람들에게 공유될 수 있고, 팀 관리자에 의해 변경될 수 있습니다.",
+  "get_team_invite_link_modal.help": "아래 링크를 통해 팀에 가입할 수 있습니다. 가입 링크는 여러 사람들에게 공유될 수 있고, 팀 관리자에 의해 변경될 수 있습니다.",
   "get_team_invite_link_modal.helpDisabled": "팀의 신규 사용자 가입이 비활성화 되어있습니다. 팀 관리자에게 문의하세요.",
-  "get_team_invite_link_modal.title": "팀 가입 링크",
+  "get_team_invite_link_modal.title": "가입 링크",
   "help.attaching.downloading": "#### Downloading Files\nDownload an attached file by clicking the download icon next to the file thumbnail or by opening the file previewer and clicking **Download**.",
   "help.attaching.dragdrop": "#### Drag and Drop\nUpload a file or selection of files by dragging the files from your computer into the RHS or center pane. Dragging and dropping attaches the files to the message input box, then you can optionally type a message and press **ENTER** to post.",
   "help.attaching.icon": "#### Attachment Icon\nAlternatively, upload files by clicking the grey paperclip icon inside the message input box. This opens up your system file viewer where you can navigate to the desired files and then click **Open** to upload the files to the message input box. Optionally type a message and then press **ENTER** to post.",
@@ -1265,20 +1293,20 @@
   "help.attaching.publicLinks2": "If **Get Public Link** is not visible in the file previewer and you prefer the feature enabled, you can request that your System Admin enable the feature from the System Console under **Security** > **Public Links**.",
   "help.attaching.supported": "#### Supported Media Types\nIf you are trying to preview a media type that is not supported, the file previewer will open a standard media attachment icon. Supported media formats depend heavily on your browser and operating system, but the following formats are supported by Mattermost on most browsers:",
   "help.attaching.supportedList": "- Images: BMP, GIF, JPG, JPEG, PNG\n- Video: MP4\n- Audio: MP3, M4A\n- Documents: PDF",
-  "help.attaching.title": "# Attaching Files\n_____",
+  "help.attaching.title": "# 파일 첨부하기\n_____",
   "help.commands.builtin": "## Built-in Commands\nThe following slash commands are available on all Mattermost installations:",
   "help.commands.builtin2": "Begin by typing `/` and a list of slash command options appears above the text input box. The autocomplete suggestions help by providing a format example in black text and a short description of the slash command in grey text.",
   "help.commands.custom": "## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.",
   "help.commands.custom2": "Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
   "help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
-  "help.commands.title": "# Executing Commands\n___",
+  "help.commands.title": "# 명령어 실행하기\n___",
   "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
   "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
   "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
   "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL+ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
   "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
   "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
-  "help.composing.title": "# Sending Messages\n_____",
+  "help.composing.title": "# 메시지 보내기\n_____",
   "help.composing.types": "## Message Types\nReply to posts to keep conversations organized in threads.",
   "help.formatting.checklist": "Make a task list by including square brackets:",
   "help.formatting.checklistExample": "- [ ] Item one\n- [ ] Item two\n- [x] Completed item",
@@ -1286,7 +1314,7 @@
   "help.formatting.codeBlock": "code block",
   "help.formatting.emojiExample": ":smile: :+1: :sheep:",
   "help.formatting.emojis": "## Emojis\n\nOpen the emoji autocomplete by typing `:`. A full list of emojis can be found [here](http://www.emoji-cheat-sheet.com/). It is also possible to create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html) if the emoji you want to use doesn't exist.",
-  "help.formatting.example": "Example:",
+  "help.formatting.example": "예시:",
   "help.formatting.githubTheme": "**GitHub Theme**",
   "help.formatting.headings": "## Headings\n\nMake a heading by typing # and a space before your title. For smaller headings, use more #’s.",
   "help.formatting.headings2": "Alternatively, you can underline the text using `===` or `---` to create headings.",
@@ -1314,16 +1342,16 @@
   "help.formatting.supportedSyntax": "Supported languages are:\n`as`, `applescript`, `osascript`, `scpt`, `bash`, `sh`, `zsh`, `clj`, `boot`, `cl2`, `cljc`, `cljs`, `cljs.hl`, `cljscm`, `cljx`, `hic`, `coffee`, `_coffee`, `cake`, `cjsx`, `cson`, `iced`, `cpp`, `c`, `cc`, `h`, `c++`, `h++`, `hpp`, `cs`, `csharp`, `css`, `d`, `di`, `dart`, `delphi`, `dpr`, `dfm`, `pas`, `pascal`, `freepascal`, `lazarus`, `lpr`, `lfm`, `diff`, `django`, `jinja`, `dockerfile`, `docker`, `erl`, `f90`, `f95`, `fsharp`, `fs`, `gcode`, `nc`, `go`, `groovy`, `handlebars`, `hbs`, `html.hbs`, `html.handlebars`, `hs`, `hx`, `java`, `jsp`, `js`, `jsx`, `json`, `jl`, `kt`, `ktm`, `kts`, `less`, `lisp`, `lua`, `mk`, `mak`, `md`, `mkdown`, `mkd`, `matlab`, `m`, `mm`, `objc`, `obj-c`, `ml`, `perl`, `pl`, `php`, `php3`, `php4`, `php5`, `php6`, `ps`, `ps1`, `pp`, `py`, `gyp`, `r`, `ruby`, `rb`, `gemspec`, `podspec`, `thor`, `irb`, `rs`, `scala`, `scm`, `sld`, `scss`, `st`, `sql`, `swift`, `tex`, `vbnet`, `vb`, `bas`, `vbs`, `v`, `veo`, `xml`, `html`, `xhtml`, `rss`, `atom`, `xsl`, `plist`, `yaml`",
   "help.formatting.syntax": "### Syntax Highlighting\n\nTo add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Mattermost also offers four different code themes (GitHub, Solarized Dark, Solarized Light, Monokai) that can be changed in **Account Settings** > **Display** > **Theme** > **Custom Theme** > **Center Channel Styles**",
   "help.formatting.syntaxEx": "    package main\n    import \"fmt\"\n    func main() {\n        fmt.Println(\"Hello, 世界\")\n    }",
-  "help.formatting.tableExample": "| Left-Aligned  | Center Aligned  | Right Aligned |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
+  "help.formatting.tableExample": "| 왼쪽 정렬 | 가운데 정렬 | 오른쪽 정렬 |\n| :------------ |:---------------:| -----:|\n| Left column 1 | this text       |  $100 |\n| Left column 2 | is              |   $10 |\n| Left column 3 | centered        |    $1 |",
   "help.formatting.tables": "## Tables\n\nCreate a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.",
   "help.formatting.title": "# Formatting Text\n_____",
-  "help.learnMore": "Learn more about:",
-  "help.link.attaching": "Attaching Files",
-  "help.link.commands": "Executing Commands",
+  "help.learnMore": "더 자세히 알아보기:",
+  "help.link.attaching": "파일 첨부하기",
+  "help.link.commands": "명령어 실행하기",
   "help.link.composing": "Composing Messages and Replies",
-  "help.link.formatting": "Formatting Messages using Markdown",
+  "help.link.formatting": "마크다운으로 글 작성하기",
   "help.link.mentioning": "Mentioning Teammates",
-  "help.link.messaging": "Basic Messaging",
+  "help.link.messaging": "메시지 기본 사용법",
   "help.mentioning.channel": "#### @Channel\nYou can mention an entire channel by typing `@channel`. All members of the channel will receive a mention notification that behaves the same way as if the members had been mentioned personally.",
   "help.mentioning.channelExample": "@channel great work on interviews this week. I think we found some excellent potential candidates!",
   "help.mentioning.mentions": "## @Mentions\nUse @mentions to get the attention of specific team members.",
@@ -1334,83 +1362,85 @@
   "help.mentioning.usernameCont": "If the user you mentioned does not belong to the channel, a System Message will be posted to let you know. This is a temporary message only seen by the person who triggered it. To add the mentioned user to the channel, go to the dropdown menu beside the channel name and select **Add Members**.",
   "help.mentioning.usernameExample": "@alice how did your interview go with the new candidate?",
   "help.messaging.attach": "**Attach files** by dragging and dropping into Mattermost or clicking the attachment icon in the text input box.",
-  "help.messaging.emoji": "**Quickly add emoji** by typing \":\", which will open an emoji autocomplete. If the existing emoji don't cover what you want to express, you can also create your own [Custom Emoji](http://docs.mattermost.com/help/settings/custom-emoji.html).",
-  "help.messaging.format": "**Format your messages** using Markdown that supports text styling, headings, links, emoticons, code blocks, block quotes, tables, lists and in-line images.",
-  "help.messaging.notify": "**Notify teammates** when they are needed by typing `@username`.",
-  "help.messaging.reply": "**Reply to messages** by clicking the reply arrow next to the message text.",
-  "help.messaging.title": "# Messaging Basics\n_____",
-  "help.messaging.write": "**Write messages** using the text input box at the bottom of Mattermost. Press **ENTER** to send a message. Use **Shift+ENTER** to create a new line without sending a message.",
+  "help.messaging.emoji": "\":\"를 눌러 **이모티콘을 추가**하세요. 사용할 수 있는 이모티콘 목록이 나타나고 자동완성 됩니다. 당신이 원하는 이모티콘이 목록에 없다면, 새로운 [커스텀 이모티콘](http://docs.mattermost.com/help/settings/custom-emoji.html)을 추가하여 사용하세요.",
+  "help.messaging.format": "**마크다운으로 글을 작성**하여 제목, 목록, 링크, 이모티콘, 코드, 인용문, 표, 이미지 등을 삽입할 수 있습니다.",
+  "help.messaging.notify": "**팀원에게 알리기** 위해 `@username`과 같이 입력해보세요.",
+  "help.messaging.reply": "**답글 쓰기:** 글 옆의 화살표 버튼을 눌러 답글을 작성할 수 있습니다.",
+  "help.messaging.title": "# 메시지 도움말\n_____",
+  "help.messaging.write": "**글 쓰기:** Mattermost 하단의 입력 창에 원하는 메시지를 입력하고 **ENTER**를 눌러 글을 등록하세요. **Shift+ENTER**를 눌러 등록하는 대신 줄바꿈을 할 수 있습니다.",
   "installed_command.header": "슬래시 명령어",
   "installed_commands.add": "슬래시 명령어 추가",
   "installed_commands.empty": "명령어가 없습니다.",
   "installed_commands.header": "슬래시 명령어",
   "installed_commands.help": "외부 통합에 사용하기 위한 슬래시 명령어를 생성하세요. 자세한 내용은 {link}를 참조하세요.",
   "installed_commands.helpLink": "문서",
-  "installed_commands.search": "슬래시 명령어 검색하기",
+  "installed_commands.search": "슬래시 명령어 검색",
   "installed_commands.unnamed_command": "이름없는 슬래시 명령어",
   "installed_incoming_webhooks.add": "Incoming Webhook 추가하기",
-  "installed_incoming_webhooks.empty": "Incoming webhook이 없습니다.",
-  "installed_incoming_webhooks.header": "Incoming Webhooks",
+  "installed_incoming_webhooks.empty": "Incoming Webhook이 없습니다.",
+  "installed_incoming_webhooks.header": "Incoming Webhook",
   "installed_incoming_webhooks.help": "외부 통합에 사용하기 위한 Incoming webhook URL을 생성하세요. 자세한 내용은 {link}를 참조하세요.",
   "installed_incoming_webhooks.helpLink": "문서",
-  "installed_incoming_webhooks.search": "Incoming Webhook 검색하기",
-  "installed_incoming_webhooks.unknown_channel": "A Private Webhook",
-  "installed_integrations.callback_urls": "Callback URLs: {urls}",
-  "installed_integrations.client_id": "Client ID: <strong>{clientId}</strong>",
-  "installed_integrations.client_secret": "Client Secret: <strong>{clientSecret}</strong>",
+  "installed_incoming_webhooks.search": "Incoming Webhook 검색",
+  "installed_incoming_webhooks.unknown_channel": "비공개 Webhook",
+  "installed_integrations.callback_urls": "콜백 URL: {urls}",
+  "installed_integrations.client_id": "클라이언트 ID: <strong>{clientId}</strong>",
+  "installed_integrations.client_secret": "클라이언트 시크릿: <strong>{clientSecret}</strong>",
   "installed_integrations.content_type": "Content-Type: {contentType}",
-  "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
+  "installed_integrations.creation": "{creator}(이)가 {createAt, date, full}에 생성",
   "installed_integrations.delete": "삭제",
-  "installed_integrations.hideSecret": "Hide Secret",
-  "installed_integrations.regenSecret": "Regenerate Secret",
+  "installed_integrations.edit": "편집",
+  "installed_integrations.hideSecret": "시크릿 숨기기",
+  "installed_integrations.regenSecret": "시크릿 재생성하기",
   "installed_integrations.regenToken": "토큰 재생성하기",
-  "installed_integrations.showSecret": "Show Secret",
+  "installed_integrations.showSecret": "시크릿 보기",
   "installed_integrations.token": "토큰: {token}",
-  "installed_integrations.triggerWhen": "Trigger When: {triggerWhen}",
-  "installed_integrations.triggerWords": "Trigger Words: {triggerWords}",
-  "installed_integrations.unnamed_oauth_app": "Unnamed OAuth 2.0 Application",
+  "installed_integrations.triggerWhen": "트리거 조건: {triggerWhen}",
+  "installed_integrations.triggerWords": "트리거 단어: {triggerWords}",
+  "installed_integrations.unnamed_oauth_app": "이름 없는 OAuth 2.0 애플리케이션",
   "installed_integrations.url": "URL: {url}",
-  "installed_oauth_apps.add": "OAuth 2.0 애플리케이션 추가하기",
-  "installed_oauth_apps.callbackUrls": "Callback URLs (One Per Line)",
+  "installed_oauth_apps.add": "애플리케이션 추가하기",
+  "installed_oauth_apps.callbackUrls": "콜백 URL (줄 당 하나씩)",
   "installed_oauth_apps.cancel": "취소",
   "installed_oauth_apps.description": "설명",
   "installed_oauth_apps.empty": "OAuth 2.0 애플리케이션이 없습니다",
   "installed_oauth_apps.header": "OAuth 2.0 애플리케이션",
-  "installed_oauth_apps.help": "Create OAuth 2.0 applications to securely integrate bots and third-party applications with Mattermost. Please see {link} to learn more.",
+  "installed_oauth_apps.help": "OAuth 2.0(으)로 외부 애플리케이션을 Mattermost에 안전하게 통합하세요. 자세한 내용은 {link}를 참고하세요.",
   "installed_oauth_apps.helpLink": "문서",
   "installed_oauth_apps.homepage": "홈페이지",
   "installed_oauth_apps.iconUrl": "아이콘 URL",
-  "installed_oauth_apps.is_trusted": "Is Trusted: <strong>{isTrusted}</strong>",
+  "installed_oauth_apps.is_trusted": "신뢰함: <strong>{isTrusted}</strong>",
   "installed_oauth_apps.name": "표시명",
   "installed_oauth_apps.save": "저장",
-  "installed_oauth_apps.search": "OAuth 2.0 애플리케이션 찾아보기",
-  "installed_oauth_apps.trusted": "Is Trusted",
+  "installed_oauth_apps.search": "OAuth 2.0 애플리케이션 검색",
+  "installed_oauth_apps.trusted": "신뢰함",
   "installed_oauth_apps.trusted.no": "아니요",
   "installed_oauth_apps.trusted.yes": "네",
   "installed_outgoing_webhooks.add": "Outgoing Webhook 추가하기",
-  "installed_outgoing_webhooks.empty": "Outgoing webhook이 없습니다.",
-  "installed_outgoing_webhooks.header": "Outgoing Webhooks",
+  "installed_outgoing_webhooks.empty": "Outgoing Webhook이 없습니다.",
+  "installed_outgoing_webhooks.header": "Outgoing Webhook",
   "installed_outgoing_webhooks.help": "외부 통합에 사용하기 위한 Outgoing webhook URL을 생성하세요. 자세한 내용은 {link}를 참조하세요.",
   "installed_outgoing_webhooks.helpLink": "문서",
-  "installed_outgoing_webhooks.search": "Outgoing Webhook 검색하기",
-  "installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
+  "installed_outgoing_webhooks.search": "Outgoing Webhook 검색",
+  "installed_outgoing_webhooks.unknown_channel": "비공개 Webhook",
   "integrations.add": "추가",
   "integrations.command.description": "슬래시 명령어는 외부에 연결한 서비스에 이벤트를 보냅니다.",
   "integrations.command.title": "슬래시 명령어",
-  "integrations.done": "None",
+  "integrations.done": "확인",
+  "integrations.edit": "편집",
   "integrations.header": "통합 기능",
-  "integrations.incomingWebhook.description": "Incoming webhook은 외부 시스템에서 메시지를 받는 것을 허용합니다.",
+  "integrations.incomingWebhook.description": "Incoming Webhook은 외부 시스템에서 메시지를 받을 수 있게합니다.",
   "integrations.incomingWebhook.title": "Incoming Webhook",
   "integrations.oauthApps.description": "OAuth 2.0 allows external applications to make authorized requests to the Mattermost API.",
   "integrations.oauthApps.title": "OAuth 2.0 애플리케이션",
-  "integrations.outgoingWebhook.description": "Outgoing webhook은 외부 시스템에 메시지를 요청하고 응답받는 것을 허용합니다.",
+  "integrations.outgoingWebhook.description": "Outgoing Webhook은 외부 시스템에 메시지를 보내고 응답받을 수 있게합니다.",
   "integrations.outgoingWebhook.title": "Outgoing Webhook",
-  "integrations.successful": "설정 성공",
+  "integrations.successful": "설정이 완료되었습니다.",
   "intro_messages.DM": "{teammate}와 개인 메시지의 시작입니다.<br />개인 메시지나 여기서 공유된 파일들은 외부에서 보여지지 않습니다.",
-  "intro_messages.anyMember": " 모든 회원가 이 채널에 가입하고 글을 읽을 수 있습니다.",
+  "intro_messages.anyMember": " 모든 회원이 채널에 가입하고 글을 읽을 수 있습니다.",
   "intro_messages.beginning": "{name}의 시작",
   "intro_messages.channel": "채널",
-  "intro_messages.creator": "<strong>{name}</strong> {type}입니다. 만든 사람: <strong>{creator}</strong> 만든 날짜: <strong>{date}</strong>",
+  "intro_messages.creator": "{name} {type}입니다. 만들어진 날짜: {date}.",
   "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}에 사용자 초대하기",
@@ -1418,6 +1448,7 @@
   "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.setHeader": "헤더 설정",
   "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.",
   "invite_member.addAnother": "더 초대하기",
@@ -1427,7 +1458,7 @@
   "invite_member.disabled": "팀의 신규 사용자 가입이 비활성화 되어있습니다. 팀 관리자에게 문의하세요.",
   "invite_member.emailError": "유효한 이메일 주소를 입력하세요.",
   "invite_member.firstname": "이름",
-  "invite_member.inviteLink": "팀 가입 링크",
+  "invite_member.inviteLink": "가입 링크",
   "invite_member.lastname": "성",
   "invite_member.modalButton": "네, 취소합니다.",
   "invite_member.modalMessage": "You have unsent invitations, are you sure you want to discard them?",
@@ -1453,10 +1484,10 @@
   "login.createTeamAdminOnly": "This option is only available for System Administrators, and does not show up for other users.",
   "login.email": "이메일",
   "login.find": "다른 팀 찾기",
-  "login.forgot": "비밀번호를 잊어버리셨나요?",
+  "login.forgot": "패스워드를 잊어버리셨나요?",
   "login.gitlab": "GitLab",
   "login.google": "Google Apps",
-  "login.invalidPassword": "비밀번호가 일치하지 않습니다.",
+  "login.invalidPassword": "패스워드가 일치하지 않습니다.",
   "login.ldapUsername": "AD/LDAP 사용자명",
   "login.ldapUsernameLower": "AD/LDAP 사용자명",
   "login.noAccount": "계정이 없으신가요? ",
@@ -1466,19 +1497,19 @@
   "login.noEmailUsernameLdapUsername": "이메일, 사용자명 또는 {ldapUsername}을 입력하세요.",
   "login.noLdapUsername": "{ldapUsername}을 입력하세요.",
   "login.noMethods": "활성화된 접속방식이 없습니다. 시스템 관리자에게 문의해보세요.",
-  "login.noPassword": "비밀번호를 입력하세요.",
+  "login.noPassword": "패스워드를 입력하세요.",
   "login.noUsername": "사용자명을 입력하세요.",
   "login.noUsernameLdapUsername": "사용자명 또는 {ldapUsername}을 입력하세요.",
   "login.office365": "Office 365",
   "login.on": "on {siteName}",
   "login.or": "또는",
-  "login.password": "비밀번호",
-  "login.passwordChanged": " 비밀번호가 성공적으로 변경되었습니다.",
+  "login.password": "패스워드",
+  "login.passwordChanged": " 패스워드가 성공적으로 변경되었습니다.",
   "login.session_expired": " 세션이 만료되었습니다. 다시 로그인 하세요.",
   "login.signIn": "로그인",
   "login.signInWith": "다음으로 로그인하기:",
   "login.userNotFound": "입력된 계정과 일치하는 사용자 정보를 찾을 수 없습니다.",
-  "login.username": "사용자 이름",
+  "login.username": "사용자명",
   "login.verified": " 이메일 검증됨",
   "login_mfa.enterToken": "To complete the sign in process, please enter a token from your smartphone's authenticator",
   "login_mfa.submit": "제출",
@@ -1527,7 +1558,7 @@
   "navbar_dropdown.accountSettings": "계정 설정",
   "navbar_dropdown.console": "관리자 도구",
   "navbar_dropdown.create": "팀 만들기",
-  "navbar_dropdown.emoji": "사용자 정의 이모티콘",
+  "navbar_dropdown.emoji": "커스텀 이모티콘",
   "navbar_dropdown.help": "도움말",
   "navbar_dropdown.integrations": "통합 기능",
   "navbar_dropdown.inviteMember": "회원 초대",
@@ -1538,22 +1569,23 @@
   "navbar_dropdown.report": "문제 보고",
   "navbar_dropdown.switchTeam": "{team}(으)로 돌아가기",
   "navbar_dropdown.switchTo": "팀 변경: ",
-  "navbar_dropdown.teamLink": "팀 가입 링크",
+  "navbar_dropdown.teamLink": "가입 링크",
   "navbar_dropdown.teamSettings": "팀 설정",
   "navbar_dropdown.viewMembers": "회원 목록",
   "notification.dm": "개인 메시지",
-  "password_form.change": "비밀번호 변경하기",
+  "passwordRequirements": "Password Requirements:",
+  "password_form.change": "패스워드 변경하기",
   "password_form.click": "Click <a href={url}>here</a> to log in.",
   "password_form.enter": "Enter a new password for your {siteName} account.",
   "password_form.error": "최소 {chars}글자 이상 입력하세요.",
-  "password_form.pwd": "비밀번호",
-  "password_form.title": "비밀번호 재설정",
+  "password_form.pwd": "패스워드",
+  "password_form.title": "패스워드 재설정",
   "password_form.update": "Your password has been updated successfully.",
-  "password_send.checkInbox": "Please check your inbox.",
+  "password_send.checkInbox": "이메일을 확인하세요.",
   "password_send.description": "To reset your password, enter the email address you used to sign up",
   "password_send.email": "이메일",
   "password_send.error": "유효한 이메일 주소를 입력하세요.",
-  "password_send.link": "<p>A password reset link has been sent to <b>{email}</b></p>",
+  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "Reset my password",
   "password_send.title": "Password Reset",
   "pdf_preview.max_pages": "Download to read more pages",
@@ -1597,19 +1629,22 @@
   "rhs_comment.comment": "답글",
   "rhs_comment.del": "삭제",
   "rhs_comment.edit": "편집",
-  "rhs_comment.mobile.flag": "중요 표시",
+  "rhs_comment.mobile.flag": "중요 지정",
   "rhs_comment.mobile.unflag": "중요 해제",
   "rhs_comment.permalink": "바로가기",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "중요 메시지로 돌아가기",
   "rhs_header.backToResultsTooltip": "검색결과로 돌아가기",
   "rhs_header.closeSidebarTooltip": "사이드바 닫기",
+  "rhs_header.closeTooltip": "사이드바 닫기",
   "rhs_header.details": "메시지 세부사항",
   "rhs_header.expandSidebarTooltip": "사이드바 펴기",
+  "rhs_header.expandTooltip": "사이드바 접기",
   "rhs_header.shrinkSidebarTooltip": "사이드바 접기",
   "rhs_root.del": "삭제",
   "rhs_root.direct": "개인 메시지",
   "rhs_root.edit": "편집",
-  "rhs_root.mobile.flag": "중요 표시",
+  "rhs_root.mobile.flag": "중요 지정",
   "rhs_root.mobile.unflag": "중요 해제",
   "rhs_root.permalink": "바로가기",
   "search_bar.cancel": "취소",
@@ -1641,7 +1676,7 @@
   "sidebar.createChannel": "채널 생성하기",
   "sidebar.createGroup": "그룹 생성하기",
   "sidebar.direct": "개인 메시지",
-  "sidebar.favorite": "Favorites",
+  "sidebar.favorite": "즐겨찾기",
   "sidebar.more": "더 보기",
   "sidebar.moreElips": "더 보기...",
   "sidebar.otherMembers": "팀 외부",
@@ -1664,10 +1699,10 @@
   "sidebar_right_menu.recentMentions": "최근 멘션",
   "sidebar_right_menu.report": "문제 보고",
   "sidebar_right_menu.switch_team": "팀 선택",
-  "sidebar_right_menu.teamLink": "팀 가입 링크",
+  "sidebar_right_menu.teamLink": "가입 링크",
   "sidebar_right_menu.teamSettings": "팀 설정",
   "sidebar_right_menu.viewMembers": "회원 보기",
-  "signup.email": "이메일과 비밀번호",
+  "signup.email": "이메일과 패스워드",
   "signup.gitlab": "GitLab SSO",
   "signup.google": "Google 계정",
   "signup.ldap": "AD/LDAP Credentials",
@@ -1688,35 +1723,35 @@
   "signup_team_confirm.title": "가입 완료",
   "signup_team_system_console": "관리자 도구로 바로가기",
   "signup_user_completed.choosePwd": "패스워드를 입력하세요.",
-  "signup_user_completed.chooseUser": "사용자 이름을 입력하세요.",
+  "signup_user_completed.chooseUser": "사용자명을 입력하세요.",
   "signup_user_completed.create": "계정 만들기",
-  "signup_user_completed.emailHelp": "유효한 이메일 주소가 필요합니다.",
+  "signup_user_completed.emailHelp": "가입을 위해 유효한 이메일 계정이 필요합니다.",
   "signup_user_completed.emailIs": "Your email address is <strong>{email}</strong>. You'll use this address to sign in to {siteName}.",
   "signup_user_completed.expired": "You've already completed the signup process for this invitation or this invitation has expired.",
-  "signup_user_completed.gitlab": "with GitLab",
-  "signup_user_completed.google": "with Google",
-  "signup_user_completed.haveAccount": "Already have an account?",
+  "signup_user_completed.gitlab": "GitLab 계정으로 가입하기",
+  "signup_user_completed.google": "Google 계정으로 가입하기",
+  "signup_user_completed.haveAccount": "이미 계정이 있나요?",
   "signup_user_completed.invalid_invite": "The invite link was invalid.  Please speak with your Administrator to receive an invitation.",
-  "signup_user_completed.lets": "Let's create your account",
+  "signup_user_completed.lets": "계정을 생성하고 시작해보세요!",
   "signup_user_completed.no_open_server": "This server does not allow open signups.  Please speak with your Administrator to receive an invitation.",
   "signup_user_completed.none": "No user creation method has been enabled.  Please contact an administrator for access.",
-  "signup_user_completed.office365": "with Office 365",
+  "signup_user_completed.office365": "Office 365 계정으로 가입하기",
   "signup_user_completed.onSite": "on {siteName}",
   "signup_user_completed.or": "또는",
   "signup_user_completed.passwordLength": "최소 {min}글자 이상 입력하세요.",
   "signup_user_completed.required": "필수 항목입니다.",
   "signup_user_completed.reserved": "이미 사용중인 이름입니다.",
-  "signup_user_completed.signIn": "Click here to sign in.",
-  "signup_user_completed.userHelp": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'",
-  "signup_user_completed.usernameLength": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'.",
-  "signup_user_completed.validEmail": "Please enter a valid email address",
+  "signup_user_completed.signIn": "이 곳을 클릭해서 로그인하세요.",
+  "signup_user_completed.userHelp": "사용자명은 반드시 영문자로 시작하여야 하며, {min}글자 이상 {max}글자 이하 영문자, 숫자, 특수기호 '.', '-', '_'를 포함할 수 있습니다.",
+  "signup_user_completed.usernameLength": "사용자명은 반드시 영문자로 시작하여야 하며, {min}글자 이상 {max}글자 이하 영문자, 숫자, 특수기호 '.', '-', '_'를 포함할 수 있습니다.",
+  "signup_user_completed.validEmail": "유효한 이메일 주소를 입력해주세요.",
   "signup_user_completed.welcome": "환영합니다!",
-  "signup_user_completed.whatis": "What's your email address?",
+  "signup_user_completed.whatis": "이메일 주소를 입력하세요.",
   "signup_user_completed.withLdap": "With your LDAP credentials",
   "sso_signup.find": "팀 찾기",
   "sso_signup.gitlab": "GitLab 계정으로 팀 만들기",
   "sso_signup.google": "Google 계정으로 팀 만들기",
-  "sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
+  "sso_signup.length_error": "이름이 반드시 3글자 이상 15글자 이하가 되어야 합니다.",
   "sso_signup.teamName": "팀 이름을 입력하세요.",
   "sso_signup.team_error": "팀 이름을 입력하세요.",
   "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
@@ -1768,7 +1803,7 @@
   "textbox.italic": "_기울게_",
   "textbox.preformatted": "```코드 블럭```",
   "textbox.preview": "미리보기",
-  "textbox.quote": ">인용",
+  "textbox.quote": "> 인용",
   "textbox.strike": "취소선",
   "tutorial_intro.allSet": "모든 준비가 끝났습니다",
   "tutorial_intro.end": "“다음” 을 눌러 {channel}에 입장합니다. 이 곳은 팀에 가입한 회원들이 가장 먼저 보게되는 채널입니다. 모두가 알아야 할 내용을 공지할 때 이 채널을 사용하세요.",
@@ -1776,7 +1811,7 @@
   "tutorial_intro.mobileApps": "{link} 애플리케이션을 설치하여 접근성과 알림을 향상시키세요.",
   "tutorial_intro.mobileAppsLinkText": "PC, Mac, iOS, Android",
   "tutorial_intro.next": "다음",
-  "tutorial_intro.screenOne": "<h3>환영합니다!</h3><h1>Mattermost</h1><p>모든 팀 커뮤니케이션 활동을 한 곳에 모아 쉽고 빠르게 접근할 수 있습니다.</p><p>팀 커뮤니케이션을 연결하여 가장 중요한 목표를 공유하세요.</p>",
+  "tutorial_intro.screenOne": "<h3>환영합니다!</h3><h1>Mattermost</h1><p>모든 팀 커뮤니케이션 활동을 한 곳에 모아 빠르게 찾고 공유할 수 있습니다.</p><p>팀 커뮤니케이션을 연결하여 가장 중요한 목표를 공유하세요.</p>",
   "tutorial_intro.screenTwo": "<h3>Mattermost를 활용하는 법:</h3><p>공개된 논의 채널, 비공개 그룹, 또는 개인 메시지를 통해 이야기를 나눌 수 있습니다.</p><p>모든 내용은 저장되고, 웹페이지를 볼 수 있는 곳이라면 어디서든 검색 가능합니다.</p>",
   "tutorial_intro.skip": "튜토리얼 생략",
   "tutorial_intro.support": "도움이 필요하면 아래 이메일로 문의주세요 ",
@@ -1786,14 +1821,18 @@
   "tutorial_tip.ok": "확인",
   "tutorial_tip.out": "이 팁 더이상 보지 않기.",
   "tutorial_tip.seen": "이미 알고 계신가요? ",
+  "update_command.cancel": "취소",
+  "update_command.confirm": "슬래시 명령어 추가",
+  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.update": "Update",
   "upload_overlay.info": "이 곳에 파일을 끌어 업로드하세요.",
   "user.settings.advance.embed_preview": "가능한 경우, 링크 내용 미리보기를 표시",
   "user.settings.advance.embed_toggle": "미리보기 토글 버튼 보여주기",
   "user.settings.advance.enabledFeatures": "{count, number}개 기능 활성화",
   "user.settings.advance.formattingDesc": "활성화 하면 링크, 이모티콘, 글자 스타일 등을 사용할 수 있습니다. 기본적으로 활성화 되있습니다. 설정을 변경하려면 페이지 새로고침이 필요합니다.",
   "user.settings.advance.formattingTitle": "마크다운으로 글쓰기",
-  "user.settings.advance.joinLeaveDesc": "When \"On\", System Messages saying a user has joined or left a channel will be visible. When \"Off\", the System Messages about joining or leaving a channel will be hidden. A message will still show up when you are added to a channel, so you can receive a notification.",
-  "user.settings.advance.joinLeaveTitle": "Enable Join/Leave Messages",
+  "user.settings.advance.joinLeaveDesc": "\"켜기\"를 선택하면 사용자가 채널에 입장하거나 퇴장했을 때 시스템 메시지가 표시됩니다. \"끄기\"를 선택하면, 입장/퇴장 메시지가 화면에 표시되지 않습니다. 이 설정과 관계없이 채널 초대되었을 때 알림을 받을 수 있습니다.",
+  "user.settings.advance.joinLeaveTitle": "입장/퇴장 메시지 표시",
   "user.settings.advance.markdown_preview": "메시지 입력창에 마크다운 미리보기 옵션을 표시",
   "user.settings.advance.off": "끄기",
   "user.settings.advance.on": "켜기",
@@ -1811,7 +1850,7 @@
   "user.settings.custom_theme.centerChannelColor": "Center Channel Text",
   "user.settings.custom_theme.centerChannelTitle": "채널 영역 스타일",
   "user.settings.custom_theme.codeTheme": "Code Theme",
-  "user.settings.custom_theme.copyPaste": "Copy and paste to share theme colors:",
+  "user.settings.custom_theme.copyPaste": "다음 테마 색상을 복사하여 공유:",
   "user.settings.custom_theme.linkButtonTitle": "링크, 버튼 스타일",
   "user.settings.custom_theme.linkColor": "Link Color",
   "user.settings.custom_theme.mentionBj": "Mention Jewel BG",
@@ -1854,9 +1893,9 @@
   "user.settings.display.showFullname": "본명으로 보기",
   "user.settings.display.showNickname": "별명이 있으면 별명으로 보기, 없으면 본명으로 보기",
   "user.settings.display.showUsername": "사용자명으로 보기 (기본)",
-  "user.settings.display.teammateDisplay": "사용자 이름 표시",
-  "user.settings.display.theme.applyToAllTeams": "Apply new theme to all my teams",
-  "user.settings.display.theme.customTheme": "사용자 정의 테마",
+  "user.settings.display.teammateDisplay": "사용자명 표시",
+  "user.settings.display.theme.applyToAllTeams": "가입한 모든 팀에서 새로운 테마를 적용합니다.",
+  "user.settings.display.theme.customTheme": "커스텀 테마",
   "user.settings.display.theme.describe": "내 테마 관리하기",
   "user.settings.display.theme.import": "Slack 테마 불러오기",
   "user.settings.display.theme.otherThemes": "다른 테마 보기",
@@ -1866,13 +1905,13 @@
   "user.settings.general.checkEmail": "Check your email at {email} to verify the address.",
   "user.settings.general.checkEmailNoAddress": "Check your email to verify your new address",
   "user.settings.general.close": "닫기",
-  "user.settings.general.confirmEmail": "보조 이메일",
+  "user.settings.general.confirmEmail": "이메일 확인",
   "user.settings.general.email": "이메일",
   "user.settings.general.emailGitlabCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailGoogleCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
-  "user.settings.general.emailHelp1": "이메일은 접속, 알림 수신, 비밀번호 변경 등에 사용됩니다. 이메일을 변경하면 재검증이 필요합니다.",
+  "user.settings.general.emailHelp1": "이메일은 접속, 알림 수신, 패스워드 변경 등에 사용됩니다. 이메일을 변경하면 재검증이 필요합니다.",
   "user.settings.general.emailHelp2": "이메일 기능이 시스템 관리자에 의해 비활성화 되었습니다. 활성화 되기 전까진 알림 메일이 발송되지 않습니다.",
-  "user.settings.general.emailHelp3": "이메일은 접속, 알림 수신, 비밀번호 변경 등에 사용됩니다.",
+  "user.settings.general.emailHelp3": "이메일은 접속, 알림 수신, 패스워드 변경 등에 사용됩니다.",
   "user.settings.general.emailHelp4": "{email}(으)로 검증메일이 발송됐습니다.",
   "user.settings.general.emailLdapCantUpdate": "Login occurs through LDAP. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailMatch": "The new emails you entered do not match.",
@@ -1894,16 +1933,16 @@
   "user.settings.general.loginSaml": "Login done through SAML ({email})",
   "user.settings.general.newAddress": "New Address: {email}<br />Check your email to verify the above address.",
   "user.settings.general.nickname": "별명",
-  "user.settings.general.nicknameExtra": "이름과 유저명과는 다르게 불리는 고유한 이름을 사용하세요. 비슷한 이름을 가진 사람들이 모여있을 때 자주 사용됩니다.",
+  "user.settings.general.nicknameExtra": "본명과 사용자명과는 다르게 불리는 고유한 이름을 사용하세요. 비슷한 이름을 가진 사람들이 모여있을 때 자주 사용됩니다.",
   "user.settings.general.notificationsExtra": "기본적으로 이 곳에 설정된 이름으로 언급되었을 때 멘션 알림을 받게됩니다. {notify}에서 기본 설정을 변경하세요.",
   "user.settings.general.notificationsLink": "알림",
   "user.settings.general.primaryEmail": "주 이메일",
   "user.settings.general.profilePicture": "프로필 사진",
   "user.settings.general.title": "일반 설정",
   "user.settings.general.uploadImage": "'편집'을 클릭하여 사진 업로드",
-  "user.settings.general.username": "사용자 이름",
+  "user.settings.general.username": "사용자명",
   "user.settings.general.usernameInfo": "팀원들에게 불리기 쉬운 이름을 선택하세요.",
-  "user.settings.general.usernameReserved": "예약된 사용자 이름입니다. 다른 이름을 선택하세요.",
+  "user.settings.general.usernameReserved": "예약된 사용자명입니다. 다른 이름을 선택하세요.",
   "user.settings.general.usernameRestrictions": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'.",
   "user.settings.general.validEmail": "유효한 이메일 주소를 입력하세요.",
   "user.settings.general.validImage": "JPG 또는 PNG 이미지만 프로필 사진으로 사용할 수 있습니다.",
@@ -1913,15 +1952,15 @@
   "user.settings.import_theme.submit": "적용",
   "user.settings.import_theme.submitError": "Invalid format, please try copying and pasting in again.",
   "user.settings.languages.change": "언어 변경",
-  "user.settings.languages.promote": "Select which language Mattermost displays in the user interface.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
+  "user.settings.languages.promote": "어떤 언어로 Mattermost 인터페이스를 표시할지 선택하세요.<br /><br />? <a href='http://translate.mattermost.com/' target='_blank'>Mattermost 번역 서버</a>에 가입하여 번역 품질에 기여해주세요.",
   "user.settings.mfa.add": "Add MFA to your account",
   "user.settings.mfa.addHelp": "You can require a smartphone-based token, in addition to your password, to sign into Mattermost.<br/><br/>To enable, download Google Authenticator from <a target='_blank' href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8'>iTunes</a> or <a target='_blank' href='https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en'>Google Play</a> for your phone, then<br/><br/>1. Click the <strong>Add MFA to your account</strong> button above.<br/>2. Use Google Authenticator to scan the QR code that appears.<br/>3. Type in the Token generated by Google Authenticator and click <strong>Save</strong>.<br/><br/>When logging in, you will be asked to enter a token from Google Authenticator in addition to your regular credentials.",
-  "user.settings.mfa.addHelpQr": "Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can maunally enter the secret provided.",
+  "user.settings.mfa.addHelpQr": "Please scan the bar code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.",
   "user.settings.mfa.enterToken": "토큰 (숫자만)",
-  "user.settings.mfa.qrCode": "Bar Code",
+  "user.settings.mfa.qrCode": "바코드",
   "user.settings.mfa.remove": "Remove MFA from your account",
   "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
-  "user.settings.mfa.secret": "Secret",
+  "user.settings.mfa.secret": "보안",
   "user.settings.mfa.title": "Enable Multi-factor Authentication:",
   "user.settings.modal.advanced": "고급",
   "user.settings.modal.confirmBtns": "네, 취소합니다.",
@@ -1936,10 +1975,10 @@
   "user.settings.notifications.channelWide": "채널 전체 멘션 \"@channel\", \"@all\"",
   "user.settings.notifications.close": "닫기",
   "user.settings.notifications.comments": "답글 알림",
-  "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
+  "user.settings.notifications.commentsAny": "등록하거나 답변했던 모든 스레드의 답변에 대해 알림",
   "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
-  "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
-  "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
+  "user.settings.notifications.commentsNever": "사용 안함",
+  "user.settings.notifications.commentsRoot": "등록한 모든 스레드의 답변에 대해 알림",
   "user.settings.notifications.desktop": "알림 받기",
   "user.settings.notifications.desktop.allFirefoxForever": "모든 활동에 대해 무기한 보여줍니다.",
   "user.settings.notifications.desktop.allFirefoxTimed": "모든 활동에 대해, {seconds}초 동안 보여줍니다.",
@@ -1964,18 +2003,19 @@
   "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.email.immediately": "바로",
   "user.settings.notifications.email.never": "사용 안함",
-  "user.settings.notifications.email.send": "데스크탑 알림음",
+  "user.settings.notifications.email.send": "알림 받기",
   "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from {siteName} for more than 5 minutes.",
   "user.settings.notifications.emailNotifications": "이메일 알림",
   "user.settings.notifications.header": "알림",
   "user.settings.notifications.info": "데스크탑 알림은 Firefox, Safari, Chrome 브라우저에서 사용할 수 있습니다.",
-  "user.settings.notifications.never": "알림을 받지 않기",
+  "user.settings.notifications.never": "사용 안함",
   "user.settings.notifications.noWords": "설정한 단어가 없습니다",
-  "user.settings.notifications.off": "끄기",
-  "user.settings.notifications.on": "켜기",
-  "user.settings.notifications.onlyMentions": "멘션과 직접 대화에 대한 알림만 받기",
+  "user.settings.notifications.off": "사용 안함",
+  "user.settings.notifications.on": "사용함",
+  "user.settings.notifications.onlyMentions": "개인 메시지와 멘션",
   "user.settings.notifications.push": "모바일 푸시 알림",
+  "user.settings.notifications.push_notification.status": "지정한 상태일 때 모바일 푸시 알림",
   "user.settings.notifications.sensitiveName": "내 이름 \"{first_name}\" (대소문자 구별 안함)",
   "user.settings.notifications.sensitiveUsername": "내 사용자명 \"{username}\" (대소문자 구별 안함)",
   "user.settings.notifications.sensitiveWords": "다른 알림받을 단어들을 쉼표로 구분하여 입력: (대소문자 구별 안함)",
@@ -1985,44 +2025,47 @@
   "user.settings.notifications.title": "알림 설정",
   "user.settings.notifications.usernameMention": "내 사용자명을 멘션 \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "멘션 알림",
+  "user.settings.push_notification.allActivity": "For all activity",
   "user.settings.push_notification.allActivityAway": "오프라인이거나 자리비움 상태일 때의 모든 활동",
   "user.settings.push_notification.allActivityOffline": "오프라인일 때의 모든 활동",
   "user.settings.push_notification.allActivityOnline": "온라인, 오프라인, 자리비움 상태의 모든 활동",
   "user.settings.push_notification.away": "오프라인이거나 자리비움",
   "user.settings.push_notification.disabled": "시스템 관리자에 의해 비활성화 됨",
   "user.settings.push_notification.disabled_long": "모바일 기기를 위한 푸시 알림 기능이 시스템 관리자에 의해 비활성화 되었습니다.",
-  "user.settings.push_notification.info": "지정한 Mattermost 활동에 대해서만 모바일 푸시 알림을 받습니다.",
-  "user.settings.push_notification.off": "Off",
+  "user.settings.push_notification.info": "지정한 활동에 대해서만 모바일 푸시 알림을 받습니다.",
+  "user.settings.push_notification.off": "끄기",
   "user.settings.push_notification.offline": "오프라인",
   "user.settings.push_notification.online": "온라인, 오프라인, 자리비움",
-  "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
-  "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
-  "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.send": "모바일 푸시 알림",
+  "user.settings.push_notification.onlyMentions": "For mentions and direct messages",
+  "user.settings.push_notification.onlyMentionsAway": "오프라인이거나 자리를 비웠을 때, 개인 메시지와 멘션에 대해 알림",
+  "user.settings.push_notification.onlyMentionsOffline": "오프라인일 때, 개인 메시지와 멘션에 대해 알림",
+  "user.settings.push_notification.onlyMentionsOnline": "모든 개인 메시지와 멘션에 대해 알림",
+  "user.settings.push_notification.send": "알림 받기",
   "user.settings.push_notification.status": "지정한 상태일 때 모바일 푸시 알림",
-  "user.settings.push_notification.status_info": "위에서 지정한 상태와 일치할 때만 모바일 푸시 알림을 받습니다.",
+  "user.settings.push_notification.status_info": "지정한 상태일때만 모바일 푸시 알림을 받습니다.",
   "user.settings.security.close": "닫기",
-  "user.settings.security.currentPassword": "현재 비밀번호",
-  "user.settings.security.currentPasswordError": "현재 비밀번호를 입력해주세요",
+  "user.settings.security.currentPassword": "현재 패스워드",
+  "user.settings.security.currentPasswordError": "현재 패스워드를 입력해주세요",
   "user.settings.security.deauthorize": "Deauthorize",
-  "user.settings.security.emailPwd": "이메일과 비밀번호",
+  "user.settings.security.emailPwd": "이메일과 패스워드",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
   "user.settings.security.lastUpdated": "{date} {time} 에 마지막으로 변경됨",
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Gitlab을 통해 로그인 되었습니다.",
   "user.settings.security.loginLdap": "LDAP을 통해 로그인 되었습니다.",
+  "user.settings.security.loginSaml": "Gitlab을 통해 로그인 되었습니다.",
   "user.settings.security.logoutActiveSessions": "활성화 된 세션 보기/로그아웃 하기",
   "user.settings.security.method": "접속 방식",
-  "user.settings.security.newPassword": "새로운 비밀번호",
+  "user.settings.security.newPassword": "새로운 패스워드",
   "user.settings.security.noApps": "허가된 OAuth 2.0 애플리케이션이 없습니다.",
   "user.settings.security.oauthApps": "OAuth 2.0 애플리케이션",
   "user.settings.security.oauthAppsDescription": "'편집'을 눌러 OAuth 2.0 애플리케이션을 관리하세요",
   "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
-  "user.settings.security.password": "비밀번호",
-  "user.settings.security.passwordError": "비밀번호는 반드시 {min}개 이상의 글자를 포함해야 합니다.",
+  "user.settings.security.password": "패스워드",
+  "user.settings.security.passwordError": "패스워드는 반드시 {min}개 이상의 글자를 포함해야 합니다.",
   "user.settings.security.passwordErrorLowercase": "Your password must contain at least {min} characters made up of at least one lowercase letter.",
   "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one number.",
   "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
@@ -2040,11 +2083,12 @@
   "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
   "user.settings.security.passwordLdapCantUpdate": "Login occurs through LDAP. Password cannot be updated.",
-  "user.settings.security.passwordMatchError": "다시 입력한 새로운 비밀번호가 일치하지 않습니다.",
+  "user.settings.security.passwordMatchError": "다시 입력한 새로운 패스워드가 일치하지 않습니다.",
   "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
-  "user.settings.security.retypePassword": "비밀번호 재입력",
+  "user.settings.security.passwordSamlCantUpdate": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
+  "user.settings.security.retypePassword": "새로운 패스워드 확인",
   "user.settings.security.saml": "SAML",
-  "user.settings.security.switchEmail": "이메일과 비밀번호를 사용하도록 변경",
+  "user.settings.security.switchEmail": "이메일과 패스워드를 사용하도록 변경",
   "user.settings.security.switchGitlab": "GitLab SSO을 사용하도록 변경",
   "user.settings.security.switchGoogle": "Google SSO을 사용하도록 변경",
   "user.settings.security.switchLdap": "LDAP을 사용하도록 변경",
@@ -2053,40 +2097,41 @@
   "user.settings.security.title": "보안 설정",
   "user.settings.security.viewHistory": "접속 내역 보기",
   "user_list.notFound": "사용자를 찾을 수 없습니다 :(",
-  "user_profile.webrtc.call": "Start Video Call",
+  "user_profile.webrtc.call": "영상통화 시작",
+  "user_profile.webrtc.offline": "사용자가 오프라인입니다",
   "user_profile.webrtc.unavailable": "New call unavailable until your existing call ends",
   "view_image.loading": "로딩 중 ",
   "view_image_popover.download": "다운로드",
-  "view_image_popover.file": "File {count} of {total}",
+  "view_image_popover.file": "파일 {total}개 중 {count}개",
   "view_image_popover.publicLink": "공개 링크 보기",
   "web.footer.about": "알아보기",
   "web.footer.help": "도움말",
   "web.footer.privacy": "정책",
   "web.footer.terms": "서비스 약관",
   "web.header.back": "돌아가기",
-  "web.root.signup_info": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 쉽고 빠르게 접근할 수 있습니다.",
+  "web.root.signup_info": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 빠르게 찾고 공유할 수 있습니다.",
   "webrtc.busy": "{username} is busy.",
-  "webrtc.call": "Call",
-  "webrtc.callEnded": "Call with {username} ended.",
-  "webrtc.cancel": "Cancel call",
+  "webrtc.call": "통화",
+  "webrtc.callEnded": "{username}과/와의 통화가 종료되었습니다.",
+  "webrtc.cancel": "통화 취소",
   "webrtc.cancelled": "{username} cancelled the call.",
   "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": "Hangup",
-  "webrtc.header": "Call with {username}",
+  "webrtc.header": "{username}과/와의 통화",
   "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.mute_audio": "마이크 음소거",
   "webrtc.noAnswer": "{username} is not answering the call.",
   "webrtc.notification.answer": "응답",
   "webrtc.notification.decline": "거부",
   "webrtc.notification.incoming_call": "{username} is calling you.",
   "webrtc.notification.returnToCall": "Return to ongoing call with {username}",
-  "webrtc.offline": "{username} is offline.",
-  "webrtc.pause_video": "Turn off camera",
+  "webrtc.offline": "{username}(이)가 오프라인입니다.",
+  "webrtc.pause_video": "카메라 끄기",
   "webrtc.unmute_audio": "Unmute microphone",
-  "webrtc.unpause_video": "Turn on camera",
-  "webrtc.unsupported": "{username} client does not support video calls.",
-  "youtube_video.notFound": "비밀번호를 찾을 수 없습니다."
+  "webrtc.unpause_video": "카메라 켜기",
+  "webrtc.unsupported": "{username}의 클라이언트가 영상통화를 지원하지 않습니다.",
+  "youtube_video.notFound": "패스워드를 찾을 수 없습니다."
 }
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index d6e870fa9..e8de7f491 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "Configuratie",
   "admin.general.localization": "Lokalisatie",
   "admin.general.localization.availableLocalesDescription": "Stel in welke talen beschikbaar zijn om tussen te wisselen in de Acount Instellingen (laat dit veld leeg om alle ondersteunde talen beschikbaar te stellen). Als je handmatig nieuwe talen opgeeft, de <strong>Standaard Taal</strong> moet worden toegevoegd voor je dit opslaat.<br /><br />Wil je helpen met vertalen? Word lid van de <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Vertaal Server</a>.",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "Beschikbare talen:",
   "admin.general.localization.clientLocaleDescription": "Standaard taal voor nieuw aangemaakte gebruikers en pagina's bij eerste bezoek.",
   "admin.general.localization.clientLocaleTitle": "Standaard client taal:",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "De naam die gekozen is voor de S3 bucket op AWS.",
   "admin.image.amazonS3BucketExample": "Bijv.: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Verkrijg de credentials van uw Amazon EC2 beheerder.",
   "admin.image.amazonS3IdExample": "Bijv.: \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 toegangs sleutel ID:",
   "admin.image.amazonS3RegionDescription": "AWS regie die gekozen is tijdens het aanmaken van uw S3 bucket.",
   "admin.image.amazonS3RegionExample": "Bijv.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Regio:",
+  "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": "Verkrijg deze credential van de Amazon EC2 beheerder.",
   "admin.image.amazonS3SecretExample": "Bijv.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 geheime toegangs sleutel:",
@@ -638,6 +644,8 @@
   "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.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Zet deze sleutel om de titel van ingevoegde Youtube video's te tonen. Zonder deze sleutel zullen Youtube previews nog steeds gemaakt worden op basis van links die in berichten en reacties worden geplaatst, maar er word geen titel getoond. Bekijken een <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> voor instructies over hoe deze sleutel te krijgen.",
   "admin.service.googleExample": "Bijv.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Sleutel:",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "Schakel onbeveiligde uitgaande verbindingen in: ",
   "admin.service.integrationAdmin": "Beperk beheer van integraties alleen voor Admins:",
   "admin.service.integrationAdminDesc": "Wanneer aangezet, webhooks en slash commando's kunnen alleen gemaakt, bewerkt en bekeken worden door Team en Systeem Beheerders, en OAuth 2.0 applicaties door Systeem Beheerders. Integraties zijn beschikbaar voor alle gebruikers als ze zijn gemaakt door de Beheerder.",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Luister Adres:",
   "admin.service.listenDescription": "The address and port to which to bind and listen. Specifying \":8065\" will bind to all network interfaces. Specifying \"127.0.0.1:8065\" will only bind to the network interface having that IP address. If you choose a port of a lower level (called \"system ports\" or \"well-known ports\", in the range of 0-1023), you must have permissions to bind to that port. On Linux you can use: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" to allow Mattermost to bind to well-known ports.",
   "admin.service.listenExample": "Bijv.: \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "Inschakelen uitgaande webhooks: ",
   "admin.service.overrideDescription": "Wanneer aangezet, webhooks, slash commando's en andere integraties, zoals <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, kunnen de profiel afbeelding wijzigen waar mee geplaatst word. Let op: Gecombineerd met toestaan dat integraties gebruikersnamen kunnen overschrijven, kunnen gebruikers zich voordoen als iemand anders. Phishing attacks.",
   "admin.service.overrideTitle": "Aanzetten van integraties die overschrijven van gebruikersnaam mogelijk maakt:",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "Wanneer ingeschakeld, worden systeembeheerders per e-mail verwittigd wanneer er een relevante security fix alert is aangekondigd in de laatste 12 uur. Vereist dat e-mail is ingeschakeld.",
   "admin.service.securityTitle": "Schakel beveiligings alarmen in: ",
   "admin.service.segmentDescription": "Segment.com is een optionele online service voor systeem diagnostiek. Een key is verkrijgbaar door middel van een gratis registratie bij Segment.com",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "Het aantal dagen dat de gebruiker voor het laatst zijn credentials heeft ingevoerd voordat gebruikers sessie verloopt. Als de authenticatie SAML of GitLab is, kan de gebruiker automatisch worden terug ingelogd in Mattermost omdat ze al waren ingelogd in SAML of GitLab. Nadat deze instelling is gewijzigd, zal de nieuwe sessie lengte plaatsvinden de volgende keer de gebruiker zijn credentials invult. ",
   "admin.service.testingDescription": "Wanneer dit aanstaat, het /loadtest slash commando is aan om accounts te testen. Veranderen van deze instelling vraagt een herstart van de server voor dit effect heeft.",
   "admin.service.testingTitle": "Aanzetten van test commands:",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "Sessie duur voor AD/LDAP en email (dagen):",
   "admin.service.webSessionDaysDesc": "Het aantal dagen dat de gebruiker voor het laatst zijn credentials heeft ingevoerd voordat gebruikers sessie verloopt. Nadat deze instelling is gewijzigd, zal de nieuwe sessie lengte plaatsvinden de volgende keer de gebruiker zijn credentials invult. ",
   "admin.service.webhooksDescription": "Wanneer dit aanstaat, inkomende webhooks worden toegestaan. Om combat phishing aanvallen tegen te gaan zullen alle berichten worden gelabeld met een BOT tag. Bekijk de <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentatie</a> om hier meer over te lezen.",
   "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.advanced": "Geavanceerd",
   "admin.sidebar.audits": "Compliance en Auditing",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> wil verbinding maken met jouw <strong>Mattermost</strong> gebruikers account",
   "backstage_list.search": "Zoeken",
   "backstage_navbar.backToMattermost": "Terug naar {siteName}",
+  "backstage_sidebar.emoji": "Aangepaste emoji",
   "backstage_sidebar.integrations": "Integraties",
   "backstage_sidebar.integrations.commands": "Slash opdrachten",
   "backstage_sidebar.integrations.incoming_webhooks": "Inkomende webhooks",
@@ -971,6 +992,8 @@
   "change_url.longer": "Moet langer zijn dan twee tekens",
   "change_url.noUnderscore": "Het niet is toegestaan om 2 underscores na elkaar te gebruiken.",
   "change_url.startWithLetter": "Moet beginnen met een letter of een cijfer",
+  "channelHeader.addToFavorites": "Add to Favorites",
+  "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",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "Bekijk informatie",
   "channel_header.viewMembers": "Bekijk Leden",
   "channel_header.webrtc.call": "Een video-oproep starten",
+  "channel_header.webrtc.offline": "The user is offline",
   "channel_header.webrtc.unavailable": "New call unavailable until your existing call ends",
   "channel_info.about": "Over",
   "channel_info.close": "Afsluiten",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "Overschakelen van {type} naar het gebruik van email en password",
   "claim.oauth_to_email.title": "Wissen {type} account naar e-mail",
   "confirm_modal.cancel": "Annuleren",
+  "connecting_screen": "Verbindingen",
   "create_comment.addComment": "Voeg commentaar toe...",
   "create_comment.comment": "Voeg commentaar toe",
   "create_comment.commentLength": "De lengte van het commentaar moet minder dan {max} tekens zijn.",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "Opslaan",
   "edit_channel_purpose_modal.title1": "Bewerk doel",
   "edit_channel_purpose_modal.title2": "Doeleinden bewerken voor ",
+  "edit_command.save": "Update",
   "edit_post.cancel": "Annuleren",
   "edit_post.edit": "{title} bewerken",
   "edit_post.editPost": "Bewerk het bericht...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "Aangemaakt door",
   "emoji_list.delete": "Verwijderen",
   "emoji_list.empty": "Geen Custom Emoji Gevonden",
+  "emoji_list.header": "Aangepaste emoji",
   "emoji_list.help": "Aangepaste emoji zijn beschikbaar voor iedereen op jouw server. Type ':' in een bericht venster om het emoji selectie menu zichtbaar te maken. Andere gebruikers zullen de pagina moeten verversen voordat de nieuwe emojis zichtbaar zijn.",
   "emoji_list.help2": "Tip: Als je #,## of ### als eerste karakter op een nieuwe lijn met een emoji gebruikt, kan je een grotere versie van de emoji versturen. Om te proberen, stuur een bericht als: '# :smile:'.",
   "emoji_list.image": "Afbeelding",
@@ -1208,6 +1235,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": "Lid",
   "filtered_user_list.search": "Press enter to search",
+  "filtered_user_list.searchButton": "Zoeken",
   "filtered_user_list.show": "Filter:",
   "filtered_user_list.team_only": "Leden van dit team",
   "find_team.email": "E-mail",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Gemaakt door {creator} op {createAt, date, full}",
   "installed_integrations.delete": "Verwijderen",
+  "installed_integrations.edit": "Bewerken",
   "installed_integrations.hideSecret": "Verberg Secret",
   "installed_integrations.regenSecret": "Regenereer Secret",
   "installed_integrations.regenToken": "Token opnieuw genereren",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "Slash opdrachten sturen events naar externe integraties",
   "integrations.command.title": "Slash opdracht",
   "integrations.done": "Gereed",
+  "integrations.edit": "Bewerken",
   "integrations.header": "Integraties",
   "integrations.incomingWebhook.description": "Inkomende webhooks laten externel integraties toe om berichten te sturen",
   "integrations.incomingWebhook.title": "Inkomende webhook",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": "Ieder lid kan dit kanaal lezen en volgen.",
   "intro_messages.beginning": "Begin van {name}",
   "intro_messages.channel": "kanaal",
-  "intro_messages.creator": "Dit is het begin van de <strong>{name}</strong> {type}, gemaakt door <strong>{creator}</strong> op <strong>{date}</strong>",
+  "intro_messages.creator": "Dit is de start van {name} {type}, gemaakt op {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Het begin van {display_name}</h4><p class='channel-intro__content'><strong>Welkom bij {display_name}!</strong><br/><br/>Dit is het eerste kanaal dat uw teamleden zien wanner ze zich aanmelden - gebruik het om updates te sturen naar iedereen.</p>",
   "intro_messages.group": "privé groep",
   "intro_messages.invite": "Nodig anderen uit voor: {type}",
@@ -1418,6 +1448,7 @@
   "intro_messages.noCreator": "Dit is de start van {name} {type}, gemaakt op {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Begin van {display_name}</h4><p class=\"channel-intro__content\">Dit is het begin van {display_name}, een kanaal voor niet-werk gerelateerde discussies.<br/></p>",
   "intro_messages.onlyInvited": " Alleen uitgenodigde deelnemers kunnen deze privé groep bekijken.",
+  "intro_messages.purpose": " This {type}'s purpose is: {purpose}.",
   "intro_messages.setHeader": "Stel een koptekst in",
   "intro_messages.teammate": "Dit is de start van uw privé berichten historiek met dit teamlid. Privé berichten en bestanden die hier gedeeld worden zijn niet zichtbaar voor anderen.",
   "invite_member.addAnother": "Nog iemand toevoegen",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "Team instellingen",
   "navbar_dropdown.viewMembers": "Bekijk Leden",
   "notification.dm": "Privé bericht",
+  "passwordRequirements": "Wachtwoord Vereisten: ",
   "password_form.change": "Verander mijn wachtwoord",
   "password_form.click": "Klik <a href={url}>hier</a> om in te loggen.",
   "password_form.enter": "Voer een nieuw wachtwoord in voor uw {siteName} account",
@@ -1553,7 +1585,7 @@
   "password_send.description": "Om uw wachtwoord opnieuw in te stellen voert u het e-mailadres in dat u heeft gebruikt om uzelf aan te melden",
   "password_send.email": "E-mail",
   "password_send.error": "Vul een geldig e-mail adres in.",
-  "password_send.link": "<p>Een wachtwoord reset link is verstuurd naar <b>{email}</b></p>",
+  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "Reset wachtwoord",
   "password_send.title": "Wachtwoord reset",
   "pdf_preview.max_pages": "Download om meer pagina's te lezen",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "Markeer",
   "rhs_comment.mobile.unflag": "Demarkeer",
   "rhs_comment.permalink": "Permanente koppeling",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "Terug naar Gemarkeerde Berichten",
   "rhs_header.backToResultsTooltip": "Terug naar Zoekresultaten",
   "rhs_header.closeSidebarTooltip": "Zijbalk Sluiten",
+  "rhs_header.closeTooltip": "Zijbalk Sluiten",
   "rhs_header.details": "Bericht details",
   "rhs_header.expandSidebarTooltip": "Zijbalk Uitvouwen",
+  "rhs_header.expandTooltip": "Zijbalk Invouwen",
   "rhs_header.shrinkSidebarTooltip": "Zijbalk Invouwen",
   "rhs_root.del": "Verwijderen",
   "rhs_root.direct": "Privé bericht",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "OK",
   "tutorial_tip.out": "Schakel deze tips uit.",
   "tutorial_tip.seen": "Heeft u dit al gezien? ",
+  "update_command.cancel": "Annuleren",
+  "update_command.confirm": "Slash opdracht toevoegen",
+  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.update": "Update",
   "upload_overlay.info": "Sleep hier een bestand om te uploaden.",
   "user.settings.advance.embed_preview": "Toon experimentele previews van de link inhoud wanneer deze beschikbaar is.",
   "user.settings.advance.embed_toggle": "Toon schakel optie voor alle ingesloten voorbeelden",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "Aan",
   "user.settings.notifications.onlyMentions": "Enkele voor vermeldingen en privé berichten",
   "user.settings.notifications.push": "Mobiele push notificaties",
+  "user.settings.notifications.push_notification.status": "Trigger push notificaties wanneer",
   "user.settings.notifications.sensitiveName": "Uw hoofdlettergevoelige eerste naam \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Uw niet-hoofdlettergevoelige gebruikersnaam \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Andere niet-hoofdlettergevoelige woorden, gescheiden door komma's:",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "Meldings-instellingen",
   "user.settings.notifications.usernameMention": "Uw gebruikersnaam vermeld \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Woorden die een vermelding triggeren",
+  "user.settings.push_notification.allActivity": "Voor alle activiteiten",
   "user.settings.push_notification.allActivityAway": "Voor alle activiteit wanneer afwezig of offline",
   "user.settings.push_notification.allActivityOffline": "Voor alle activiteit wanneer offline",
   "user.settings.push_notification.allActivityOnline": "Voor alle activiteit wanneer online, afwezig of offline",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "Uit",
   "user.settings.push_notification.offline": "Offline",
   "user.settings.push_notification.online": "Online, afwezig of offline",
+  "user.settings.push_notification.onlyMentions": "Voor vermeldingen en privé berichten",
   "user.settings.push_notification.onlyMentionsAway": "Voor vermeldingen en directe berichten wanneer afwezig of offline",
   "user.settings.push_notification.onlyMentionsOffline": "Voor vermeldingen en directe berichten wanneer offline",
   "user.settings.push_notification.onlyMentionsOnline": "Voor vermeldingen en directe berichten wanneer online, afwezig of offline",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Inlggen via Gitlab",
   "user.settings.security.loginLdap": "Aanmelden via AD/LDAP",
+  "user.settings.security.loginSaml": "Inlggen via Gitlab",
   "user.settings.security.logoutActiveSessions": "Bekijk en uitloggen huidige sessies",
   "user.settings.security.method": "Inlog methode",
   "user.settings.security.newPassword": "Nieuw wachtwoord",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "Aanmelden gebeurt via AD/LDAP. Uw wachtwoord kan niet bijgewerkt worden.",
   "user.settings.security.passwordMatchError": "De wachtwoorden die U ingaf zijn niet identiek",
   "user.settings.security.passwordMinLength": "Verkeerde minimale lengte, kan de voorvertoning niet tonen.",
+  "user.settings.security.passwordSamlCantUpdate": "Dit veld word gebruikt door jouw login provider. Als je het wilt veranderen, moet je dat via de login provider doen. ",
   "user.settings.security.retypePassword": "Nieuw wachtwoord herhalen",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Overschakelen naar het gebruik van email en password",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "Bekijk Toegang Geschiedenis ",
   "user_list.notFound": "Geen gebruikers gevonden",
   "user_profile.webrtc.call": "Start een video-oproep",
+  "user_profile.webrtc.offline": "The user is offline",
   "user_profile.webrtc.unavailable": "New call unavailable until your existing call ends",
   "view_image.loading": "Bezig met laden ",
   "view_image_popover.download": "Downloaden",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 52b7b881e..a32782259 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "Configuração",
   "admin.general.localization": "Regionalização",
   "admin.general.localization.availableLocalesDescription": "Defina qual idioma está disponível para os usuários em Configurações de Conta (deixe este campo em branco para ter todos os idiomas disponíveis). Se você está adicionando novos idiomas manualmente, o <strong>Idioma Padrão do Cliente</strong> precisa ser adicionado antes de salvar esta configuração.<br /><br />Gostaria de ajudar com tradução? Junte-se ao <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> para contribuir.",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "Idiomas Disponíveis:",
   "admin.general.localization.clientLocaleDescription": "Linguagem padrão para os novos usuários criados e páginas onde o usuário não esteja logado.",
   "admin.general.localization.clientLocaleTitle": "Idioma Padrão do Cliente:",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "Nome selecionado para o seu S3 bucket in AWS.",
   "admin.image.amazonS3BucketExample": "Ex.: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Obter essa credencial do seu administrador Amazon EC2.",
   "admin.image.amazonS3IdExample": "Ex.: \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
   "admin.image.amazonS3RegionDescription": "Região AWS selecionada para a criação do seu S3 bucket.",
   "admin.image.amazonS3RegionExample": "Ex.: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
+  "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": "Obter essa credencial do seu administrador Amazon EC2.",
   "admin.image.amazonS3SecretExample": "Ex.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
@@ -638,6 +644,8 @@
   "admin.service.corsTitle": "Permitir requisição cross-origin de:",
   "admin.service.developerDesc": "Quando verdadeiro, erros Javascript sã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.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Defina esta chave para permitir a exibição de títulos para pré-visualizações de vídeo do YouTube embutidos. Sem a chave, pré-visualizações do YouTube ainda serão criadas com base em hiperlinks que aparecem nas mensagens ou comentários, mas eles não vão mostrar o título do vídeo. Veja o <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> para instruções sobre como obter uma chave.",
   "admin.service.googleExample": "Ex.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "Ativar Conexões de Saída Inseguras: ",
   "admin.service.integrationAdmin": "Restringir gerenciamento de integrações aos Administradores:",
   "admin.service.integrationAdminDesc": "Quando verdadeiro, webhooks e comandos slash podem somente ser criados, editados e visualizados pelos Administradores de Equipe e Sistema, e aplicações OAuth 2.0 pelos Administradores de Sistema. Integrações estão disponíveis para todos os usuários depois delas terem sido criadas pelo Administrador.",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Endereço à Escutar:",
   "admin.service.listenDescription": "O endereço e a porta à qual se ligar e ouvir. Especificando \":8065\" irá ligar-se a todas as interfaces de rede. Especificando \"127.0.0.1:8065\" só irá ligar à interface de rede com esse endereço IP. Se você escolher uma porta de um nível mais baixo (chamadas de \"portas do sistema\" ou \"portas conhecidas\", na faixa de 0-1023), você deve ter permissões para se ligar a essa porta. No Linux, você pode usar: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" para permitir o Mattermost vincular a portas conhecidas.",
   "admin.service.listenExample": "Ex.: \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "Ativar Webhooks Saída: ",
   "admin.service.overrideDescription": "Quando verdadeiro, webhooks, comandos slash e outras integrações, como <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, terão permissão para mudar o nome do usuário dos posts. Nota: Combinado com a permissão de integrações para substituir foto do perfil, os usuários podem ser capazes de realizar ataques de phishing ao tentar passar por outros usuários.",
   "admin.service.overrideTitle": "Permitir que integrações sobrescrevam o nome do usuário:",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "Quando verdadeiro, os Administradores de Sistema são notificados por e-mail se uma relevante correção de segurança foi anunciado nos últimos 12 horas. Requer o e-mail para ser ativado.",
   "admin.service.securityTitle": "Ativar Alertas de Segurança: ",
   "admin.service.segmentDescription": "Segment.com é um serviço online que pode opcionalmente ser usado para rastrear detalhes das estatísticas do sistema. Você pode obter uma chave criando uma conta gratuita em Segment.com.",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Se o método de autenticação é SAML ou GitLab, o usuário pode automaticamente ser registrado novamente no Mattermost se já estiver conectado ao SAML ou GitLab. Depois de alterar essa configuração, a configuração terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.testingDescription": "Quando verdadeiro, comando slash /loadtest está habilitado para carregar contas e teste, dados e formatação de texto. Mudar isso exigirá um reinício do servidor antes que tenha efeito.",
   "admin.service.testingTitle": "Ativar Comandos Teste: ",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "Tamanho da sessão AD/LDAP e email (dias):",
   "admin.service.webSessionDaysDesc": "O número de dias desde a última vez que um usuário entrou suas credenciais para expirar a sessão do usuário. Depois de alterar essa configuração, a nova duração da sessão terá efeito após a próxima vez que o usuário digitar suas credenciais.",
   "admin.service.webhooksDescription": "Quando verdadeiro, webhooks de entrada serão permitidos. Para ajudar combater ataques de phishing, todas as postagens por webhook serão marcadas com uma etiqueta BOT. Veja a <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>documentação</a> para saber mais.",
   "admin.service.webhooksTitle": "Ativar Webhooks Entrada: ",
+  "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": "Adicionar equipe do menu lateral",
   "admin.sidebar.advanced": "Avançado",
   "admin.sidebar.audits": "Conformidade e Auditoria",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> gostaria de conectar a sua conta de usuário <strong>Mattermost</strong>",
   "backstage_list.search": "Pesquisar",
   "backstage_navbar.backToMattermost": "Voltar para {siteName}",
+  "backstage_sidebar.emoji": "Emoji Personalizado",
   "backstage_sidebar.integrations": "Integrações",
   "backstage_sidebar.integrations.commands": "Comandos Slash",
   "backstage_sidebar.integrations.incoming_webhooks": "Webhooks Entrada",
@@ -971,6 +992,8 @@
   "change_url.longer": "Deve ter mais de dois caracteres",
   "change_url.noUnderscore": "Não pode conter dois sublinhados consecutivos.",
   "change_url.startWithLetter": "Deve começar com uma letra ou número",
+  "channelHeader.addToFavorites": "Adicionar aos Favoritos",
+  "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}",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "Ver Informações",
   "channel_header.viewMembers": "Ver Membros",
   "channel_header.webrtc.call": "Iniciar Vídeo Chamada",
+  "channel_header.webrtc.offline": "O usuário está desconectado",
   "channel_header.webrtc.unavailable": "Nova chamada não disponível até que você termine a chamada existente",
   "channel_info.about": "Sobre",
   "channel_info.close": "Fechar",
@@ -1067,8 +1091,8 @@
   "claim.email_to_ldap.pwdError": "Por favor digite a sua senha.",
   "claim.email_to_ldap.ssoNote": "Você precisa já ter uma conta AD/LDAP válida",
   "claim.email_to_ldap.ssoType": "Ao retirar a sua conta, você só vai ser capaz de logar com AD/LDAP",
-  "claim.email_to_ldap.switchTo": "Mudar conta para AD/LDAP",
-  "claim.email_to_ldap.title": "Mudar Conta E-mail/Senha para AD/LDAP",
+  "claim.email_to_ldap.switchTo": "Alternar conta para AD/LDAP",
+  "claim.email_to_ldap.title": "Alternar Conta E-mail/Senha para AD/LDAP",
   "claim.email_to_oauth.enterPwd": "Entre a senha para o sua conta {site}",
   "claim.email_to_oauth.pwd": "Senha",
   "claim.email_to_oauth.pwdError": "Por favor digite a sua senha.",
@@ -1087,7 +1111,7 @@
   "claim.ldap_to_email.pwdNotMatch": "As senha não correspondem.",
   "claim.ldap_to_email.ssoType": "Após a alteração do tipo de conta, você só vai ser capaz de logar com seu e-mail e senha",
   "claim.ldap_to_email.switchTo": "Trocar a conta para e-mail/senha",
-  "claim.ldap_to_email.title": "Mudar Conta AD/LDAP para E-mail/Senha",
+  "claim.ldap_to_email.title": "Alternar Conta AD/LDAP para E-mail/Senha",
   "claim.oauth_to_email.confirm": "Confirmar Senha",
   "claim.oauth_to_email.description": "Após a alteração do tipo de conta, você só vai ser capaz de logar com seu e-mail e senha.",
   "claim.oauth_to_email.enterNewPwd": "Entre a nova senha para o sua conta de email no {site}",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "Trocar {type} para email e senha",
   "claim.oauth_to_email.title": "Trocar Conta {type} para E-mail",
   "confirm_modal.cancel": "Cancelar",
+  "connecting_screen": "Conexões",
   "create_comment.addComment": "Adicionar um comentário...",
   "create_comment.comment": "Adicionar Comentário",
   "create_comment.commentLength": "Tamanho dos comentários precisa ter menos de {max} caracteres.",
@@ -1108,7 +1133,7 @@
   "create_post.shortcutsNotSupported": "Atalhos do teclado não está disponível no seu dispositivo.",
   "create_post.tutorialTip": "<h4>Enviando Mensagens</h4><p>Digite aqui para escrever uma mensagem e pressione <strong>ENTER</strong> para posta-lá.</p><p>Clique no botão <strong>Anexo</strong> para enviar uma imagem ou arquivo.</p>",
   "create_post.write": "Escreva uma mensagem...",
-  "create_team.agreement": "Ao prosseguir para criar sua conta e usar {siteName}, você concorda com nosso <a href='/static/help/terms.html'>Termo de Serviço</a> e <a href='/static/help/privacy.html'>Politica de Privacidade</a>. Se você não concorda, você não pode usar {siteName}.",
+  "create_team.agreement": "Para prosseguir e criar sua conta e utilizar {siteName}, você deve concordar com o nosso <a href={TermsOfServiceLink}>Termos de Serviço</a> e com a <a href={PrivacyPolicyLink}>Política de Privacidade</a>. Se você não concordar, não poderá utilizar o {siteName}.",
   "create_team.display_name.back": "Voltar para o passo anterior",
   "create_team.display_name.charLength": "O nome deve ter 2 ou mais caracteres até um máximo de 15",
   "create_team.display_name.nameHelp": "Nome da sua equipe em qualquer idioma. Seu nome de equipe é mostrado em menus e títulos.",
@@ -1116,7 +1141,7 @@
   "create_team.display_name.required": "Este campo é obrigatório",
   "create_team.display_name.teamName": "Nome da Equipe",
   "create_team.team_url.back": "Voltar para o passo anterior",
-  "create_team.team_url.charLength": "O nome deve ter 2 ou mais caracteres até um máximo de 15",
+  "create_team.team_url.charLength": "O nome deve ter {min} ou mais caracteres até um máximo de {max}",
   "create_team.team_url.creatingTeam": "Criando equipe...",
   "create_team.team_url.finish": "Terminar",
   "create_team.team_url.hint": "<li>Curto e memorizável é o melhor</li><li>Use letras minúsculas, números e traços</li><li>Deve começar com uma letra e não pode terminar em um traço</li>",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "Salvar",
   "edit_channel_purpose_modal.title1": "Editar Propósito",
   "edit_channel_purpose_modal.title2": "Editar Propósito para ",
+  "edit_command.save": "Atualizar",
   "edit_post.cancel": "Cancelar",
   "edit_post.edit": "Editar {title}",
   "edit_post.editPost": "Editar o post...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "Criador",
   "emoji_list.delete": "Deletar",
   "emoji_list.empty": "Emoji Personalizado Não Encontrado",
+  "emoji_list.header": "Emoji Personalizado",
   "emoji_list.help": "Emojis personalizados estão disponíveis para todos no seu servidor. Digite ':' na caixa de mensagens para trazer o menu de seleção de emojis. Outros usuários podem precisar atualizar a página antes que os novos emojis apareçam.",
   "emoji_list.help2": "Dica: Se você adicionar #, ##, ou ### como primeiro caractere em uma nova linha contendo um emoji, você poderá usar emoji com tamanho maior. Para testar, envia uma mensagem como: '# :smile:'.",
   "emoji_list.image": "Imagem",
@@ -1208,6 +1235,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 membros} one {membro} other {membros}} de {total} no total",
   "filtered_user_list.member": "Membro",
   "filtered_user_list.search": "Pressione enter para procurar",
+  "filtered_user_list.searchButton": "Pesquisar",
   "filtered_user_list.show": "Filtro:",
   "filtered_user_list.team_only": "Membros desta Equipe",
   "find_team.email": "E-mail",
@@ -1238,11 +1266,11 @@
   "general_tab.yes": "Sim",
   "get_app.alreadyHaveIt": "Já tem isso?",
   "get_app.androidAppName": "Mattermost para Android",
-  "get_app.androidHeader": "Mattermost funciona melhor se você mudar para o nosso aplicativo Android",
+  "get_app.androidHeader": "Mattermost funciona melhor se você alternar para o nosso aplicativo Android",
   "get_app.continue": "continuar",
   "get_app.continueWithBrowser": "Ou {link}",
   "get_app.continueWithBrowserLink": "continuar no navegador",
-  "get_app.iosHeader": "Mattermost funciona melhor se você mudar para o nosso aplicativo iPhone",
+  "get_app.iosHeader": "Mattermost funciona melhor se você alternar para o nosso aplicativo iPhone",
   "get_app.mattermostInc": "Mattermost, Inc",
   "get_app.openMattermost": "Abrir Mattermost",
   "get_link.clipboard": " Link copiado para a área de transferência.",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Criado por {creator} em {createAt, date, full}",
   "installed_integrations.delete": "Deletar",
+  "installed_integrations.edit": "Editar",
   "installed_integrations.hideSecret": "Ocultar Segredo",
   "installed_integrations.regenSecret": "Gerar Novamente Chave Secreta",
   "installed_integrations.regenToken": "Re-gerar Token",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "Comandos slash envia evento para integrações externas",
   "integrations.command.title": "Comando Slash",
   "integrations.done": "Feito",
+  "integrations.edit": "Editar",
   "integrations.header": "Integrações",
   "integrations.incomingWebhook.description": "Webhooks de entrada permite que integrações externas envie mensagens",
   "integrations.incomingWebhook.title": "Webhooks Entrada",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " Qualquer membro pode participar e ler este canal.",
   "intro_messages.beginning": "Início do {name}",
   "intro_messages.channel": "canal",
-  "intro_messages.creator": "Este é o inicio do <strong>{name}</strong> {type}, criado por <strong>{creator}</strong> em <strong>{date}</strong>",
+  "intro_messages.creator": "Este é o início do {name} {type}, criado por {creator} em {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Inicio do {display_name}</h4><p class='channel-intro__content'><strong>Bem-vindo a {display_name}!</strong><br/><br/>Este é o primeiro canal que sua equipe de trabalho vê quando eles se inscrevem - use para postar atualizações que todos precisam saber.</p>",
   "intro_messages.group": "grupos privados",
   "intro_messages.invite": "Convidar outras pessoas para este {type}",
@@ -1418,6 +1448,7 @@
   "intro_messages.noCreator": "Este é o início do {name} {type}, criado em {date}.",
   "intro_messages.offTopic": "<h4 class=\"channel-intro__title\">Início do {display_name}</h4><p class=\"channel-intro__content\">Este é o início do {display_name}, um canal para conversas não relacionadas ao trabalho<br/></p>",
   "intro_messages.onlyInvited": " Somente membros convidados podem ver este grupo privado.",
+  "intro_messages.purpose": " O propósito deste {type} é: {purpose}.",
   "intro_messages.setHeader": "Definir um Cabeçalho",
   "intro_messages.teammate": "Este é o início de seu histórico de mensagens com esta equipe. Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas fora dessa área.",
   "invite_member.addAnother": "Adicionar outro",
@@ -1536,12 +1567,13 @@
   "navbar_dropdown.manageMembers": "Gerenciar Membros",
   "navbar_dropdown.nativeApps": "Download Aplicativos",
   "navbar_dropdown.report": "Relatar um Problema",
-  "navbar_dropdown.switchTeam": "Mudar para {team}",
-  "navbar_dropdown.switchTo": "Mudar para ",
+  "navbar_dropdown.switchTeam": "Alternar para {team}",
+  "navbar_dropdown.switchTo": "Alternar para ",
   "navbar_dropdown.teamLink": "Obter Link Convite de Equipe",
   "navbar_dropdown.teamSettings": "Configurações da Equipe",
   "navbar_dropdown.viewMembers": "Ver Membros",
   "notification.dm": "Mensagem Direta",
+  "passwordRequirements": "Requerimentos de Senha:",
   "password_form.change": "Alterar minha senha",
   "password_form.click": "Clique <a href={url}>aqui</a> para logar.",
   "password_form.enter": "Entre a nova senha para o sua conta {siteName}.",
@@ -1553,7 +1585,7 @@
   "password_send.description": "Para resetar sua senha, entre o endereço de email que você usou para se inscrever",
   "password_send.email": "E-mail",
   "password_send.error": "Por favor entre um endereço de e-mail válido.",
-  "password_send.link": "<p>Um link para resetar senha foi enviado para <b>{email}</b></p>",
+  "password_send.link": "Se a conta existir, um e-mail de redefinição de senha será enviado para: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "Resetar minha senha",
   "password_send.title": "Resetar Senha",
   "pdf_preview.max_pages": "Download para ler mais páginas",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "Marcar",
   "rhs_comment.mobile.unflag": "Desmarcar",
   "rhs_comment.permalink": "Permalink",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "Voltar para Posts Marcados",
   "rhs_header.backToResultsTooltip": "Voltar para os Resultados da Pesquisa",
   "rhs_header.closeSidebarTooltip": "Fechar a Barra Lateral",
+  "rhs_header.closeTooltip": "Fechar a Barra Lateral",
   "rhs_header.details": "Detalhes da Mensagem",
   "rhs_header.expandSidebarTooltip": "Expandir a Barra Lateral",
+  "rhs_header.expandTooltip": "Reduzir a Barra Lateral",
   "rhs_header.shrinkSidebarTooltip": "Reduzir a Barra Lateral",
   "rhs_root.del": "Deletar",
   "rhs_root.direct": "Mensagem Direta",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "Ok",
   "tutorial_tip.out": "Recusar estas dicas.",
   "tutorial_tip.seen": "Viu isso antes? ",
+  "update_command.cancel": "Cancelar",
+  "update_command.confirm": "Editar Comando Slash",
+  "update_command.question": "Suas alterações podem fazer parar de funcionar o comando slash existente. Tem a certeza de que pretende atualizá-lo?",
+  "update_command.update": "Atualizar",
   "upload_overlay.info": "Soltar um arquivo para enviá-lo.",
   "user.settings.advance.embed_preview": "Mostrar pré-visualização experimental de conteúdo de link, quando disponível",
   "user.settings.advance.embed_toggle": "Exibir mostrar/esconder para todas as pre-visualizações",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "Ligado",
   "user.settings.notifications.onlyMentions": "Somente para menções e mensagens diretas",
   "user.settings.notifications.push": "Notificações push móvel",
+  "user.settings.notifications.push_notification.status": "Disparar notificações push quando",
   "user.settings.notifications.sensitiveName": "Seu primeiro nome sensível a maiúsculas e minúsculas \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Seu usuário não sensível a maiúsculas \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Outras palavras não sensível a maiúscula, separadas por virgulas:",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "Configurações de Notificação",
   "user.settings.notifications.usernameMention": "Seu usuário mencionado \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Palavras que desencadeiam menções",
+  "user.settings.push_notification.allActivity": "Para todas as atividades",
   "user.settings.push_notification.allActivityAway": "Para toda atividade quando ausente ou desconectado",
   "user.settings.push_notification.allActivityOffline": "Para toda atividade quando desconectado",
   "user.settings.push_notification.allActivityOnline": "Para toda atividade quando conectado, ausente ou desconectado",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "Desligado",
   "user.settings.push_notification.offline": "Desconectado",
   "user.settings.push_notification.online": "Conectado, ausente ou desconectado",
+  "user.settings.push_notification.onlyMentions": "Somente para menções e mensagens diretas",
   "user.settings.push_notification.onlyMentionsAway": "Para menções e mensagens diretas quando ausente ou desconectado",
   "user.settings.push_notification.onlyMentionsOffline": "Para menções e mensagens diretas quando desconectado",
   "user.settings.push_notification.onlyMentionsOnline": "Para menções e mensagens diretas quando conectado, ausente ou desconectado",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Login feito através do GitLab",
   "user.settings.security.loginLdap": "Login feito através de AD/LDAP",
+  "user.settings.security.loginSaml": "Login feito através do SAML",
   "user.settings.security.logoutActiveSessions": "Ver e fazer Logout das Sessões Ativas",
   "user.settings.security.method": "Método de Login",
   "user.settings.security.newPassword": "Nova Senha",
@@ -2042,18 +2085,20 @@
   "user.settings.security.passwordLdapCantUpdate": "Login ocorreu através de AD/LDAP. Senha não pode ser atualizada.",
   "user.settings.security.passwordMatchError": "As novas senhas que você inseriu não correspondem.",
   "user.settings.security.passwordMinLength": "Comprimento mínimo inválido, não é possível mostrar pré-visualização.",
+  "user.settings.security.passwordSamlCantUpdate": "Este campo é tratada pelo seu provedor de login. Se você quiser mudá-lo, você precisa fazê-lo através de seu provedor de login.",
   "user.settings.security.retypePassword": "Digite Novamente a nova Senha",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Trocar para usar email e senha",
   "user.settings.security.switchGitlab": "Trocar para usar GitLab SSO",
   "user.settings.security.switchGoogle": "Trocar para usar Google SSO",
-  "user.settings.security.switchLdap": "Mudar para usar AD/LDAP",
-  "user.settings.security.switchOffice365": "Mudar para usar Office 365 SSO",
+  "user.settings.security.switchLdap": "Alternar para usar AD/LDAP",
+  "user.settings.security.switchOffice365": "Alternar para usar Office 365 SSO",
   "user.settings.security.switchSaml": "Trocar para usar SAML SSO",
   "user.settings.security.title": "Configurações de Segurança",
   "user.settings.security.viewHistory": "Ver Histórico de Acesso",
   "user_list.notFound": "Nenhum usuário encontrado",
   "user_profile.webrtc.call": "Iniciar Video Chamada",
+  "user_profile.webrtc.offline": "O usuário está desconectado",
   "user_profile.webrtc.unavailable": "Nova chamada não disponível até que você termine a chamada existente",
   "view_image.loading": "Carregando ",
   "view_image_popover.download": "Download",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index 81e8e3518..3977aec5c 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "Параметры",
   "admin.general.localization": "Локализация",
   "admin.general.localization.availableLocalesDescription": "Выберите, какие языки будут доступны пользователям в Настройках учетной записи (оставьте это поле пустым, чтобы сделать доступными все поддерживаемые языки). Если вы вручную добавляете новые языки, <strong>Язык клиента по умолчанию</strong> должен быть добавлен до сохранения этой настройки.<br /><br />Желаете помочь с переводами? Присоединяйтесь к <a href='http://translate.mattermost.com/' target='_blank'>серверу переводов Mattermost</a>, чтобы внести свой вклад.",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "Доступные языки:",
   "admin.general.localization.clientLocaleDescription": "Язык по умолчанию для новых пользователей и страниц при первом входе в систему.",
   "admin.general.localization.clientLocaleTitle": "Язык клиента по умолчанию:",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "Имя вашей S3 корзины в AWS.",
   "admin.image.amazonS3BucketExample": "Например: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Корзина:",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "Получите эти учетные данные от своего администратора Amazon EC2.",
   "admin.image.amazonS3IdExample": "Например: \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "ID ключа доступа Amazon S3:",
   "admin.image.amazonS3RegionDescription": "AWS регион, который вы выбрали для создания S3 корзины.",
   "admin.image.amazonS3RegionExample": "Например: \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Регион Amazon S3:",
+  "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": "Получите эти учетные данные от своего администратора Amazon EC2.",
   "admin.image.amazonS3SecretExample": "Например: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 секретный ключ доступа:",
@@ -638,6 +644,8 @@
   "admin.service.corsTitle": "Разрешить кроссдоменные запросы от:",
   "admin.service.developerDesc": "Когда включено, на красной панели сверху будут показываться ошибки Javascript. Не рекомендуется включать на боевом сервере.",
   "admin.service.developerTitle": "Включить режим разработчика:",
+  "admin.service.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Задайте этот ключ, чтобы включить отображение подписей к предпросмотрам встроенных YouTube-видео. Без этого ключа предпросмотры YouTube-видео по прежнему будут создаваться на основе гиперссылок, появляющихся в сообщениях или комментариях, но название видео отображаться не будет. Посмотрите <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a>, для того чтобы узнать, как получить ключ.",
   "admin.service.googleExample": "Например: 7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV",
   "admin.service.googleTitle": "Ключ Google API:",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "Разрешить Небезопасные Исходящие Соединения: ",
   "admin.service.integrationAdmin": "Ограничить управление интеграцией для администраторов:",
   "admin.service.integrationAdminDesc": "Если истина, вебхуки и слэш-команды могут быть созданы, изменены и просмотрены только командными и системными админами, а приложения OAuth 2.0 - системными админами. После того, как интеграции созданы админом, они становятся доступны всем пользователям.",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Прослушиваемый адрес:",
   "admin.service.listenDescription": "Адрес и порт для привязки и ожидания соединений. Указание \":8065\" приведет к привязке ко всем сетевым интерфейсам. Указание \"127.0.0.1:8065\" приведет к привязке к сетевому интерфейсу, с указанным IP-адресом. Если вы выбираете порт нижнего уровня (так называемые \"системные порты\" или \"хорошо известные порты\", в диапазоне 0-1023), вы должны обладать необходимыми правами, для привязку к этому порту. На Linux вы можете выполнить: \"sudo setcap cap_net_bind_service=+ep ./bin/platform\", что позволит Mattermost привязываться к известным портам.",
   "admin.service.listenExample": "Например: \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "Разрешить исходящие вебхуки: ",
   "admin.service.overrideDescription": "Если истина, вебхукам, слэш-командам и прочим интеграциям, таким как <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>, будет позволено менять имя пользователя, от имени которого они создают посты. Замечание: совместно с предоставлением интеграциям права переопределять иконки изображений профиля, пользователи могут получить возможность выполнять фишинговые атаки, пытаясь выдать себя за других пользователей.",
   "admin.service.overrideTitle": "Разрешить интеграциям переопределять имена:",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "Если включено, администратор системы получит уведомление о выходе новых обновлений безопасности анонсированных за 12 часов. Потребует включение email.",
   "admin.service.securityTitle": "Включить оповещения безопасности: ",
   "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. Если метод аутентификации - SAML или GitLab, пользователь может быть автоматически впущен обратно в Mattermost, если он уже вошел в SAML или GitLab. После изменения этого параметра он вступит в силу после следующего ввода пользователем своих учетных данных.",
   "admin.service.testingDescription": "Если истина, становится доступна слэш-команда /loadtest, предназначенная для загрузки тестовых учетных записей, данных и форматирования текста. Изменение этого параметра требует перезагрузки сервера для вступления в силу.",
   "admin.service.testingTitle": "Разрешить команды тестирования: ",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "Продолжительность сессии AD/LDAP и электронной почты (в днях):",
   "admin.service.webSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. После изменения этого параметра, новая продолжительность сессии вступит в силу после следующего ввода пользователями своих учетных данных.",
   "admin.service.webhooksDescription": "Если истина, входящие вебхуки будут разрешены. В целях борьбы с фишинговыми атаками, все посты от имени вебхуков будут помечены тэгом БОТ. Смотрите <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>документацию</a>, чтобы узнать больше.",
   "admin.service.webhooksTitle": "Включить входящие Webhook'и: ",
+  "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": "Добавить команду из меню боковой панели",
   "admin.sidebar.advanced": "Дополнительно",
   "admin.sidebar.audits": "Аудит",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> желает подключиться к вашей <strong>Mattermost</strong> учетной записи",
   "backstage_list.search": "Поиск",
   "backstage_navbar.backToMattermost": "Возврат к {siteName}",
+  "backstage_sidebar.emoji": "Пользовательские смайлы",
   "backstage_sidebar.integrations": "Интеграция",
   "backstage_sidebar.integrations.commands": "Cлэш-команды",
   "backstage_sidebar.integrations.incoming_webhooks": "Входящие Webhook'и",
@@ -971,6 +992,8 @@
   "change_url.longer": "Должен быть больше двух символов",
   "change_url.noUnderscore": "Can not contain two underscores in a row.",
   "change_url.startWithLetter": "Должен начинаться с буквы или цифры",
+  "channelHeader.addToFavorites": "Добавить в избранное",
+  "channelHeader.removeFromFavorites": "Удалить из избранного",
   "channel_flow.alreadyExist": "Канал с таким URL уже существует",
   "channel_flow.changeUrlDescription": "Некоторые символы не разрешены в URL-адресе и могут быть удалены.",
   "channel_flow.changeUrlTitle": "Изменить URL-адрес {term}",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "Информация",
   "channel_header.viewMembers": "Просмотреть список участников",
   "channel_header.webrtc.call": "Видеовызов",
+  "channel_header.webrtc.offline": "The user is offline",
   "channel_header.webrtc.unavailable": "Новый вызов недоступен до завершения текущего вызова",
   "channel_info.about": "О канале",
   "channel_info.close": "Закрыть",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "Перейти с {type} к использованию e-mail и пароля",
   "claim.oauth_to_email.title": "Switch {type} Account to Email",
   "confirm_modal.cancel": "Отмена",
+  "connecting_screen": "Подключения",
   "create_comment.addComment": "Добавить комментарий...",
   "create_comment.comment": "Добавить комментарий",
   "create_comment.commentLength": "Длина комментария должна быть меньше {max} символов.",
@@ -1108,7 +1133,7 @@
   "create_post.shortcutsNotSupported": "Горячие клавиши не поддерживаются на вашем устройстве.",
   "create_post.tutorialTip": "<h4>Отправка сообщений</h4><p>Напишите здесь сообщение и нажмите <strong>Enter</strong> для отправки.</p><p>Нажмите кнопку <strong>Вложение</strong> для загрузки изображения или файла.</p>",
   "create_post.write": "Ваше сообщение...",
-  "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
+  "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href={TermsOfServiceLink}>Terms of Service</a> and <a href={PrivacyPolicyLink}>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
   "create_team.display_name.back": "На предыдущий шаг",
   "create_team.display_name.charLength": "Имя должно быть больше двух символов и меньше 15",
   "create_team.display_name.nameHelp": "Название команды на любом языке. Название команды будет показано в меню и заголовках.",
@@ -1116,7 +1141,7 @@
   "create_team.display_name.required": "Обязательное поле",
   "create_team.display_name.teamName": "Название команды",
   "create_team.team_url.back": "На предыдущий шаг",
-  "create_team.team_url.charLength": "Имя должно быть больше 2 букв и меньше 15",
+  "create_team.team_url.charLength": "Имя должно быть больше {min} символов и не больше {max}",
   "create_team.team_url.creatingTeam": "Создание команды...",
   "create_team.team_url.finish": "Готово",
   "create_team.team_url.hint": "<li>Short and memorable is best</li><li>Use lowercase letters, numbers and dashes</li><li>Must start with a letter and can't end in a dash</li>",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "Сохранить",
   "edit_channel_purpose_modal.title1": "Редактировать Назначение",
   "edit_channel_purpose_modal.title2": "Редактировать назначение для ",
+  "edit_command.save": "Update",
   "edit_post.cancel": "Отмена",
   "edit_post.edit": "Редактировать {title}",
   "edit_post.editPost": "Редактировать сообщение...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "Автор",
   "emoji_list.delete": "Удалить",
   "emoji_list.empty": "Не найдено загруженного эмодзи",
+  "emoji_list.header": "Пользовательские смайлы",
   "emoji_list.help": "Пользовательские смайлы доступны для всех на вашем сервере. Введите ':' в окне сообщения, чтобы открыть меню выбора смайла. Другим пользователям, возможно, потребуется обновить страницу, прежде чем появятся новые смайлы.",
   "emoji_list.help2": "Совет: Если вы добавите #, ## или ### в начале строки со смайлом, то получите смайл большего размера. Чтобы попробовать, отправьте сообщение: '# :smile:'.",
   "emoji_list.image": "Изображения",
@@ -1208,6 +1235,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.search": "Нажмите Enter для поиска",
+  "filtered_user_list.searchButton": "Поиск",
   "filtered_user_list.show": "Фильтр:",
   "filtered_user_list.team_only": "Участники команды",
   "find_team.email": "Email",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
   "installed_integrations.delete": "Удалить",
+  "installed_integrations.edit": "Редактировать",
   "installed_integrations.hideSecret": "Скрыть Secret",
   "installed_integrations.regenSecret": "Перегенерировать Secret",
   "installed_integrations.regenToken": "Регенерировать токен",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "Slash commands send events to external integrations",
   "integrations.command.title": "Slash Command",
   "integrations.done": "Завершено",
+  "integrations.edit": "Редактировать",
   "integrations.header": "Интеграция",
   "integrations.incomingWebhook.description": "Incoming webhooks allow external integrations to send messages",
   "integrations.incomingWebhook.title": "Входящие Webhook'и",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " Любой участник может зайти и читать этот канал.",
   "intro_messages.beginning": "Начала общения с {name}",
   "intro_messages.channel": "канал",
-  "intro_messages.creator": "This is the start of the <strong>{name}</strong> {type}, created by <strong>{creator}</strong> on <strong>{date}</strong>",
+  "intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
   "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}",
@@ -1418,6 +1448,7 @@
   "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.setHeader": "Установить заголовок",
   "intro_messages.teammate": "Начало истории личных сообщений с участником. Личные сообщения и файлы доступны здесь и не видны за пределами этой области.",
   "invite_member.addAnother": "Добавить следующего",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "Настройки команды",
   "navbar_dropdown.viewMembers": "Просмотреть список участников",
   "notification.dm": "Прямое сообщение",
+  "passwordRequirements": "Требования к паролю:",
   "password_form.change": "Изменить пароль",
   "password_form.click": "Щёлкните <a href={url}>сюда</a> для входа в систему.",
   "password_form.enter": "Enter a new password for your {siteName} account.",
@@ -1553,7 +1585,7 @@
   "password_send.description": "Для сброса пароля введите email адрес, использованный при регистрации",
   "password_send.email": "Email",
   "password_send.error": "Пожалуйста, введите корректный email.",
-  "password_send.link": "<p>Ссылка для сброса пароля отправлена на <b>{email}</b></p>",
+  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "Сбросить пароль",
   "password_send.title": "Сброс пароля",
   "pdf_preview.max_pages": "Скачать для просмотра дополнительных страниц",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "Флаг",
   "rhs_comment.mobile.unflag": "Не помечено",
   "rhs_comment.permalink": "Постоянная ссылка",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "Вернуться к отмеченным сообщениям",
   "rhs_header.backToResultsTooltip": "Назад к результатам поиска",
   "rhs_header.closeSidebarTooltip": "Закрыть боковую панель",
+  "rhs_header.closeTooltip": "Закрыть боковую панель",
   "rhs_header.details": "Детали сообщения",
   "rhs_header.expandSidebarTooltip": "Развернуть боковую панель",
+  "rhs_header.expandTooltip": "Сжать боковую панель",
   "rhs_header.shrinkSidebarTooltip": "Сжать боковую панель",
   "rhs_root.del": "Удалить",
   "rhs_root.direct": "Прямое сообщение",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "Хорошо",
   "tutorial_tip.out": "Opt out of these tips.",
   "tutorial_tip.seen": "Уже видели? ",
+  "update_command.cancel": "Отмена",
+  "update_command.confirm": "Добавить слэш-команду",
+  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.update": "Update",
   "upload_overlay.info": "Drop a file to upload it.",
   "user.settings.advance.embed_preview": "Показывать \"экспериментальный\" превью в ссылках, когда доступно",
   "user.settings.advance.embed_toggle": "Show toggle for all embed previews",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "Вкл",
   "user.settings.notifications.onlyMentions": "Только при упоминаниях и личных сообщениях",
   "user.settings.notifications.push": "Мобильные push-уведомленя",
+  "user.settings.notifications.push_notification.status": "Отправить push-уведомление когда",
   "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Ваше независимое от регистра имя пользователя \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Другие независящие от регистра слова, разделенные запятыми:",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "Настройки уведомлений",
   "user.settings.notifications.usernameMention": "Ваше имя пользователя упомянутое как \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "Ключевые слова для упоминаний",
+  "user.settings.push_notification.allActivity": "При любой активности",
   "user.settings.push_notification.allActivityAway": "Для всей активности когда отошел или оффлайн",
   "user.settings.push_notification.allActivityOffline": "Для всей активности когда оффлайн",
   "user.settings.push_notification.allActivityOnline": "Для всей активности когда онлайн, отошел или оффлайн",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "Выкл",
   "user.settings.push_notification.offline": "Не в сети",
   "user.settings.push_notification.online": "В сети, нет на месте или не в сети",
+  "user.settings.push_notification.onlyMentions": "For mentions and direct messages",
   "user.settings.push_notification.onlyMentionsAway": "При упоминаниях и личных сообщениях, когда отошел или не в сети",
   "user.settings.push_notification.onlyMentionsOffline": "При упоминаниях и личных сообщениях, когда не в сети",
   "user.settings.push_notification.onlyMentionsOnline": "При упоминаниях и личных сообщениях, когда в сети, отошел или не в сети",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Вход выполнен через Gitlab",
   "user.settings.security.loginLdap": "Вход выполнен через AD/LDAP",
+  "user.settings.security.loginSaml": "Вход выполнен через Gitlab",
   "user.settings.security.logoutActiveSessions": "Просмотр и завершение активных сессий",
   "user.settings.security.method": "Методы входа",
   "user.settings.security.newPassword": "Новый пароль",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "Вход произведен через AD/LDAP. Пароль не может быть обновлен.",
   "user.settings.security.passwordMatchError": "Введенные пароли не совпадают.",
   "user.settings.security.passwordMinLength": "Длина пароля меньше минимальной, предпросмотр невозможен.",
+  "user.settings.security.passwordSamlCantUpdate": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
   "user.settings.security.retypePassword": "Повторите новый пароль",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Перейти к использованию e-mail и пароль",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "Просмотр истории доступа",
   "user_list.notFound": "Пользователи не найдены",
   "user_profile.webrtc.call": "Видеовызов",
+  "user_profile.webrtc.offline": "The user is offline",
   "user_profile.webrtc.unavailable": "Новый вызов недоступен до завершения текущего",
   "view_image.loading": "Загрузка ",
   "view_image_popover.download": "Скачать",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index c9af2fb6f..6a32eff4f 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "配置",
   "admin.general.localization": "本地化",
   "admin.general.localization.availableLocalesDescription": "设置用户在帐号设置可用的语言（留空将可用所有语言）。如果您手动添加新语言，必须在保存钱先添加<strong>默认客户端语言</strong>。<br /><br />想要帮忙翻译吗？加入<a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻译服务器</a>。",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "可用的语言：",
   "admin.general.localization.clientLocaleDescription": "新创建的用户以及未登入的用户的默认语言。",
   "admin.general.localization.clientLocaleTitle": "默认客户端语言：",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "您在AWS S3 存储桶中的名字。",
   "admin.image.amazonS3BucketExample": "例如 \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 存储桶：",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "从您的Amazon EC2管理员获得此证书。",
   "admin.image.amazonS3IdExample": "例如 \"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 访问密钥 ID：",
   "admin.image.amazonS3RegionDescription": "您创建S3 存储桶选中的AWS区域。",
   "admin.image.amazonS3RegionExample": "例如 \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3区域：",
+  "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": "从你的Amazon EC2管理员获得此证书。",
   "admin.image.amazonS3SecretExample": "例如 \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 秘密访问密钥：",
@@ -638,6 +644,8 @@
   "admin.service.corsTitle": "允许来自以下跨源请求网址：",
   "admin.service.developerDesc": "开启时，Javascript错误将显示在页面顶端红条里。不推荐在正式环境使用。",
   "admin.service.developerTitle": "开启开发者模式：",
+  "admin.service.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "设置此钥匙以开启内嵌YouTube视频预览。如果没有此钥匙，YouTube预览仍然会在消息或评论中显示但不会显示视频标题。参见<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a>教程以获得钥匙。",
   "admin.service.googleExample": "例如 \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API 钥匙：",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "启用不安全的对外连接：",
   "admin.service.integrationAdmin": "限制只有管理员能管理整合：",
   "admin.service.integrationAdminDesc": "当设为是时，webhhoks 和斜杠命令只由团队和系统管理员可以创建、修改和查看，同时只有系统管理员可以操作 OAuth 2.0 应用。整合在管理员创建后所有人可以使用。",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "监听地址：",
   "admin.service.listenDescription": "绑定和监听的地址和端口。指定 \":8065\" 将会绑定所有网络接口。指定 \"127.0.0.1:8065\" 将只绑定拥有此 IP 的网络接口。如果您选择一个低级端口 (叫 \"system ports\" 或 \"well-known ports\" 于 0-1023 之间)，您必须要拥有权限才能绑定到此端口。在 Linux 上您可以使用：\"sudo setcap cap_net_bind_service=+ep ./bin/platform\" 以允许 Mattermost 绑定知名端口。",
   "admin.service.listenExample": "例如 \":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "启用对外 Webhooks：",
   "admin.service.overrideDescription": "当设为是时，webhooks、斜杠命令以及其他整合比如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a> 会允许修改发出信息的用户名。注意：和允许整合覆盖头像配合将可能造成用户被钓鱼攻击。",
   "admin.service.overrideTitle": "允许整合覆盖用户名：",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "当设置为是时，如果在过去12小时内有发布安全修正将会发送通知给系统管理员。需要启用电子邮件。",
   "admin.service.securityTitle": "启用安全警报：",
   "admin.service.segmentDescription": "Segment.com是个可选详细跟踪系统统计的在线服务。您可以在Segment.com注册个免费帐号获取钥匙。",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。如果验证方式时SAML或GitLab，用户将会自动登入到Mattermost如果他们已经登入到SAML或GitLab。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.testingDescription": "当设为是时，/loadtest 斜杠命令能载入测试账号，数据和文字格式。修改这个设置需要重启服务器才能生效。",
   "admin.service.testingTitle": "启动测试指令：",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "AD/LDAP 和电子邮件的会话时长 (天)：",
   "admin.service.webSessionDaysDesc": "从用户上一次输入他们的认证到会话过期的天数。修改此设定后，新的会话时常将在用户下一次输入认证后生效。",
   "admin.service.webhooksDescription": "设为是时，允许传入webhooks。为了避免钓鱼攻击，所有webhooks的帖文会标上BOT标签。参见 <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文档</a> 了解详情。",
   "admin.service.webhooksTitle": "启用传出的 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": "从侧边栏菜单添加团队",
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> 想要链接到您的 <strong>Mattermost</strong> 用户帐号",
   "backstage_list.search": "搜索",
   "backstage_navbar.backToMattermost": "返回{siteName}",
+  "backstage_sidebar.emoji": "自定义表情",
   "backstage_sidebar.integrations": "集成",
   "backstage_sidebar.integrations.commands": "斜杠命令",
   "backstage_sidebar.integrations.incoming_webhooks": "引入Webhooks",
@@ -971,6 +992,8 @@
   "change_url.longer": "必须超过两个字符",
   "change_url.noUnderscore": "不能包含两个连续的下划线。",
   "change_url.startWithLetter": "必须以字母或数字开始",
+  "channelHeader.addToFavorites": "添加到收藏",
+  "channelHeader.removeFromFavorites": "从收藏中移除",
   "channel_flow.alreadyExist": "已存在使用该 URL 的频道",
   "channel_flow.changeUrlDescription": "某些字符不允许出现在url中，可能被删除。",
   "channel_flow.changeUrlTitle": "修改{term}URL",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "查看信息",
   "channel_header.viewMembers": "查看成员",
   "channel_header.webrtc.call": "开始视频通话",
+  "channel_header.webrtc.offline": "此用户已离线",
   "channel_header.webrtc.unavailable": "不能在结束当前通话前开新通话",
   "channel_info.about": "关于",
   "channel_info.close": "关闭",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "切换{type}为邮箱和密码",
   "claim.oauth_to_email.title": "切换{type}账户为邮箱",
   "confirm_modal.cancel": "取消",
+  "connecting_screen": "连接",
   "create_comment.addComment": "添加一个评论...",
   "create_comment.comment": "添加评论",
   "create_comment.commentLength": "评论长度至少{max}字符。",
@@ -1108,7 +1133,7 @@
   "create_post.shortcutsNotSupported": "您的设备不支持键盘快捷键。",
   "create_post.tutorialTip": "<h4>发送信息</h4><p>在这输入信息并按<strong>回车</strong>发送。</p><p>点击<strong>附件</strong>按钮上传图片或文件。</p>",
   "create_post.write": "写一个消息...",
-  "create_team.agreement": "如果继续创建您的帐户和使用{siteName}，您需要同意<a href='/static/help/terms.html'>服务条款</a>和<a href='/static/help/privacy.html'>隐私政策</a>。如果不同意，您将不能使用{siteName}。",
+  "create_team.agreement": "如果继续创建您的帐户和使用{siteName}，您需要同意<a href={TermsOfServiceLink}>服务条款</a>和<a href={PrivacyPolicyLink}>隐私政策</a>。如果不同意，您将不能使用{siteName}。",
   "create_team.display_name.back": "返回上一步",
   "create_team.display_name.charLength": "名称必须是2到15个字符",
   "create_team.display_name.nameHelp": "您可以使用任何语言命名您的团队。您的团队名称将显示在菜单和标题栏上。",
@@ -1116,7 +1141,7 @@
   "create_team.display_name.required": "此栏必须填写",
   "create_team.display_name.teamName": "团队名称",
   "create_team.team_url.back": "返回上一步",
-  "create_team.team_url.charLength": "名称必须是2到15个字符",
+  "create_team.team_url.charLength": "名称必须是 {min} 到 {max} 个字符",
   "create_team.team_url.creatingTeam": "创建团队...",
   "create_team.team_url.finish": "完成",
   "create_team.team_url.hint": "<li>简短和易记为最好的</li><li>使用小写字母，数字和连字符</li><li>必须以字母开头且不能以连字符结尾</li>",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "保存",
   "edit_channel_purpose_modal.title1": "编辑用途",
   "edit_channel_purpose_modal.title2": "编辑用途",
+  "edit_command.save": "更新",
   "edit_post.cancel": "取消",
   "edit_post.edit": "编辑{title}",
   "edit_post.editPost": "编辑信息...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "创建者",
   "emoji_list.delete": "删除",
   "emoji_list.empty": "未找到自定义表情符",
+  "emoji_list.header": "自定义表情",
   "emoji_list.help": "自定义表情符对所有在您服务器上的用户开放。在信息框输入 ':' 会显示表情符选择菜单。其他用户可能需要刷新页面才能看见新的表情符。",
   "emoji_list.help2": "提示：如果您用 #，##，或 ### 作为含有表情符的新一行开头，你可以使用大尺寸表情符。输入 '# :smile:' 来体验此功能。",
   "emoji_list.image": "图像",
@@ -1208,6 +1235,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count} 位成员，共 {total} 位",
   "filtered_user_list.member": "成员",
   "filtered_user_list.search": "按回车键搜索",
+  "filtered_user_list.searchButton": "搜索",
   "filtered_user_list.show": "过滤器：",
   "filtered_user_list.team_only": "本团队成员",
   "find_team.email": "电子邮件",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "Content-Type: {contentType}",
   "installed_integrations.creation": "{creator}在{createAt, date, full}中创建",
   "installed_integrations.delete": "删除",
+  "installed_integrations.edit": "编辑",
   "installed_integrations.hideSecret": "隐藏密码",
   "installed_integrations.regenSecret": "重生成盐",
   "installed_integrations.regenToken": "重新生成Token",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "发送事件到外部整合的斜杠命令",
   "integrations.command.title": "斜线命令",
   "integrations.done": "完成",
+  "integrations.edit": "编辑",
   "integrations.header": "集成",
   "integrations.incomingWebhook.description": "传入的webhooks允许外部集成发送信息",
   "integrations.incomingWebhook.title": "引入Webhook",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " 任何成员可以加入和查看这个频道。",
   "intro_messages.beginning": "{name} 的开端",
   "intro_messages.channel": "频道",
-  "intro_messages.creator": "这是<strong>{name}</strong>{type}的开端，由<strong>{creator}</strong>在<strong>{date}</strong>建立",
+  "intro_messages.creator": "这是{name}{type}的开端，由{creator}于{date}建立。",
   "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}",
@@ -1418,6 +1448,7 @@
   "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": "此{type}的用途是：{purpose}。",
   "intro_messages.setHeader": "设置标题",
   "intro_messages.teammate": "这是您与此团队成员私信记录的开端。在这里的直接消息和文件共享除了在此的人外无法看到。",
   "invite_member.addAnother": "添加另一个",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "团队设置",
   "navbar_dropdown.viewMembers": "查看成员",
   "notification.dm": "私信",
+  "passwordRequirements": "密码要求：",
   "password_form.change": "修改我的密码",
   "password_form.click": "点击<a href={url}>这里</a>去登录。",
   "password_form.enter": "输入您的 {siteName} 账户新密码。",
@@ -1553,7 +1585,7 @@
   "password_send.description": "重置您的密码，输入您用于注册的电子邮件地址",
   "password_send.email": "电子邮件",
   "password_send.error": "请输入一个有效的电子邮件地址。",
-  "password_send.link": "<p>一个密码重置链接已被发送至<b>{email}</b></p>",
+  "password_send.link": "如果帐号是已存在的，密码重置邮件会发送到：<br/><b>{email}</b><br/><br/>",
   "password_send.reset": "重置我的密码",
   "password_send.title": "密码重置",
   "pdf_preview.max_pages": "下载以阅读更多页",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "标记",
   "rhs_comment.mobile.unflag": "取消标记",
   "rhs_comment.permalink": "永久链接",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "回到已标记的信息",
   "rhs_header.backToResultsTooltip": "回到搜索结果",
   "rhs_header.closeSidebarTooltip": "关闭侧栏",
+  "rhs_header.closeTooltip": "关闭侧栏",
   "rhs_header.details": "消息详情",
   "rhs_header.expandSidebarTooltip": "扩展侧边栏",
+  "rhs_header.expandTooltip": "关闭侧栏",
   "rhs_header.shrinkSidebarTooltip": "关闭侧栏",
   "rhs_root.del": "删除",
   "rhs_root.direct": "私信",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "确定",
   "tutorial_tip.out": "选择退出这些提示。",
   "tutorial_tip.seen": "之前见过这吗？",
+  "update_command.cancel": "取消",
+  "update_command.confirm": "编辑斜杠命令",
+  "update_command.question": "您的修改可能破坏现有的斜杠命令。您确定要更新吗？",
+  "update_command.update": "更新",
   "upload_overlay.info": "拖动文件上传。",
   "user.settings.advance.embed_preview": "可用时，显示实验性链接内容预览",
   "user.settings.advance.embed_toggle": "显示切换所有嵌入预览",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "开启",
   "user.settings.notifications.onlyMentions": "只在提及和私信中",
   "user.settings.notifications.push": "手机推送信息提示",
+  "user.settings.notifications.push_notification.status": "触发推送通知当",
   "user.settings.notifications.sensitiveName": "您的敏感姓\"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "不区分大小写的用户名\"{username}\"",
   "user.settings.notifications.sensitiveWords": "其他不区分大小写的词汇，以逗号分隔：",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "通知设置",
   "user.settings.notifications.usernameMention": "您提到的用户名“@{username}”",
   "user.settings.notifications.wordsTrigger": "触发提及词",
+  "user.settings.push_notification.allActivity": "所有活动",
   "user.settings.push_notification.allActivityAway": "所有离开或离线时的活动",
   "user.settings.push_notification.allActivityOffline": "所有离线时的活动",
   "user.settings.push_notification.allActivityOnline": "所有在线，离开或离线时的活动",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "关闭",
   "user.settings.push_notification.offline": "离线",
   "user.settings.push_notification.online": "在线，离开或离线",
+  "user.settings.push_notification.onlyMentions": "仅限提及和私信中",
   "user.settings.push_notification.onlyMentionsAway": "所有离开或离线时的提及和私信",
   "user.settings.push_notification.onlyMentionsOffline": "所有离线时的提及和私信",
   "user.settings.push_notification.onlyMentionsOnline": "所有在线，离开或离线时的提及和私信",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "用 GitLab 登录",
   "user.settings.security.loginLdap": "用 AD/LDAP 登录",
+  "user.settings.security.loginSaml": "用 SAML 登录",
   "user.settings.security.logoutActiveSessions": "查看并退出正在执行的会话",
   "user.settings.security.method": "登录方式",
   "user.settings.security.newPassword": "新密码",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "通过 AD/LDAP 登录。密码不能被更新。",
   "user.settings.security.passwordMatchError": "您输入的新密码不一致。",
   "user.settings.security.passwordMinLength": "无效最小长度，无法显示预览。",
+  "user.settings.security.passwordSamlCantUpdate": "此栏由您的登入提供商决定。如果您想更改，您需要到您的登入提供者改动。",
   "user.settings.security.retypePassword": "再次输入新密码",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "切换到使用邮箱和密码登录",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "查看访问历史",
   "user_list.notFound": "没有找到用户",
   "user_profile.webrtc.call": "开始视频通话",
+  "user_profile.webrtc.offline": "此用户已离线",
   "user_profile.webrtc.unavailable": "不能在结束当前通话前开新通话",
   "view_image.loading": "加载中 ",
   "view_image_popover.download": "下载",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index b03e03a1d..976088710 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -298,6 +298,8 @@
   "admin.general.configuration": "設定",
   "admin.general.localization": "語言",
   "admin.general.localization.availableLocalesDescription": "設定在帳號設定中使用者可以使用哪些語言 (留空則為全部支援的語言) 。如果要手動增加新語言，必須包含<strong>預設的用戶端語言</strong>在內。<br/><br/>想要幫忙翻譯嘛？加入 <a href='http://translate.mattermost.com/' target='_blank'>Mattermost 翻譯伺服器</a> 來幫忙。",
+  "admin.general.localization.availableLocalesNoResults": "No results found",
+  "admin.general.localization.availableLocalesNotPresent": "The default client language must be included in the available list",
   "admin.general.localization.availableLocalesTitle": "可用語言：",
   "admin.general.localization.clientLocaleDescription": "新建使用者及未登入頁面的預設語言。",
   "admin.general.localization.clientLocaleTitle": "預設的用戶端語言：",
@@ -348,12 +350,16 @@
   "admin.image.amazonS3BucketDescription": "輸入 AWS S3 儲存貯體的名稱.",
   "admin.image.amazonS3BucketExample": "如：\"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 儲存貯體：",
+  "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+  "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
   "admin.image.amazonS3IdDescription": "從 Amazon EC2 管理員取得認證。",
   "admin.image.amazonS3IdExample": "如：\"AKIADTOVBGERKLCBV\"",
   "admin.image.amazonS3IdTitle": "Amazon S3 存取金鑰識別碼：",
   "admin.image.amazonS3RegionDescription": "選擇建立 S3 儲存貯體時選用的 AWS 區域。",
   "admin.image.amazonS3RegionExample": "如：\"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 區域：",
+  "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": "從 Amazon EC2 管理員取得認證。",
   "admin.image.amazonS3SecretExample": "如：\"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret 存取金鑰：",
@@ -638,6 +644,8 @@
   "admin.service.corsTitle": "允許來自下列網址的跨站請求：",
   "admin.service.developerDesc": "啟用時，Javascript 錯誤會顯示在使用者界面頂端上的紅色橫欄。不建議在正式環境中使用。",
   "admin.service.developerTitle": "啟用開發者模式：",
+  "admin.service.forward80To443": "Forward port 80 to 443:",
+  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "設定此金鑰以啟用顯示內嵌預覽 YouTube 影片的標題。即使沒有金鑰，訊息或註解有連結一樣會建立 YouTube 影片預覽，但是這些預覽無法顯示影片標題。請看 <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">Google Developers Tutorial</a> 的指示以取得金鑰。",
   "admin.service.googleExample": "例：\"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API 金鑰：",
@@ -647,6 +655,8 @@
   "admin.service.insecureTlsTitle": "啟用不安全的對外連線：",
   "admin.service.integrationAdmin": "限制只有管理員能管理外部整合：",
   "admin.service.integrationAdminDesc": "啟用時，Webhook 跟斜線命令將只有團隊與系統管理員能夠建立、編輯跟觀看，OAuth 2.0 應用程式將只有系統管理員能夠操作。外部整合在被管理員建立之後將會對所有使用者開放。",
+  "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
+  "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "監聽位址：",
   "admin.service.listenDescription": "綁定並監聽的位址與通訊埠。輸入\":8065\"會跟所有的網路界面綁定。輸入\"127.0.0.1:8065\"會僅與擁有該 IP 位址的網路界面綁定。如果選取了較低的通訊埠(稱為\"系統通訊埠\"或是\"常見通訊埠\"，介於 0 到 1023 之間)，您必須擁有與該通訊埠綁定的權限。在 Linux 上可以用 \"sudo setcap cap_net_bind_service=+ep ./bin/platform\" 來允許 Mattermost 與那些通訊埠綁定。",
   "admin.service.listenExample": "如：\":8065\"",
@@ -658,6 +668,8 @@
   "admin.service.outWebhooksTitle": "啟用傳出的 Webhook：",
   "admin.service.overrideDescription": "啟用時，將允許 Webhook 以及斜線命令還有其他整合功能 (如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target=\"_blank\">Zapier</a>) 修改發文時的使用者名稱。註：此功能跟允許覆蓋圖示並用時有導致釣魚攻擊的可能性。",
   "admin.service.overrideTitle": "允許外部整合功能置換使用者名稱：",
+  "admin.service.readTimeout": "Read Timeout:",
+  "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "啟用時，如果過去12小時內有發布相關的安全性修正，將會寄發通知信給系統管理者。需要啟用電子郵件功能。",
   "admin.service.securityTitle": "啟用安全性示警: ",
   "admin.service.segmentDescription": "Segment.com 是個可以用來追蹤詳細系統使用狀況的線上服務。您可以在 Segment.com 註冊一個免費帳號以獲取金鑰。",
@@ -673,10 +685,18 @@
   "admin.service.ssoSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。如果認證方式是 SAML 或 GitLab 且他們已經登入 SAML 或 GitLab，使用者將會自動再次登入 Mattermost。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.testingDescription": "啟用時，將啟用 /loadtest 斜線命令，該命令會載入測試帳號、資料以及文字格式。修改此項需要重啟伺服器以生效。",
   "admin.service.testingTitle": "啟用測試指令：",
+  "admin.service.tlsCertFile": "TLS Certificate File:",
+  "admin.service.tlsCertFileDescription": "The certificate file to use.",
+  "admin.service.tlsKeyFile": "TLS Key File:",
+  "admin.service.tlsKeyFileDescription": "The private key file to use.",
+  "admin.service.useLetsEncrypt": "Use Let's Encrypt:",
+  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
   "admin.service.webSessionDays": "AD/LDAP 和電子郵件的工作階段長度(以天計)：",
   "admin.service.webSessionDaysDesc": "從使用者最後一次輸入他們的認證到工作階段過期之間的天數。修改設定之後新的工作階段長度會在下次使用者輸入認證之後開始生效。",
   "admin.service.webhooksDescription": "啟用時，允許傳入的 Webhook。為了避免釣魚攻擊，所有來自 Webhook 的貼文都會被標上 BOT 標籤。請參閱<a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>文件</a>。",
   "admin.service.webhooksTitle": "啟用傳出的 Webhook：",
+  "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": "從側邊欄選單加入團隊",
   "admin.sidebar.advanced": "進階",
   "admin.sidebar.audits": "規範與審計",
@@ -957,6 +977,7 @@
   "authorize.title": "<strong>{appName}</strong> 想要連接到您的 <strong>Mattermost</strong> 使用者帳號",
   "backstage_list.search": "搜尋",
   "backstage_navbar.backToMattermost": "回到 {siteName}",
+  "backstage_sidebar.emoji": "自訂繪文字",
   "backstage_sidebar.integrations": "整合",
   "backstage_sidebar.integrations.commands": "斜線命令",
   "backstage_sidebar.integrations.incoming_webhooks": "傳入的 Webhook",
@@ -971,6 +992,8 @@
   "change_url.longer": "長度必須大於2個字元",
   "change_url.noUnderscore": "不允許包含兩個連續的底線",
   "change_url.startWithLetter": "必須以字元或數字開頭",
+  "channelHeader.addToFavorites": "新增至我的最愛",
+  "channelHeader.removeFromFavorites": "從我的最愛中移除",
   "channel_flow.alreadyExist": "該網址的頻道已經存在",
   "channel_flow.changeUrlDescription": "有網址不允許使用的字元時會自動移除。",
   "channel_flow.changeUrlTitle": "變更 {term} 網址",
@@ -997,6 +1020,7 @@
   "channel_header.viewInfo": "檢視資訊",
   "channel_header.viewMembers": "檢視成員",
   "channel_header.webrtc.call": "開始視訊通話",
+  "channel_header.webrtc.offline": "The user is offline",
   "channel_header.webrtc.unavailable": "在當前通訊結束前不能建立新的通訊",
   "channel_info.about": "關於",
   "channel_info.close": "關閉",
@@ -1097,6 +1121,7 @@
   "claim.oauth_to_email.switchTo": "切換 {type} 至電子郵件地址及密碼",
   "claim.oauth_to_email.title": "由 {type} 帳號切換成電子郵件地址",
   "confirm_modal.cancel": "取消",
+  "connecting_screen": "連線",
   "create_comment.addComment": "新增註解...",
   "create_comment.comment": "新增註解",
   "create_comment.commentLength": "註解長度請少於 {max} 字元。",
@@ -1156,6 +1181,7 @@
   "edit_channel_purpose_modal.save": "儲存",
   "edit_channel_purpose_modal.title1": "編輯用途",
   "edit_channel_purpose_modal.title2": "編輯用途。目標：",
+  "edit_command.save": "Update",
   "edit_post.cancel": "取消",
   "edit_post.edit": "修改 {title}",
   "edit_post.editPost": "修改訊息...",
@@ -1177,6 +1203,7 @@
   "emoji_list.creator": "建立者",
   "emoji_list.delete": "刪除",
   "emoji_list.empty": "沒有自訂繪文字",
+  "emoji_list.header": "自訂繪文字",
   "emoji_list.help": "自訂繪文字對此伺服器上的所有使用者開放。在訊息輸入框輸入 ':' 會叫出繪文字選單。其他使用者可能需要重新讀取頁面才會看見新的繪文字。",
   "emoji_list.help2": "提示：如果在含有繪文字該行增加 #、## 或 ### 當作第一個字元，可以使用較大尺寸的繪文字。傳送如 '# :smile:' 的訊息來嘗試此功能。",
   "emoji_list.image": "圖片",
@@ -1208,6 +1235,7 @@
   "filtered_user_list.countTotalPage": "{total}位中{startCount, number} - {endCount, number}位成員",
   "filtered_user_list.member": "成員",
   "filtered_user_list.search": "按 enter 開始搜尋",
+  "filtered_user_list.searchButton": "搜尋",
   "filtered_user_list.show": "過濾條件：",
   "filtered_user_list.team_only": "此團隊的成員",
   "find_team.email": "電子郵件地址",
@@ -1361,6 +1389,7 @@
   "installed_integrations.content_type": "內容類型：{contentType}",
   "installed_integrations.creation": "由{creator}在{createAt, date, full}所建立",
   "installed_integrations.delete": "刪除",
+  "installed_integrations.edit": "編輯",
   "installed_integrations.hideSecret": "隱藏密碼",
   "installed_integrations.regenSecret": "重新產生密碼",
   "installed_integrations.regenToken": "重新產生 Token",
@@ -1398,6 +1427,7 @@
   "integrations.command.description": "斜線命令用來傳送事件給外部整合功能",
   "integrations.command.title": "斜線命令",
   "integrations.done": "完成",
+  "integrations.edit": "編輯",
   "integrations.header": "整合",
   "integrations.incomingWebhook.description": "傳入的 Webhook 讓外部整合功能可以傳送訊息",
   "integrations.incomingWebhook.title": "傳入的 Webhook",
@@ -1410,7 +1440,7 @@
   "intro_messages.anyMember": " 任何成員可以加入並閱讀此頻道。",
   "intro_messages.beginning": "{name}的開頭",
   "intro_messages.channel": "頻道",
-  "intro_messages.creator": "這是<strong>{name}</strong>{type}的開頭，由<strong>{creator}</strong>在<strong>{date}</strong>所建立。",
+  "intro_messages.creator": "這是{name}{type}的開頭，建立於{date}。",
   "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}",
@@ -1418,6 +1448,7 @@
   "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.setHeader": "設定標題",
   "intro_messages.teammate": "這是您跟這位團隊成員之間直接訊息的起頭。直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
   "invite_member.addAnother": "增加其他人",
@@ -1542,6 +1573,7 @@
   "navbar_dropdown.teamSettings": "團隊設定",
   "navbar_dropdown.viewMembers": "檢視成員",
   "notification.dm": "直接傳訊",
+  "passwordRequirements": "密碼要求：",
   "password_form.change": "變更密碼",
   "password_form.click": "按 <a href={url}>這裡</a>登入",
   "password_form.enter": "輸入 {siteName} 帳戶的新密碼",
@@ -1553,7 +1585,7 @@
   "password_send.description": "輸入註冊的電子郵件地址以重設密碼。",
   "password_send.email": "電子郵件地址",
   "password_send.error": "請輸入一個有效的電子郵件地址",
-  "password_send.link": "<p>已寄送密碼重置連結到<b>{email}</b></p>",
+  "password_send.link": "If the account exists, a password reset email will be sent to: <br/><b>{email}</b><br/><br/>",
   "password_send.reset": "重置我的密碼",
   "password_send.title": "密碼重設",
   "pdf_preview.max_pages": "請下載以閱讀更多頁",
@@ -1600,11 +1632,14 @@
   "rhs_comment.mobile.flag": "標記",
   "rhs_comment.mobile.unflag": "取消標記",
   "rhs_comment.permalink": "永久網址",
+  "rhs_header.backToCallTooltip": "Back to Call",
   "rhs_header.backToFlaggedTooltip": "回到被標記的訊息",
   "rhs_header.backToResultsTooltip": "回到搜尋結果",
   "rhs_header.closeSidebarTooltip": "關閉側邊欄",
+  "rhs_header.closeTooltip": "關閉側邊欄",
   "rhs_header.details": "詳細訊息",
   "rhs_header.expandSidebarTooltip": "展開側邊欄",
+  "rhs_header.expandTooltip": "關閉側邊欄",
   "rhs_header.shrinkSidebarTooltip": "關閉側邊欄",
   "rhs_root.del": "刪除",
   "rhs_root.direct": "直接訊息",
@@ -1786,6 +1821,10 @@
   "tutorial_tip.ok": "確定",
   "tutorial_tip.out": "不要顯示提示。",
   "tutorial_tip.seen": "曾經看過這個嘛？",
+  "update_command.cancel": "取消",
+  "update_command.confirm": "新增斜線命令",
+  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.update": "Update",
   "upload_overlay.info": "將檔案拖曳到這裡上傳。",
   "user.settings.advance.embed_preview": "可以使用時，顯示實驗性的連結內容預覽",
   "user.settings.advance.embed_toggle": "內嵌預覽顯示開關",
@@ -1976,6 +2015,7 @@
   "user.settings.notifications.on": "啟用",
   "user.settings.notifications.onlyMentions": "僅限於提及跟直接訊息",
   "user.settings.notifications.push": "行動推播",
+  "user.settings.notifications.push_notification.status": "何時觸發推播通知",
   "user.settings.notifications.sensitiveName": "您的名字，區分大小寫：\"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "您的使用者名稱，不區分大小寫：\"{username}\"",
   "user.settings.notifications.sensitiveWords": "其他不區分大小寫的字，用逗號分隔：",
@@ -1985,6 +2025,7 @@
   "user.settings.notifications.title": "通知設定",
   "user.settings.notifications.usernameMention": "提及您的使用者名稱 \"@{username}\"",
   "user.settings.notifications.wordsTrigger": "觸發提及的字",
+  "user.settings.push_notification.allActivity": "所有的活動",
   "user.settings.push_notification.allActivityAway": "離開或離線時的所有活動",
   "user.settings.push_notification.allActivityOffline": "離線時的所有活動",
   "user.settings.push_notification.allActivityOnline": "線上、離開或離線時的所有活動",
@@ -1995,6 +2036,7 @@
   "user.settings.push_notification.off": "關閉",
   "user.settings.push_notification.offline": "離線",
   "user.settings.push_notification.online": "線上、離開或離線",
+  "user.settings.push_notification.onlyMentions": "僅限於提及跟直接訊息",
   "user.settings.push_notification.onlyMentionsAway": "線上、離開或離線時的提及跟直接訊息",
   "user.settings.push_notification.onlyMentionsOffline": "離線時的提及跟直接訊息",
   "user.settings.push_notification.onlyMentionsOnline": "線上、離開或離線時的提及跟直接訊息",
@@ -2012,6 +2054,7 @@
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "已經由 GitLab 登入",
   "user.settings.security.loginLdap": "已經由 AD/LDAP 登入",
+  "user.settings.security.loginSaml": "已經由 GitLab 登入",
   "user.settings.security.logoutActiveSessions": "觀看並登出使用中的工作階段",
   "user.settings.security.method": "登入方式",
   "user.settings.security.newPassword": "新密碼",
@@ -2042,6 +2085,7 @@
   "user.settings.security.passwordLdapCantUpdate": "經由 AD/LDAP 登入。無法變更密碼。",
   "user.settings.security.passwordMatchError": "輸入的新密碼不一致。",
   "user.settings.security.passwordMinLength": "無效的最短長度，無法顯示預覽。",
+  "user.settings.security.passwordSamlCantUpdate": "此欄位由您的登入提供者決定。如果想變更它，得經由登入提供者變更。",
   "user.settings.security.retypePassword": "再次輸入新密碼",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "切換至電子郵件地址及密碼",
@@ -2054,6 +2098,7 @@
   "user.settings.security.viewHistory": "檢視存取紀錄",
   "user_list.notFound": "找不到任何使用者",
   "user_profile.webrtc.call": "開始視訊通話",
+  "user_profile.webrtc.offline": "The user is offline",
   "user_profile.webrtc.unavailable": "在當前通訊結束前不能建立新的通訊",
   "view_image.loading": "載入中",
   "view_image_popover.download": "下載",