translations PR 20170501 (#6291)

* translations PR 20170501 * Add polish to webapp
2017-05-04 17:07:42 -03:00
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Ungültige Rollen für die Kanalmitgliedschaft des Benutzers."
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData and Password are mutually exclusive."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "Benutzer AuthData ist zu lang."
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "Benutzer nickname ist zu lang."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "Benutzer Position ist zu lang."
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "Ungültige Benutzer ID"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "Ungültiger token"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "Ungültige Auth Daten"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "Ungültiger Nickname"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Ungültige Position: Darf nicht länger als 35 Zeichen sein."
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "Fehler beim Erstellen des dialektspezifischen Treibers %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Fehler beim Drop der Spalte %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "Ungültige MAC für den Ciphertext angegeben"
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3095,17 +3095,13 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Invalid roles for User's Channel Membership."
  },
-  {
-    "id": "app.import.validate_user_import_data.auth_data_length.error",
-    "translation": "User AuthData is too long."
-  },
  {
    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
    "translation": "User AuthData and Password are mutually exclusive."
  },
  {
-    "id": "app.import.validate_user_import_data.pasword_length.error",
-    "translation": "User Password has invalid length."
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "User AuthData is too long."
  },
  {
    "id": "app.import.validate_user_import_data.auth_service_length.error",
@@ -3131,6 +3127,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "User nickname is too long."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "User Position is too long."
@@ -3587,14 +3587,6 @@
    "id": "mattermost.working_dir",
    "translation": "Current working directory is %v"
  },
-  {
-    "id": "model.token.is_valid.size",
-    "translation": "Invalid token."
-  },
-  {
-    "id": "model.token.is_valid.expiry",
-    "translation": "Invalid token expiry"
-  },
  {
    "id": "model.access.is_valid.access_token.app_error",
    "translation": "Invalid access token"
@@ -4428,12 +4420,16 @@
    "translation": "Invalid user id"
  },
  {
-    "id": "model.user.is_valid.auth_data.app_error",
-    "translation": "Invalid auth data"
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
  },
  {
-    "id": "model.user.is_valid.password_limit.app_error",
-    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+    "id": "model.token.is_valid.size",
+    "translation": "Invalid token."
+  },
+  {
+    "id": "model.user.is_valid.auth_data.app_error",
+    "translation": "Invalid auth data"
  },
  {
    "id": "model.user.is_valid.auth_data_pwd.app_error",
@@ -4467,6 +4463,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "Invalid nickname"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Invalid position: must not be longer than 35 characters."
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -185,19 +185,19 @@
  },
  {
    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "La gestión y creación de Canales Privados está restringido a los Administradores del Sistema."
+    "translation": "La gestión y creación de Canales Privados está restringida a los Administradores del Sistema."
  },
  {
    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "La gestión y creación de Canales Privados está restringido a los Administradores de Equipo y Sistema."
+    "translation": "La gestión y creación de Canales Privados está restringida a los Administradores de Equipo y Sistema."
  },
  {
    "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
-    "translation": "La gestión y creación de Canales Públicos está restringido a los Administradores del Sistema."
+    "translation": "La gestión y creación de Canales Públicos está restringida a los Administradores del Sistema."
  },
  {
    "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
-    "translation": "La gestión y creación de Canales Públicos está restringido a los Administradores de Equipo y Sistema."
+    "translation": "La gestión y creación de Canales Públicos está restringida a los Administradores de Equipo y Sistema."
  },
  {
    "id": "api.channel.create_channel.direct_channel.app_error",
@@ -2349,7 +2349,7 @@
  },
  {
    "id": "api.templates.welcome_subject",
-    "translation": "[{{ .SiteName }}] Te haz unido a {{ .ServerURL }}"
+    "translation": "[{{ .SiteName }}] Te has unido a {{ .ServerURL }}"
  },
  {
    "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -2525,7 +2525,7 @@
  },
  {
    "id": "api.user.login.inactive.app_error",
-    "translation": "El inicio de sesión falló porque tu cuenta ha sido desactivada. Por favor contacta a un administrador."
+    "translation": "El inicio de sesión falló porque tu cuenta ha sido desactivada.  Por favor contacta a un administrador."
  },
  {
    "id": "api.user.login.invalid_credentials",
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Invalid roles for User's Channel Membership."
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "La Contraseña y AuthData del usuario se excluyen mutuamente."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "La propiedad AuthData del usuario es demasiado larga."
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "La propiedad nickname del usuario es demasiado larga."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "La contraseña del usuario tiene una longitud no válida."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "La propiedad Position del usuario es demasiado larga."
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "Id de usuario inválido"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Expiración del token no válido"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "Token no válido."
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "Data de auth es inválida"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "Sobrenombre no es válido"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "No se puede establecer una contraseña con más de 72 caracteres debido a las limitaciones de bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Cargo no válido: no debe ser más de 35 caracteres."
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "Failed to create dialect specific driver %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Falla al borrar la columna %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "MAC incorrecto para el ciphertext dado"
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Rôles invalides pour la liste des canaux de l'utilisateur."
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData and Password are mutually exclusive."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "Les données d'authentification utilisateur sont trop longues."
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "Le surnom de l'utilisateur est trop long."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "Le rôle de l'utilisateur est trop long."
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "Id d'utilisateur invalide"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "Jeton invalide"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "Données d'authentification invalides"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "Pseudonyme invalide"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Rôle invalide : ne doit pas faire plus de 35 caractères."
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "Échec de création du driver spécifique au dialecte %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Échec de suppression de la colonne %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "MAC incorrect pour le ciphertext indiqué"
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -2525,7 +2525,7 @@
  },
  {
    "id": "api.user.login.inactive.app_error",
-    "translation": "あなたのアカウントは無効化されています。システム管理者に連絡してください。"
+    "translation": "あなたのアカウントが無効化されているためログインできませんでした。  システム管理者に連絡してください。"
  },
  {
    "id": "api.user.login.invalid_credentials",
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "ユーザーのチャネルメンバーシップの役割が不正です。"
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "ユーザーの認証データとパスワードが相互に排他的です。"
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "ユーザーの認証データが長すぎます。"
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "ユーザーのニックネームが長すぎます。"
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "ユーザーのパスワードの長さが不正です。"
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "ユーザーの役職が長すぎます。"
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "不正なユーザーIDです"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "不正なトークンの有効期限"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "不正なトークンです。"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "不正な認証データです"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "不正なニックネームです"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "cryptの制限により72文字以上のパスワードを設定できません"
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "不正な役職: 35文字以上にはできません"
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "方言特有のドライバー%vが作成できませんでした"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "列%vを削除できませんでした"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "与えられたciphertextに対するMACが正しくありません"
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Invalid roles for User's Channel Membership."
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData and Password are mutually exclusive."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "User AuthData is too long."
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "User nickname is too long."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "User Position is too long."
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "잘못된 유저 아이디입니다."
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "잘못된 토큰"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "잘못된 인증 데이터입니다."
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "잘못된 닉네임입니다."
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Invalid position: must not be longer than 35 characters."
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "Failed to create dialect specific driver %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Failed to drop column %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "Incorrect MAC for the given ciphertext"
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Invalid roles for User's Channel Membership."
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData and Password are mutually exclusive."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "User AuthData is too long."
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "User nickname is too long."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "User Position is too long."
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "Ongeldige gebruikers id"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "Ongeldig token"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "Ongeldige auth data"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "Ongeldige bijnaam"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Invalid position: must not be longer than 35 characters."
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "Fout bij het maken van dialect specifiek stuurprogramma %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Fout bij het verwijderen van kolom %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "Ongeldige MAC voor de opgegeven encryptietext"
--- a/i18n/pl.json
+++ b/i18n/pl.json
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -2525,7 +2525,7 @@
  },
  {
    "id": "api.user.login.inactive.app_error",
-    "translation": "Login falhou devido a sua conta estar inativa.  Por favor entre em contado com um administrador."
+    "translation": "Login falhou devido a sua conta ter sido desativada.  Por favor entre em contado com um administrador."
  },
  {
    "id": "api.user.login.invalid_credentials",
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Função inválida em Usuário Membro do Canal."
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData e Password são mutuamente exclusivos."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "O AuthData do usuário é muito longo."
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "O apelido do usuário é muito longo."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "Senha do Usuário tem comprimento inválido."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "O Cargo do usuário é muito longo."
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "Id de usuário inválido"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Token inválido expirado"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "Token inválido."
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "Dados de autenticação inválido"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "Apelido inválido"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Não é possível definir uma senha com mais de 72 caracteres devido a limitações do bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Posição inválida: não pode ter mais que 35 caracteres."
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "Falha ao criar driver de dialeto específico %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Falha ao deletar a coluna %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "MAC incorreto para o ciphertext fornecido"
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "Не правильные роли в «Участие пользователей на каналах»"
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData and Password are mutually exclusive."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "Структура AuthData пользователя слишком большая."
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "Псевдоним пользователя слишком длинный."
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "Расположение пользователя слишком длинное."
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "Некорректный идентификатор пользователя"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "Недопустимый маркер"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "Некорректные данные авторизации"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "Некорректное прозвище пользователя"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "Неверная позиция: должно быть не более 35 символов."
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "Не удалось найти SQL диалект драйвера %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "Неудачная попытка удалить колонку %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "Некорректная имитовставка для данного шифротекста"
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "用户频道成员资格的角色无效。"
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData and Password are mutually exclusive."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "用户 AuthData 过长。"
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "用户昵称过长。"
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "用户职位过长。"
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "无效用户id"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "无效的令牌"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "无效的认证数据"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "无效的昵称"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "无效位置：不能超过 35 个字符。"
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "创建方言专用驱动程序失败 %v"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "未能删除列 %v"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "对于给定的密文不正确的MAC"
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -3091,6 +3091,10 @@
    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
    "translation": "使用者頻道資料的角色為無效資料。"
  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_and_password.error",
+    "translation": "User AuthData and Password are mutually exclusive."
+  },
  {
    "id": "app.import.validate_user_import_data.auth_data_length.error",
    "translation": "使用者認證資料過長。"
@@ -3119,6 +3123,10 @@
    "id": "app.import.validate_user_import_data.nickname_length.error",
    "translation": "使用者暱稱過長。"
  },
+  {
+    "id": "app.import.validate_user_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
+  },
  {
    "id": "app.import.validate_user_import_data.position_length.error",
    "translation": "使用者職位過長。"
@@ -4407,6 +4415,14 @@
    "id": "model.team_member.is_valid.user_id.app_error",
    "translation": "無效的使用者 ID"
  },
+  {
+    "id": "model.token.is_valid.expiry",
+    "translation": "Invalid token expiry"
+  },
+  {
+    "id": "model.token.is_valid.size",
+    "translation": "無效的 Token"
+  },
  {
    "id": "model.user.is_valid.auth_data.app_error",
    "translation": "無效的驗證資料"
@@ -4443,6 +4459,10 @@
    "id": "model.user.is_valid.nickname.app_error",
    "translation": "無效的暱稱"
  },
+  {
+    "id": "model.user.is_valid.password_limit.app_error",
+    "translation": "Unable to set a password over 72 characters due to the limitations of bcrypt."
+  },
  {
    "id": "model.user.is_valid.position.app_error",
    "translation": "無效的位置：不能超過35個字元。"
@@ -4591,10 +4611,6 @@
    "id": "store.sql.dialect_driver.panic",
    "translation": "建立 SQL 方言專屬驅動 %v 失敗"
  },
-  {
-    "id": "store.sql.drop_column.critical",
-    "translation": "刪除欄位 %v 失敗"
-  },
  {
    "id": "store.sql.incorrect_mac",
    "translation": "密文對應的 MAC 不正確"
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "Einen Dateiort eingeben",
  "admin.log.locationTitle": "Log-Verzeichnis:",
  "admin.log.logSettings": "Protokoll-Einstellungen",
+  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
  "admin.logs.reload": "Erneut laden",
  "admin.logs.title": "Serverprotokoll",
  "admin.metrics.enableDescription": "Wenn wahr, wird Mattermost Performance Daten sammeln und profilieren. Bitte schauen Sie in die <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>Dokumentation</a> um mehr über die Konfiguration von Performanceüberwachung für Mattermost zu erfahren.",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "platform roles system_admin {username}",
  "admin.user_item.emailTitle": "<strong>E-Mail-Adresse:</strong> {email}",
  "admin.user_item.inactive": "Inaktiv",
-  "admin.user_item.makeActive": "Aktivieren",
-  "admin.user_item.makeInactive": "Deaktivieren",
+  "admin.user_item.makeActive": "Aktiv",
+  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "Zum Mitglied machen",
  "admin.user_item.makeSysAdmin": "Zum Systemadministrator machen",
  "admin.user_item.makeTeamAdmin": "Zum Teamadministrator machen",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} hat den Kanalzweck entfernt (war: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} hat den Kanalzweck aktualisiert. Alt: {old} Neu: {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} hat den Kanalzweck geändert zu: {new}",
-  "audit_table.accountActive": "Aktiv geschaltete Zugänge",
-  "audit_table.accountInactive": "Inaktiv geschaltete Zugänge",
+  "audit_table.accountActive": "Account activated",
+  "audit_table.accountInactive": "Account deactivated",
  "audit_table.action": "Aktion",
  "audit_table.attemptedAllowOAuthAccess": "Versuchte einen neuen OAuth Service Zugriff zu erlauben",
  "audit_table.attemptedLicenseAdd": "Versuchte eine neue Lizenz hinzuzufügen",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "Kein eigenes Emoji gefunden",
  "custom_emoji.header": "Eigenes Emoji",
  "custom_emoji.search": "Suche eigenes Emoji",
+  "deactivate_member_modal.cancel": "Abbrechen",
+  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "Senden Sie Nachrichten hier, die jeder sehen können soll. Jeder wird automatisch ein permanentes Mitglied in diesem Kanal wenn Sie dem Team beitreten.",
  "delete_channel.cancel": "Abbrechen",
  "delete_channel.confirm": "Bestätige LÖSCHUNG des Kanals",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "Der Name muss 3 bis 15 Zeichen enthalten",
  "ldap_signup.teamName": "Name für neues Team eingeben",
  "ldap_signup.team_error": "Bitte geben Sie einen Team Namen ein",
+  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "Sie werden von allen öffentlichen und privaten Kanälen entfernt.  Wenn das Team privat ist können Sie diesem nicht wieder beitreten.  Sind Sie sich sicher?",
  "leave_team_modal.no": "Nein",
  "leave_team_modal.title": "Team verlassen?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "Abbrechen",
  "mobile.post.delete_question": "Möchten Sie diese Nachricht wirklich löschen?",
  "mobile.post.delete_title": "Nachricht löschen",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "Aktualisieren",
  "mobile.request.invalid_response": "Ungültige Antwort vom Server erhalten.",
  "mobile.routes.channelInfo": "Info",
@@ -1772,7 +1783,7 @@
  "navbar_dropdown.addMemberToTeam": "Mitglieder zum Team hinzufügen",
  "navbar_dropdown.console": "Systemkonsole",
  "navbar_dropdown.create": "Neues Team erstellen",
-  "navbar_dropdown.emoji": "Eigenes Emoji",
+  "navbar_dropdown.emoji": "Eigene Emojis",
  "navbar_dropdown.help": "Hilfe",
  "navbar_dropdown.integrations": "Integration",
  "navbar_dropdown.inviteMember": "E-Mail-Einladung versenden",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "Der Name muss mindestens 3 bis 15 Zeichen enthalten",
  "sso_signup.teamName": "Geben Sie den Namen des neuen Teams ein",
  "sso_signup.team_error": "Bitte einen Teamnamen eingeben",
-  "suggestion.mention.all": "Benachrichtigt jedem in diesem Kanal, in {townsquare} benachrichtigt er das gesamte Team",
+  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
  "suggestion.mention.channel": "Benachrichtigt jeden in diesem Kanal",
  "suggestion.mention.channels": "Meine Kanäle",
  "suggestion.mention.here": "Benachrichtigt jeden der im Kanal und online ist",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "platform roles system_admin {username}",
  "team_members_dropdown.inactive": "Inaktiv",
  "team_members_dropdown.leave_team": "Aus dem Team entfernen",
-  "team_members_dropdown.makeActive": "Aktivieren",
+  "team_members_dropdown.makeActive": "Aktiv",
  "team_members_dropdown.makeAdmin": "Zum Teamadministrator machen",
-  "team_members_dropdown.makeInactive": "Inaktiv setzen",
+  "team_members_dropdown.makeInactive": "Deactivate",
  "team_members_dropdown.makeMember": "Zum Mitglied machen",
  "team_members_dropdown.member": "Mitglied",
  "team_members_dropdown.systemAdmin": "Systemadministrator",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "Überprüfen Sie Ihr E-Mail Postfach um die neue Adresse zu verifizieren",
  "user.settings.general.close": "Schließen",
  "user.settings.general.confirmEmail": "E-Mail-Adresse bestätigen",
+  "user.settings.general.currentEmail": "Current Email",
  "user.settings.general.email": "E-Mail",
  "user.settings.general.emailGitlabCantUpdate": "Anmeldung erfolgt durch GitLab. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
  "user.settings.general.emailGoogleCantUpdate": "Anmeldung erfolgt durch Google. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Anmeldung erfolgt durch Office 365 ({email})",
  "user.settings.general.loginSaml": "Anmeldung erfolgt durch SAML ({email})",
  "user.settings.general.newAddress": "Neue Adresse: {email}<br />Überprüfen Sie Ihr Postfach um die obige Adresse zu verifizieren.",
+  "user.settings.general.newEmail": "New Email",
  "user.settings.general.nickname": "Spitzname",
  "user.settings.general.nicknameExtra": "Benutzen Sie den Spitznamen als einen Rufnamen der sich von Ihrem Vor- und Nachnamen unterscheidet. Dies wird hauptsächlich verwendet wenn zwei oder mehr Personen ähnliche Namen haben.",
  "user.settings.general.notificationsExtra": "Sie erhalten standardmäßig Benachrichtigungen, wenn jemand Ihren Vornamen erwähnt. Gehen Sie zu den {notify} Einstellungen um dies zu ändern.",
  "user.settings.general.notificationsLink": "Benachrichtigungen",
  "user.settings.general.position": "Position",
  "user.settings.general.positionExtra": "Verwenden Sie die Position für Ihre Rolle oder Ihren Jobtitel.Dies wird in Ihrem Profil Popover angezeigt.",
-  "user.settings.general.primaryEmail": "Primäre E-Mail-Adresse",
  "user.settings.general.profilePicture": "Profilbild",
  "user.settings.general.title": "Allgemeine Einstellungen",
  "user.settings.general.uploadImage": "Auf 'Bearbeiten' klicken um ein Bild hochzuladen.",
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1233,10 +1233,10 @@
  "custom_emoji.empty": "No custom emoji found",
  "custom_emoji.header": "Custom Emoji",
  "custom_emoji.search": "Search Custom Emoji",
-  "deactivate_member_modal.title": "Deactivate {username}",
-  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
  "deactivate_member_modal.cancel": "Cancel",
  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
  "delete_channel.cancel": "Cancel",
  "delete_channel.confirm": "Confirm DELETE Channel",
@@ -1590,9 +1590,9 @@
  "ldap_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
  "ldap_signup.teamName": "Enter name of new team",
  "ldap_signup.team_error": "Please enter a team name",
-  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
-  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "You will be removed from all public and private channels.  If the team is private you will not be able to rejoin the team.  Are you sure?",
  "leave_team_modal.no": "No",
  "leave_team_modal.title": "Leave the team?",
@@ -1717,6 +1717,9 @@
  "mobile.post.cancel": "Cancel",
  "mobile.post.delete_question": "Are you sure you want to delete this post?",
  "mobile.post.delete_title": "Delete Post",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "Refresh",
  "mobile.request.invalid_response": "Received invalid response from the server.",
  "mobile.routes.channelInfo": "Info",
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "Ingresar locación de archivo",
  "admin.log.locationTitle": "Directorio del Archivo de Registro:",
  "admin.log.logSettings": "Configuración de registro",
+  "admin.logs.bannerDesc": "Para buscar usuarios  por ID del usuario, Ve a Reportes > Usuarios y copia el ID en el filtro de búsqueda.",
  "admin.logs.reload": "Recargar",
  "admin.logs.title": "Servidor de registros",
  "admin.metrics.enableDescription": "Cuando es verdadero, Mattermost habilitará el monitoreo de desempeño, la recolección y la elaboración de perfiles. Por favor, consulta la <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentación</a> para obtener más información acerca de la configuración del monitoreo del rendimiento para Mattermost.",
@@ -897,7 +898,7 @@
  "admin.user_item.emailTitle": "<strong>Correo electrónico:</strong> {email}",
  "admin.user_item.inactive": "Inactivo",
  "admin.user_item.makeActive": "Activar",
-  "admin.user_item.makeInactive": "Inactivar",
+  "admin.user_item.makeInactive": "Desactivar",
  "admin.user_item.makeMember": "Hacer Miembro",
  "admin.user_item.makeSysAdmin": "Hacer Admin del Sistema",
  "admin.user_item.makeTeamAdmin": "Hacer Admin de Equipo",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} removió el propósito del canal (era: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} ha actualizado el propósito del canal de: {old} a: {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} ha actualizado el propósito del canal a: {new}",
-  "audit_table.accountActive": "Cuentas activadas",
-  "audit_table.accountInactive": "Cuentas desactivadas",
+  "audit_table.accountActive": "Cuenta activada",
+  "audit_table.accountInactive": "Cuenta desactivada",
  "audit_table.action": "Acción",
  "audit_table.attemptedAllowOAuthAccess": "Intento de permitir acceso a un nuevo servicio OAuth",
  "audit_table.attemptedLicenseAdd": "Se ha intentado añadir nueva licencia",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "No se encontraron emoticones personalizados",
  "custom_emoji.header": "Emoticones Personalizados",
  "custom_emoji.search": "Buscar Emoticon Personalizado",
+  "deactivate_member_modal.cancel": "Cancelar",
+  "deactivate_member_modal.deactivate": "Desactivar",
+  "deactivate_member_modal.desc": "Esta acción desactiva a {username}. Se cerrará la sesión del usuario y no tendrá acceso a ningún equipo o canal en este sistema. ¿Estás seguro de querer desactivar a {username}?",
+  "deactivate_member_modal.title": "Descativar a {username}",
  "default_channel.purpose": "Publica mensajes aquí que quieras que todos vean. Todo el mundo se convierte automáticamente en un miembro permanente de este canal cuando se unan al equipo.",
  "delete_channel.cancel": "Cancelar",
  "delete_channel.confirm": "Confirmar BORRAR Canal",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "El nombre debe tener entre 3 y 15 caracteres",
  "ldap_signup.teamName": "Ingresa el nombre del nuevo equipo",
  "ldap_signup.team_error": "Por favor ingresa el nombre del equipo",
+  "leave_private_channel_modal.leave": "Sí, abandonar el canal",
+  "leave_private_channel_modal.message": "¿Estás seguro que quieres abandonar el canal privado {channel}? Necesitarás una nueva invitación para poder unirte nuevamente a este canal en el futuro.",
+  "leave_private_channel_modal.title": "Abandonar Canal Privado {channel}",
  "leave_team_modal.desc": "Serás removido de todos los canales públicos y privados.  si el equipo es privado no podrás unirte de nuevo al equipo.  ¿Estás seguro?",
  "leave_team_modal.no": "No",
  "leave_team_modal.title": "¿Abandonar Equipo?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "Cancelar",
  "mobile.post.delete_question": "¿Estás seguro(a) de querer borrar este mensaje?",
  "mobile.post.delete_title": "Eliminar Mensaje",
+  "mobile.post.failed_delete": "Borrar Mensaje",
+  "mobile.post.failed_retry": "Intentar de nuevo",
+  "mobile.post.failed_title": "No se pudo enviar el mensaje",
  "mobile.post.retry": "Actualizar",
  "mobile.request.invalid_response": "Se recibió una respuesta no válida del servidor.",
  "mobile.routes.channelInfo": "Información",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
  "sso_signup.teamName": "Ingresa el nombre del nuevo equipo",
  "sso_signup.team_error": "Please enter a team name",
-  "suggestion.mention.all": "Notifica a todos en el canal, utiliza en {townsquare} para notificar a todo el equipo",
+  "suggestion.mention.all": "PRECAUCIÓN: Esto menciona a todos los usuarios en el canal",
  "suggestion.mention.channel": "Notifica a todas las personas en el canal",
  "suggestion.mention.channels": "Mis Canales",
  "suggestion.mention.here": "Notifica a todos en el canal que estén en línea",
@@ -2033,7 +2044,7 @@
  "team_members_dropdown.leave_team": "Quitar del equipo",
  "team_members_dropdown.makeActive": "Activar",
  "team_members_dropdown.makeAdmin": "Hacer Admin de Equipo",
-  "team_members_dropdown.makeInactive": "Inactivar",
+  "team_members_dropdown.makeInactive": "Desactivar",
  "team_members_dropdown.makeMember": "Hacer Miembro",
  "team_members_dropdown.member": "Miembro",
  "team_members_dropdown.systemAdmin": "Admin del Sistema",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "Revisa tu correo electrónico para verificar la dirección",
  "user.settings.general.close": "Cerrar",
  "user.settings.general.confirmEmail": "Confirmar Correo electrónico",
+  "user.settings.general.currentEmail": "Correo electrónico actual",
  "user.settings.general.email": "Correo electrónico",
  "user.settings.general.emailGitlabCantUpdate": "El inicio de sesión ocurre a través GitLab. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
  "user.settings.general.emailGoogleCantUpdate": "El inicio de sesión ocurre a través Google. El correo electrónico no puede ser actualizado. La dirección de correo electrónico utilizada para las notificaciones es {email}.",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Inicio de sesión realizado a través de Office 365 ({email})",
  "user.settings.general.loginSaml": "Inicio de sesión realizado a través de SAML ({email})",
  "user.settings.general.newAddress": "Nueva dirección: {email}<br />Revisa tu correo electrónico para verificar tu nueva dirección.",
+  "user.settings.general.newEmail": "Nuevo correo electrónico",
  "user.settings.general.nickname": "Sobrenombre",
  "user.settings.general.nicknameExtra": "Utiliza un Sobrenombre por el cual te conocen que sea diferente de tu nombre y del nombre de tu usuario. Esto se utiliza con mayor frecuencia cuando dos o más personas tienen nombres y nombres de usuario que suenan similares.",
  "user.settings.general.notificationsExtra": "De forma predeterminada, recibirás notificaciones cuando alguien escribe tu nombre. Ve a la configuración de {notify} para cambiar este comportamiento.",
  "user.settings.general.notificationsLink": "Notificaciones",
  "user.settings.general.position": "Cargo",
  "user.settings.general.positionExtra": "Utiliza Cargo para definir tu rol o título del trabajo. Esto se muestra en la ventana emergente de tu perfil.",
-  "user.settings.general.primaryEmail": "Correo Principal",
  "user.settings.general.profilePicture": "Foto del Perfil",
  "user.settings.general.title": "Configuración General",
  "user.settings.general.uploadImage": "Clic en 'Editar' para subir una imagen.",
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "Saisir l'emplacement du fichier",
  "admin.log.locationTitle": "Répertoire des fichiers journaux :",
  "admin.log.logSettings": "Paramètres de journalisation (logs)",
+  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
  "admin.logs.reload": "Recharger",
  "admin.logs.title": "Journaux du serveur",
  "admin.metrics.enableDescription": "Lorsqu'activé, Mattermost activera la collecte des rapports de performance et de profilage. Veuillez vous référer à la <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> pour en savoir plus sur la configuration du suivi des performances de Mattermost.",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "Rôle au sein de la plateforme system_admin {username}",
  "admin.user_item.emailTitle": "<strong>E-mail:</strong> {email}",
  "admin.user_item.inactive": "Inactif",
-  "admin.user_item.makeActive": "Activer",
-  "admin.user_item.makeInactive": "Désactiver",
+  "admin.user_item.makeActive": "Actif",
+  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "Assigner le rôle Membre",
  "admin.user_item.makeSysAdmin": "Assigner le rôle administrateur système",
  "admin.user_item.makeTeamAdmin": "Assigner le rôle \"Administrateur d'équipe\"",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} a supprimé la description du canal (précédemment: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} a mis à jour la description du canal de: {old} en: {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} a mis à jour la description du canal en: {new}",
-  "audit_table.accountActive": "Compte activé",
-  "audit_table.accountInactive": "Compte désactivé",
+  "audit_table.accountActive": "Account activated",
+  "audit_table.accountInactive": "Account deactivated",
  "audit_table.action": "Action",
  "audit_table.attemptedAllowOAuthAccess": "Tentative d'autoriser un nouvel accès à un service OAuth",
  "audit_table.attemptedLicenseAdd": "Tentative d'ajouter une licence",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "Aucun emoji personnalisé",
  "custom_emoji.header": "Emoji personnalisés",
  "custom_emoji.search": "Rechercher les emoji personnalisés",
+  "deactivate_member_modal.cancel": "Annuler",
+  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "Publiez ici les messages que vous souhaitez que tout le monde voie. Chaque utilisateur devient un membre permanent de ce canal lorsqu'il rejoint l'équipe.",
  "delete_channel.cancel": "Annuler",
  "delete_channel.confirm": "Confirmez la SUPPRESSION du canal",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "Le nom doit contenir de 3 à 15 caractères",
  "ldap_signup.teamName": "Entrez le nom de votre nouvelle équipe",
  "ldap_signup.team_error": "Veuillez saisir le nom de votre équipe",
+  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "Vous allez être retiré de tous les canaux publics et privés.   Si l'équipe est privée, vous ne serez pas en mesure de rejoindre l'équipe.   Voulez-vous continuer ?",
  "leave_team_modal.no": "Non",
  "leave_team_modal.title": "Quitter l'équipe ?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "Annuler",
  "mobile.post.delete_question": "Voulez-vous vraiment supprimer ce message ?",
  "mobile.post.delete_title": "Supprimer le message",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "Refresh",
  "mobile.request.invalid_response": "Réponse invalide reçue du serveur.",
  "mobile.routes.channelInfo": "Information",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "Le nom doit contenir de 3 à 15 caractères",
  "sso_signup.teamName": "Entrez le nom de votre nouvelle équipe",
  "sso_signup.team_error": "Veuillez spécifier le nom de votre équipe",
-  "suggestion.mention.all": "Avertit tout le monde dans le canal, utilisez-le dans {townsquare} pour notifier toute l'équipe",
+  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
  "suggestion.mention.channel": "Notifier tout le monde dans le canal",
  "suggestion.mention.channels": "Mes canaux",
  "suggestion.mention.here": "Notifier toutes les personnes connectées dans ce canal",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "plate-forme de rôles system_admin {username}",
  "team_members_dropdown.inactive": "Inactif",
  "team_members_dropdown.leave_team": "Exclure de l'équipe",
-  "team_members_dropdown.makeActive": "Activer",
+  "team_members_dropdown.makeActive": "Actif",
  "team_members_dropdown.makeAdmin": "Rendre administrateur de l'équipe",
-  "team_members_dropdown.makeInactive": "Désactiver",
+  "team_members_dropdown.makeInactive": "Deactivate",
  "team_members_dropdown.makeMember": "Assigner le rôle Membre",
  "team_members_dropdown.member": "Membre",
  "team_members_dropdown.systemAdmin": "Administrateur système",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "Vérifiez votre boîte de réception pour valider votre nouvelle adresse e-mail.",
  "user.settings.general.close": "Quitter",
  "user.settings.general.confirmEmail": "E-mail de confirmation",
+  "user.settings.general.currentEmail": "Current Email",
  "user.settings.general.email": "Adresse e-mail",
  "user.settings.general.emailGitlabCantUpdate": "La connexion se produit par Gitlab. L'addresse Electronique ne peut pas être mis à jour . Adresse e-mail utilisée pour les notifications est {email} .",
  "user.settings.general.emailGoogleCantUpdate": "La connexion s'effectue par Gitlab. L'adresse e-mail ne peut pas être mise à jour. L'adresse e-mail utilisée pour les notifications est {email} .",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Dernière connexion avec Office 365 ({email})",
  "user.settings.general.loginSaml": "Connexion avec SAML ({email})",
  "user.settings.general.newAddress": "Nouvelle adresse : {email}<br />Vérifiez vos e-mails pour valider votre adresse e-mail.",
+  "user.settings.general.newEmail": "New Email",
  "user.settings.general.nickname": "Pseudo",
  "user.settings.general.nicknameExtra": "Vous pouvez utiliser un pseudo à la place de vos prénom, nom et nom d'utilisateur. Ceci est pratique lorsque deux personnes de votre équipe ont des noms similaires phonétiquement.",
  "user.settings.general.notificationsExtra": "Par défaut, vous recevez une notification lorsqu'un utilisateur cite votre prénom. Rendez vous dans les paramètres de {notify} pour modifier ce paramètre.",
  "user.settings.general.notificationsLink": "Notifications",
  "user.settings.general.position": "Rôle",
  "user.settings.general.positionExtra": "Veuillez utiliser ce champ pour spécifier votre rôle ou intitulé de poste. Il sera affiché dans votre infobulle de profil utilisateur.",
-  "user.settings.general.primaryEmail": "Adresse e-mail principale",
  "user.settings.general.profilePicture": "Photo de profil",
  "user.settings.general.title": "Paramètres généraux",
  "user.settings.general.uploadImage": "Veuillez cliquer sur ‘Modifier’ pour télécharger une image",
--- a/webapp/i18n/i18n.jsx
+++ b/webapp/i18n/i18n.jsx
@@ -7,6 +7,7 @@ const fr = require('!!file-loader?name=i18n/[name].[hash].[ext]!./fr.json');
 const ja = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ja.json');
 const ko = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ko.json');
 const nl = require('!!file-loader?name=i18n/[name].[hash].[ext]!./nl.json');
+const pl = require('!!file-loader?name=i18n/[name].[hash].[ext]!./pl.json');
 const pt_BR = require('!!file-loader?name=i18n/[name].[hash].[ext]!./pt-BR.json'); //eslint-disable-line camelcase
 const ru = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ru.json');
 const zh_TW = require('!!file-loader?name=i18n/[name].[hash].[ext]!./zh-TW.json'); //eslint-disable-line camelcase
@@ -20,6 +21,7 @@ import frLocaleData from 'react-intl/locale-data/fr';
 import jaLocaleData from 'react-intl/locale-data/ja';
 import koLocaleData from 'react-intl/locale-data/ko';
 import nlLocaleData from 'react-intl/locale-data/nl';
+import plLocaleData from 'react-intl/locale-data/pl';
 import ptLocaleData from 'react-intl/locale-data/pt';
 import ruLocaleData from 'react-intl/locale-data/ru';
 import zhLocaleData from 'react-intl/locale-data/zh';
@@ -53,13 +55,13 @@ const languages = {
    ja: {
        value: 'ja',
        name: '日本語',
-        order: 10,
+        order: 11,
        url: ja
    },
    ko: {
        value: 'ko',
        name: '한국어 (Alpha)',
-        order: 7,
+        order: 8,
        url: ko
    },
    nl: {
@@ -68,28 +70,34 @@ const languages = {
        order: 4,
        url: nl
    },
+    pl: {
+        value: 'pl',
+        name: 'Polski (Beta)',
+        order: 5,
+        url: pl
+    },
    'pt-BR': {
        value: 'pt-BR',
        name: 'Português (Brasil)',
-        order: 5,
+        order: 6,
        url: pt_BR
    },
    ru: {
        value: 'ru',
        name: 'Pусский (Beta)',
-        order: 6,
+        order: 7,
        url: ru
    },
    'zh-TW': {
        value: 'zh-TW',
        name: '中文 (繁體)',
-        order: 9,
+        order: 10,
        url: zh_TW
    },
    'zh-CN': {
        value: 'zh-CN',
        name: '中文 (简体)',
-        order: 8,
+        order: 9,
        url: zh_CN
    }
 };
@@ -145,6 +153,7 @@ export function safariFix(callback) {
        'intl/locale-data/jsonp/ja.js',
        'intl/locale-data/jsonp/ko.js',
        'intl/locale-data/jsonp/nl.js',
+        'intl/locale-data/jsonp/pl.js',
        'intl/locale-data/jsonp/pt.js',
        'intl/locale-data/jsonp/ru.js',
        'intl/locale-data/jsonp/zh.js'
@@ -157,6 +166,7 @@ export function safariFix(callback) {
        require('intl/locale-data/jsonp/ja.js');
        require('intl/locale-data/jsonp/ko.js');
        require('intl/locale-data/jsonp/nl.js');
+        require('intl/locale-data/jsonp/pl.js');
        require('intl/locale-data/jsonp/pt.js');
        require('intl/locale-data/jsonp/ru.js');
        require('intl/locale-data/jsonp/zh.js');
@@ -172,6 +182,7 @@ export function doAddLocaleData() {
    addLocaleData(jaLocaleData);
    addLocaleData(koLocaleData);
    addLocaleData(nlLocaleData);
+    addLocaleData(plLocaleData);
    addLocaleData(ptLocaleData);
    addLocaleData(ruLocaleData);
    addLocaleData(zhLocaleData);
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -172,7 +172,7 @@
  "admin.compliance.directoryTitle": "コンプライアンスリポートディレクトリー:",
  "admin.compliance.enableDailyDesc": "有効な場合、Mattermostが毎日コンプライアンスリポートを生成します。",
  "admin.compliance.enableDailyTitle": "日次リポートを有効にする",
-  "admin.compliance.enableDesc": "有効な場合、Mattermostは<strong>Compliance and Auditing</strong>タブからのコンプライアンスリポートを許可します。詳しくは、<a href=\"https://docs.mattermost.com/administration/compliance.html\" target='_blank'>説明文書</a>を参照してください。",
+  "admin.compliance.enableDesc": "有効な場合、Mattermostは<strong>コンプライアンスと監査</strong>タブからのコンプライアンスリポートを許可します。詳しくは、<a href=\"https://docs.mattermost.com/administration/compliance.html\" target='_blank'>説明文書</a>を参照してください。",
  "admin.compliance.enableTitle": "コンプライアンスリポートを有効にする:",
  "admin.compliance.false": "無効",
  "admin.compliance.noLicense": "<h4 class=\"banner__heading\">注意:</h4><p>コンプライアンスはエンタープライズ版のみの機能です。現在のライセンスはコンプライアンスをサポートしていません。詳しくは<a href=\"http://mattermost.com\" target='_blank'>エンタープライズ版についての情報と価格</a>をご覧ください。</p>",
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "ファイルの場所を入力してください",
  "admin.log.locationTitle": "ログファイルの出力ディレクトリー:",
  "admin.log.logSettings": "LDAPの設定",
+  "admin.logs.bannerDesc": "ユーザーIDでユーザーを検索するには、リポート > ユーザーへ行き検索フィルターにIDをペーストしてください。",
  "admin.logs.reload": "再読み込み",
  "admin.logs.title": "サーバーログ",
  "admin.metrics.enableDescription": "有効な場合、Mattermostはパフォーマンスのモニタリングやプロファイリングが有効になります。Mattermostのパフォーマンスモニタリングの設定について、詳しくは<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a>を参照してください。",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "プラットフォームのシステム管理者の役割 {username}",
  "admin.user_item.emailTitle": "<strong>Email:</strong> {email}",
  "admin.user_item.inactive": "無効",
-  "admin.user_item.makeActive": "有効にする",
-  "admin.user_item.makeInactive": "無効にする",
+  "admin.user_item.makeActive": "有効化",
+  "admin.user_item.makeInactive": "無効化",
  "admin.user_item.makeMember": "メンバーにする",
  "admin.user_item.makeSysAdmin": "システム管理者にする",
  "admin.user_item.makeTeamAdmin": "チーム管理者にする",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} がチャンネルの目的({old})を削除しました",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} がチャンネルの目的を {old} から {new} へ更新しました",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} がチャンネルの目的を {new} へ更新しました",
-  "audit_table.accountActive": "アカウントが有効になりました",
-  "audit_table.accountInactive": "アカウントが無効になりました",
+  "audit_table.accountActive": "アカウントを有効化しました",
+  "audit_table.accountInactive": "アカウントを無効化しました",
  "audit_table.action": "アクション",
  "audit_table.attemptedAllowOAuthAccess": "新しいOAuthサービスアクセスを許可しました",
  "audit_table.attemptedLicenseAdd": "新しいライセンスを追加しました",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "カスタム絵文字がありません",
  "custom_emoji.header": "カスタム絵文字",
  "custom_emoji.search": "カスタム絵文字を検索",
+  "deactivate_member_modal.cancel": "キャンセル",
+  "deactivate_member_modal.deactivate": "無効化",
+  "deactivate_member_modal.desc": "この操作により {username} は無効化されます。無効化されたユーザーはログアウトされ、このシステムのどのチームやチャンネルにもアクセスできなくなります。本当に {username} を無効化しますか？",
+  "deactivate_member_modal.title": "{username} を無効化",
  "default_channel.purpose": "全員に見てほしいメッセージをここに投稿して下さい。チームに参加すると、全員が自動的にこのチャンネルのメンバーになります。",
  "delete_channel.cancel": "キャンセル",
  "delete_channel.confirm": "チャンネルの削除を確認する",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "名称は3文字以上15文字以下にしてください",
  "ldap_signup.teamName": "新しいチーム名を入力してください",
  "ldap_signup.team_error": "チーム名を入力してください",
+  "leave_private_channel_modal.leave": "はい、チャンネルから脱退します",
+  "leave_private_channel_modal.message": "本当に非公開チャンネル {channel} から脱退しますか? このチャンネルに再度参加するには、再び招待されなければなりません。",
+  "leave_private_channel_modal.title": "非公開チャンネル {channel} を脱退する",
  "leave_team_modal.desc": "全ての公開チャンネルと非公開チャンネルから脱退します。  チームが非公開な場合、再度参加することはできません。  実行してよろしいですか?",
  "leave_team_modal.no": "いいえ",
  "leave_team_modal.title": "チームから脱退しますか?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "キャンセル",
  "mobile.post.delete_question": "この投稿を本当に削除しますか?",
  "mobile.post.delete_title": "投稿を削除する",
+  "mobile.post.failed_delete": "メッセージを削除",
+  "mobile.post.failed_retry": "再実行",
+  "mobile.post.failed_title": "メッセージを送信できませんでした",
  "mobile.post.retry": "更新",
  "mobile.request.invalid_response": "サーバーから不正なレスポンスを受け取りました。",
  "mobile.routes.channelInfo": "情報",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "名前は3から15文字にしてください",
  "sso_signup.teamName": "新しいチーム名を入力してください",
  "sso_signup.team_error": "チーム名を入力してください",
-  "suggestion.mention.all": "チャンネルの全員に通知します。{townsquare}で使うとチーム全体に通知します。",
+  "suggestion.mention.all": "注意: チャンネル内の全員に対して投稿します",
  "suggestion.mention.channel": "チャンネルの全員に通知します。",
  "suggestion.mention.channels": "自分のチャンネル",
  "suggestion.mention.here": "チャンネル内のオンラインな全員へ通知します",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "プラットフォームのシステム管理者の役割 {username}",
  "team_members_dropdown.inactive": "無効",
  "team_members_dropdown.leave_team": "チームから脱退させる",
-  "team_members_dropdown.makeActive": "有効にする",
+  "team_members_dropdown.makeActive": "有効化",
  "team_members_dropdown.makeAdmin": "チーム管理者にする",
-  "team_members_dropdown.makeInactive": "無効にする",
+  "team_members_dropdown.makeInactive": "無効化",
  "team_members_dropdown.makeMember": "メンバーにする",
  "team_members_dropdown.member": "メンバー",
  "team_members_dropdown.systemAdmin": "システム管理者",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "新しい電子メールアドレスの確認のため、電子メールを確認してください",
  "user.settings.general.close": "閉じる",
  "user.settings.general.confirmEmail": "電子メールアドレスを確認する",
+  "user.settings.general.currentEmail": "現在の電子メールアドレス",
  "user.settings.general.email": "電子メールアドレス",
  "user.settings.general.emailGitlabCantUpdate": "GitLabからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
  "user.settings.general.emailGoogleCantUpdate": "Googleからログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Office 365でログインしました({email})",
  "user.settings.general.loginSaml": "SAMLでログインしました({email})",
  "user.settings.general.newAddress": "新しい電子メールアドレス: {email}<br />この電子メールアドレスを確認するために電子メールを確認してください。",
+  "user.settings.general.newEmail": "新しい電子メールアドレス",
  "user.settings.general.nickname": "ニックネーム",
  "user.settings.general.nicknameExtra": "ニックネームを使用する(氏名とは異なります)。これにより、同じような氏名とユーザー名を持つ人たちを区別しやすくなります。",
  "user.settings.general.notificationsExtra": "デフォルトでは、だれかがあなたの名前を入力すると、通知が送られます。{notify}の設定でこの動作は変更できます。",
  "user.settings.general.notificationsLink": "通知",
  "user.settings.general.position": "役職",
  "user.settings.general.positionExtra": "役職にはあなたの職業か役割を使用してください。これはあなたのプロフィールポップオーバーに表示されます。",
-  "user.settings.general.primaryEmail": "優先電子メールアドレス",
  "user.settings.general.profilePicture": "プロフィール画像",
  "user.settings.general.title": "全般の設定",
  "user.settings.general.uploadImage": "画像をアップロードするには「編集する」をクリックしてください",
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "파일 위치를 지정하세요.",
  "admin.log.locationTitle": "파일 로그 경로:",
  "admin.log.logSettings": "로그 설정",
+  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
  "admin.logs.reload": "새로 고침",
  "admin.logs.title": "서버 로그",
  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "platform roles system_admin {username}",
  "admin.user_item.emailTitle": "<strong>이메일:</strong> {email}",
  "admin.user_item.inactive": "비활성화",
-  "admin.user_item.makeActive": "활성화",
-  "admin.user_item.makeInactive": "비활성화",
+  "admin.user_item.makeActive": "Activate",
+  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "회원으로 변경",
  "admin.user_item.makeSysAdmin": "시스템 관리자로 변경",
  "admin.user_item.makeTeamAdmin": "팀 관리자로 변경",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {old} to: {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}",
-  "audit_table.accountActive": "계정이 활성화 됨",
-  "audit_table.accountInactive": "계정이 비활성화 됨",
+  "audit_table.accountActive": "Account activated",
+  "audit_table.accountInactive": "Account deactivated",
  "audit_table.action": "활동",
  "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access",
  "audit_table.attemptedLicenseAdd": "Attempted to add new license",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "커스텀 이모티콘이 없습니다.",
  "custom_emoji.header": "커스텀 이모티콘",
  "custom_emoji.search": "커스텀 이모티콘 검색",
+  "deactivate_member_modal.cancel": "취소",
+  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
  "delete_channel.cancel": "취소",
  "delete_channel.confirm": "채널 삭제 확인",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
  "ldap_signup.teamName": "팀 이름을 입력하세요.",
  "ldap_signup.team_error": "팀 이름을 입력하세요.",
+  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?",
  "leave_team_modal.no": "아니요",
  "leave_team_modal.title": "Leave the team?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "취소",
  "mobile.post.delete_question": "정말 {term}을 삭제하시겠습니까?",
  "mobile.post.delete_title": "Delete Post",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "Refresh",
  "mobile.request.invalid_response": "Received invalid response from the server.",
  "mobile.routes.channelInfo": "Info",
@@ -1992,7 +2003,7 @@
  "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",
+  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
  "suggestion.mention.channel": "모든 채널 회원들에게 알림을 보냅니다",
  "suggestion.mention.channels": "채널 더보기",
  "suggestion.mention.here": "채널에 접속 중인 회원들에게 알림을 보냅니다",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "platform roles system_admin {username}",
  "team_members_dropdown.inactive": "비활성",
  "team_members_dropdown.leave_team": "팀에서 추방하기",
-  "team_members_dropdown.makeActive": "활성화",
+  "team_members_dropdown.makeActive": "Activate",
  "team_members_dropdown.makeAdmin": "팀 관리자로 설정하기",
-  "team_members_dropdown.makeInactive": "비활성화",
+  "team_members_dropdown.makeInactive": "Deactivate",
  "team_members_dropdown.makeMember": "회원으로 설정하기",
  "team_members_dropdown.member": "회원",
  "team_members_dropdown.systemAdmin": "시스템 관리자",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "Check your email to verify your new address",
  "user.settings.general.close": "닫기",
  "user.settings.general.confirmEmail": "이메일 확인",
+  "user.settings.general.currentEmail": "Current Email",
  "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}.",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Login done through GitLab ({email})",
  "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.newEmail": "New Email",
  "user.settings.general.nickname": "별명",
  "user.settings.general.nicknameExtra": "본명과 사용자명과는 다르게 불리는 고유한 이름을 사용하세요. 비슷한 이름을 가진 사람들이 모여있을 때 자주 사용됩니다.",
  "user.settings.general.notificationsExtra": "기본적으로 이 곳에 설정된 이름으로 언급되었을 때 멘션 알림을 받게됩니다. {notify}에서 기본 설정을 변경하세요.",
  "user.settings.general.notificationsLink": "알림",
  "user.settings.general.position": "Position",
  "user.settings.general.positionExtra": "Use Position for your role or job title. This will be shown in your profile popover.",
-  "user.settings.general.primaryEmail": "주 이메일",
  "user.settings.general.profilePicture": "프로필 사진",
  "user.settings.general.title": "일반 설정",
  "user.settings.general.uploadImage": "'편집'을 클릭하여 사진 업로드",
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "Voer uw bestand locatie in",
  "admin.log.locationTitle": "Map voor logs:",
  "admin.log.logSettings": "Log instellingen",
+  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
  "admin.logs.reload": "Herladen",
  "admin.logs.title": "Server Logs",
  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "platform roles system_admin {username}",
  "admin.user_item.emailTitle": "<strong>E-mail:</strong> {email}",
  "admin.user_item.inactive": "Inactief",
-  "admin.user_item.makeActive": "Maak actief",
-  "admin.user_item.makeInactive": "Maak inactief",
+  "admin.user_item.makeActive": "Activate",
+  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "Maak lid",
  "admin.user_item.makeSysAdmin": "Maak systeembeheerder",
  "admin.user_item.makeTeamAdmin": "Maak team beheerder",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {old} to: {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}",
-  "audit_table.accountActive": "Account is actief gemaakt",
-  "audit_table.accountInactive": "Account is inactief gemaakt",
+  "audit_table.accountActive": "Account activated",
+  "audit_table.accountInactive": "Account deactivated",
  "audit_table.action": "Actie",
  "audit_table.attemptedAllowOAuthAccess": "Poging om een nieuwe OAuth dienst toegang te verlenen",
  "audit_table.attemptedLicenseAdd": "Poging om een nieuwe licentie toe te voegen",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "Geen custom emoji gevonden",
  "custom_emoji.header": "Aangepaste emoji",
  "custom_emoji.search": "Zoek custom Emoji",
+  "deactivate_member_modal.cancel": "Annuleren",
+  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
  "delete_channel.cancel": "Annuleren",
  "delete_channel.confirm": "Bevestig het WISSEN van het kanaal",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "De naam moet 3 of meer tekens zijn met een maximum van 15",
  "ldap_signup.teamName": "Voer de team naam in",
  "ldap_signup.team_error": "Voer de team naam in",
+  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "Je zal worden verwijdert uit alle publieke kanalen en prive groepen.  Als het team prive is kan je niet terugkeren in het team.  Weet je het zeker?",
  "leave_team_modal.no": "Nee",
  "leave_team_modal.title": "Verlaat het team?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "Annuleren",
  "mobile.post.delete_question": "Weet u zeker dat u deze {term} wilt verwijderen?",
  "mobile.post.delete_title": "Delete Post",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "Refresh",
  "mobile.request.invalid_response": "Received invalid response from the server.",
  "mobile.routes.channelInfo": "Info",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "De naam moet 3 of meer tekens lang zijn met een maximum van 15",
  "sso_signup.teamName": "Voer de naam in van het nieuwe team",
  "sso_signup.team_error": "Voer de naam in van het team",
-  "suggestion.mention.all": "Notificeert iedereen in het kanaal, gebruik in {townsquare} to notificeer het hele team",
+  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
  "suggestion.mention.channel": "Notificeer iedereen in het kanaal",
  "suggestion.mention.channels": "Mijn Kanalen",
  "suggestion.mention.here": "Notificeert iedereen in het kanaal en online",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "platform roles system_admin {username}",
  "team_members_dropdown.inactive": "Inactief",
  "team_members_dropdown.leave_team": "Uit team verwijderen",
-  "team_members_dropdown.makeActive": "Maak actief",
+  "team_members_dropdown.makeActive": "Activate",
  "team_members_dropdown.makeAdmin": "Maak team beheerder",
-  "team_members_dropdown.makeInactive": "Maak inactief",
+  "team_members_dropdown.makeInactive": "Deactivate",
  "team_members_dropdown.makeMember": "Maak lid",
  "team_members_dropdown.member": "Lid",
  "team_members_dropdown.systemAdmin": "Systeem beheerder",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "Controleer uw e-mail voor uw nieuwe adres",
  "user.settings.general.close": "Afsluiten",
  "user.settings.general.confirmEmail": "Bevestig e-mail",
+  "user.settings.general.currentEmail": "Current Email",
  "user.settings.general.email": "E-mail",
  "user.settings.general.emailGitlabCantUpdate": "Login gebeurt via GitLab. Het e-mail adres kan niet bijgewerkt worden. Het e-mail adres dat gebruikt wordt voor meldingen is {email}.",
  "user.settings.general.emailGoogleCantUpdate": "Login gebeurt via Google. Het e-mail adres kan niet bijgewerkt worden. Het e-mail adres dat gebruikt wordt voor meldingen is {email}.",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Login via Office 365 ({email})",
  "user.settings.general.loginSaml": "Login via SAML ({email})",
  "user.settings.general.newAddress": "Nieuw adres: {email}<br />Controleer uw e-mail om dit adres te valideren.",
+  "user.settings.general.newEmail": "New Email",
  "user.settings.general.nickname": "Bijnaam",
  "user.settings.general.nicknameExtra": "Gebruik Bijnaam om een naam te gebruiken hoe je wilt worden genoemd die verschillend is van je voornaam en je gebruikersnaam. Dit word vaak gebruikt als 2 of meer mensen een zelfde naam of gebruikersnaam hebben. ",
  "user.settings.general.notificationsExtra": "Standaard ontvang je een vermelding notificatie wanneer iemand jouw voornaam typt. Ga naar {notify} instellingen om deze standaard te veranderen.",
  "user.settings.general.notificationsLink": "Meldingen",
  "user.settings.general.position": "Position",
  "user.settings.general.positionExtra": "Use Position for your role or job title. This will be shown in your profile popover.",
-  "user.settings.general.primaryEmail": "Primaire e-mail",
  "user.settings.general.profilePicture": "Profiel afbeelding",
  "user.settings.general.title": "Algemene instellingen",
  "user.settings.general.uploadImage": "Klik 'Bewerken' om een afbeelding up te loaden.",
--- a/webapp/i18n/pl.json
+++ b/webapp/i18n/pl.json
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "Entre a localização do seu arquivo",
  "admin.log.locationTitle": "Diretório de Arquivo de Log:",
  "admin.log.logSettings": "Configurações de Log",
+  "admin.logs.bannerDesc": "Para procurar por usuário pelo ID do usuário, vá em Relatórios > Usuários e cole o ID no filtro de busca.",
  "admin.logs.reload": "Recarregar",
  "admin.logs.title": "Log do Servidor",
  "admin.metrics.enableDescription": "Quando verdadeiro, Mattermost irá habilitar a coleta do monitoramento de performance e profiling. Por favor verifique <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentação</a> para ler mais sobre como configurar o monitoramento de performance para Mattermost.",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "platform roles system_admin {username}",
  "admin.user_item.emailTitle": "<strong>Email:</strong> {email}",
  "admin.user_item.inactive": "Inativo",
-  "admin.user_item.makeActive": "Tornar Ativo",
-  "admin.user_item.makeInactive": "Tornar Inativo",
+  "admin.user_item.makeActive": "Ativar",
+  "admin.user_item.makeInactive": "Desativar",
  "admin.user_item.makeMember": "Tornar um Membro",
  "admin.user_item.makeSysAdmin": "Tornar Admin do Sistema",
  "admin.user_item.makeTeamAdmin": "Tornar Admin de Equipe",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} removeu o propósito do canal (era: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} atualizou o propósito do canal de: {old} para: {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} atualizou o propósito do canal para: {new}",
-  "audit_table.accountActive": "Conta inativada",
-  "audit_table.accountInactive": "Conta inativada",
+  "audit_table.accountActive": "Conta ativada",
+  "audit_table.accountInactive": "Conta desativada",
  "audit_table.action": "Ação",
  "audit_table.attemptedAllowOAuthAccess": "Tentativa de permitir um novo acesso ao serviço OAuth",
  "audit_table.attemptedLicenseAdd": "Tentativa de adicionar uma nova licença",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "Emoji personalizado não encontrado",
  "custom_emoji.header": "Emoji Personalizado",
  "custom_emoji.search": "Pesquisar Emoji Personalizado",
+  "deactivate_member_modal.cancel": "Cancelar",
+  "deactivate_member_modal.deactivate": "Desativar",
+  "deactivate_member_modal.desc": "Esta ação desativa {username}. Eles serão desconectados e não terão acesso a nenhuma equipe ou canais neste sistema. Você tem certeza que deseja desativar {username}?",
+  "deactivate_member_modal.title": "Desativar {username}",
  "default_channel.purpose": "Poste mensagens aqui que você quer que todos vejam. Todos se tornam automaticamente membros permanentes deste canal quando se juntam à equipe.",
  "delete_channel.cancel": "Cancelar",
  "delete_channel.confirm": "Confirmar EXCLUSÃO do Canal",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "O nome deve ser de 3 ou mais caracteres até um máximo de 15",
  "ldap_signup.teamName": "Entre o nome da nova equipe",
  "ldap_signup.team_error": "Por favor entre o nome da equipe",
+  "leave_private_channel_modal.leave": "Sim, deixar o canal",
+  "leave_private_channel_modal.message": "Você tem certeza que deseja deixar o canal privado {channel}? Você precisar ser convidado novamente para se juntar a este canal no futuro.",
+  "leave_private_channel_modal.title": "Deixar Canal Privado {channel}",
  "leave_team_modal.desc": "Você será removido de todos os canais públicos e privados.  Se a equipe é privada você não será capaz de se juntar à equipe.  Você tem certeza?",
  "leave_team_modal.no": "Não",
  "leave_team_modal.title": "Deixar a equipe?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "Cancelar",
  "mobile.post.delete_question": "Tem certeza de que deseja excluir este post?",
  "mobile.post.delete_title": "Deletar Post",
+  "mobile.post.failed_delete": "Excluir mensagem",
+  "mobile.post.failed_retry": "Tentar novamente",
+  "mobile.post.failed_title": "Não foi possível enviar sua mensagem",
  "mobile.post.retry": "Atualizar",
  "mobile.request.invalid_response": "Recebido uma resposta inválida do servidor.",
  "mobile.routes.channelInfo": "Informações",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "O nome deve ser de 3 ou mais caracteres até um máximo de 15",
  "sso_signup.teamName": "Entre o nome da nova equipe",
  "sso_signup.team_error": "Por favor entre o nome da equipe",
-  "suggestion.mention.all": "Notifique a todos no canal, use {townsquare} para notificar toda a equipe",
+  "suggestion.mention.all": "ATENÇÃO: Todos no canal serão mencionados.",
  "suggestion.mention.channel": "Notifica todos no canal",
  "suggestion.mention.channels": "Meus Canais",
  "suggestion.mention.here": "Notifica todos os conectados ao canal",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "platform roles system_admin {username}",
  "team_members_dropdown.inactive": "Inativo",
  "team_members_dropdown.leave_team": "Remover da equipe",
-  "team_members_dropdown.makeActive": "Tornar Ativo",
+  "team_members_dropdown.makeActive": "Ativar",
  "team_members_dropdown.makeAdmin": "Tornar Admin de Equipe",
-  "team_members_dropdown.makeInactive": "Tornar Inativo",
+  "team_members_dropdown.makeInactive": "Desativar",
  "team_members_dropdown.makeMember": "Tornar Membro",
  "team_members_dropdown.member": "Membro",
  "team_members_dropdown.systemAdmin": "Admin do Sistema",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "Verifique seu email para confirmar seu novo endereço",
  "user.settings.general.close": "Fechar",
  "user.settings.general.confirmEmail": "Confirmar o email",
+  "user.settings.general.currentEmail": "Email Atual",
  "user.settings.general.email": "E-mail",
  "user.settings.general.emailGitlabCantUpdate": "Login ocorre através do GitLab. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
  "user.settings.general.emailGoogleCantUpdate": "Login ocorre através do Google. Email não pode ser atualizado. Endereço de email utilizado para notificações é {email}.",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Login feito através do Office 365 ({email})",
  "user.settings.general.loginSaml": "Login feito através de SAML ({email})",
  "user.settings.general.newAddress": "Novo Endereço: {email}<br />Verifique seu email para checar o endereço acima.",
+  "user.settings.general.newEmail": "Novo Email",
  "user.settings.general.nickname": "Apelido",
  "user.settings.general.nicknameExtra": "Use Apelidos para um nome você pode ser chamado assim, isso é diferente de seu primeiro nome e nome de usuário. Este é mais frequentemente usado quando duas ou mais pessoas têm nomes semelhantes de usuário.",
  "user.settings.general.notificationsExtra": "Por padrão, você receberá uma notificação de menção quando alguém digitar seu nome. Vá para definições {notify} para alterar esse padrão.",
  "user.settings.general.notificationsLink": "Notificações",
  "user.settings.general.position": "Cargo",
  "user.settings.general.positionExtra": "Utilize Posição para seu papel ou cargo. Isto será mostrado no seu profile.",
-  "user.settings.general.primaryEmail": "Email Primário",
  "user.settings.general.profilePicture": "Imagem do Perfil",
  "user.settings.general.title": "Definições Gerais",
  "user.settings.general.uploadImage": "Clique em 'Editar' para enviar uma imagem.",
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "Укажите расположение файла",
  "admin.log.locationTitle": "Каталог с файлом журнала:",
  "admin.log.logSettings": "Настройки журнала",
+  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
  "admin.logs.reload": "Перезагрузить",
  "admin.logs.title": "Серверные логи",
  "admin.metrics.enableDescription": "Если включено, в Mattermost будет включен сбор данных о производительности и профилирование. Дополнительную информацию по конфигурации мониторинга производительности смотрите в <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>документации</a>.",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "Роли платформы system_admin {username}",
  "admin.user_item.emailTitle": "<strong>Email:</strong> {email}",
  "admin.user_item.inactive": "Неактивен",
-  "admin.user_item.makeActive": "Сделать активным",
-  "admin.user_item.makeInactive": "Сделать неактивным",
+  "admin.user_item.makeActive": "Активность",
+  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "Сделать участником",
  "admin.user_item.makeSysAdmin": "Сделать администратором системы",
  "admin.user_item.makeTeamAdmin": "Сделать администратором команды",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} удалил заголовок канала (было: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} сменил заголовок канала с {old} на {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} установил заголовок канала: {new}",
-  "audit_table.accountActive": "Сделать аккаунт активным",
-  "audit_table.accountInactive": "Сделать аккаунт неактивным",
+  "audit_table.accountActive": "Account activated",
+  "audit_table.accountInactive": "Account deactivated",
  "audit_table.action": "Действие",
  "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access",
  "audit_table.attemptedLicenseAdd": "Попытка добавления новой лицензии",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "Не найдено загруженного  эмодзи",
  "custom_emoji.header": "Пользовательские смайлы",
  "custom_emoji.search": "Найти кастомные Emoji",
+  "deactivate_member_modal.cancel": "Отмена",
+  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.",
  "delete_channel.cancel": "Отмена",
  "delete_channel.confirm": "Подтверждение УДАЛЕНИЯ канала",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "Имя должно быть длиннее 3 символов и короче 15.",
  "ldap_signup.teamName": "Введите название новой команды",
  "ldap_signup.team_error": "Пожалуйста, введите имя команды",
+  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "Вы будете удалены из всех публичных каналов и приватных групп. Если команда приватная, то вы не сможете вернуться. Вы уверены?",
  "leave_team_modal.no": "Нет",
  "leave_team_modal.title": "Покинуть команду?",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "Отмена",
  "mobile.post.delete_question": "Вы действительно хотите удалить запись?",
  "mobile.post.delete_title": "Delete Post",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "Refresh",
  "mobile.request.invalid_response": "Received invalid response from the server.",
  "mobile.routes.channelInfo": "Info",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "Имя должно быть более 3 и менее 15 символов",
  "sso_signup.teamName": "Введите название новой команды",
  "sso_signup.team_error": "Введите имя команды",
-  "suggestion.mention.all": "Уведомить всех в канале, используйте в {townsquare}, чтобы уведомить всю команду",
+  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
  "suggestion.mention.channel": "Уведомляет всех на канале",
  "suggestion.mention.channels": "Мои каналы",
  "suggestion.mention.here": "Уведомлять всех в канале и на сайте",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "Роли платформы system_admin {username}",
  "team_members_dropdown.inactive": "Неактивен",
  "team_members_dropdown.leave_team": "Удалить из команды",
-  "team_members_dropdown.makeActive": "Сделать активным",
+  "team_members_dropdown.makeActive": "Активность",
  "team_members_dropdown.makeAdmin": "Сделать администратором команды",
-  "team_members_dropdown.makeInactive": "Сделать неактивным",
+  "team_members_dropdown.makeInactive": "Deactivate",
  "team_members_dropdown.makeMember": "Сделать участником",
  "team_members_dropdown.member": "Участник",
  "team_members_dropdown.systemAdmin": "Системный администратор",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "Для верификации нового адреса проверьте ваш почтовый ящик",
  "user.settings.general.close": "Закрыть",
  "user.settings.general.confirmEmail": "Подтвердите Email",
+  "user.settings.general.currentEmail": "Current Email",
  "user.settings.general.email": "Email",
  "user.settings.general.emailGitlabCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
  "user.settings.general.emailGoogleCantUpdate": "Вход осуществлен через Google. Адрес электронной почты не может быть обновлен. Адрес электронной почты используемый для уведомлений {email}.",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "Вход через Office 365 ({email})",
  "user.settings.general.loginSaml": "Вход выполнен через SAML ({email})",
  "user.settings.general.newAddress": "Новый адрес: {email}<br />Проверьте ваш E-Mail для подтверждения адреса выше.",
+  "user.settings.general.newEmail": "New Email",
  "user.settings.general.nickname": "Псеводним",
  "user.settings.general.nicknameExtra": "Используйте псевдоним в качестве имени, если Вас можно называть отлично от имени или имени пользователя. Псевдоним полезно использовать, когда два или более человека имеют созвучные имена или имена пользователей.",
  "user.settings.general.notificationsExtra": "По умолчанию Вы получаете уведомления о упоминаниях, когда кто-либо пишет Ваше имя. Для изменения перейдите в настройки {notify}.",
  "user.settings.general.notificationsLink": "Уведомления",
  "user.settings.general.position": "Должность",
  "user.settings.general.positionExtra": "Укажите вашу должность. Эта информация будет отображена в вашем профиле.",
-  "user.settings.general.primaryEmail": "Основной адрес электронной почты",
  "user.settings.general.profilePicture": "Изображение профиля",
  "user.settings.general.title": "Общие настройки",
  "user.settings.general.uploadImage": "Нажмите 'Изменить' для загрузки изображения.",
@@ -2302,7 +2314,7 @@
  "user.settings.push_notification.send": "Отправить мобильное push-уведомление",
  "user.settings.push_notification.status": "Отправить push-уведомление когда",
  "user.settings.push_notification.status_info": "Уведомления на телефон будут присылаться только если ваш статус будет совпадать с выбранным выше.",
-  "user.settings.security.active": "Active",
+  "user.settings.security.active": "Активность",
  "user.settings.security.close": "Закрыть",
  "user.settings.security.currentPassword": "Текущий пароль",
  "user.settings.security.currentPasswordError": "Введите текущий пароль",
--- a/webapp/i18n/zh-CN.json
+++ b/webapp/i18n/zh-CN.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "输入你的文件位置",
  "admin.log.locationTitle": "日志文件目录：",
  "admin.log.logSettings": "日志设置",
+  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
  "admin.logs.reload": "重载",
  "admin.logs.title": "服务器日志",
  "admin.metrics.enableDescription": "当设置为是时，Mattermost 会启用性能监控收集和分析。请查看<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>文档</a>了解更多Mattermost 性能监控配置信息。",
@@ -896,8 +897,8 @@
  "admin.user_item.confirmDemotionCmd": "platform roles system_admin {username}",
  "admin.user_item.emailTitle": "<strong>电子邮件：</strong> {email}",
  "admin.user_item.inactive": "停用",
-  "admin.user_item.makeActive": "设置为启用",
-  "admin.user_item.makeInactive": "设置为停用",
+  "admin.user_item.makeActive": "活动的",
+  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "设置为成员",
  "admin.user_item.makeSysAdmin": "设置为系统管理员",
  "admin.user_item.makeTeamAdmin": "设置为团队管理员",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} 移除了频道作用 (曾是：{old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} 更新了频道作用从：{old} 到：{new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} 更新了频道作用到：{new}",
-  "audit_table.accountActive": "账户激活",
-  "audit_table.accountInactive": "停用帐号",
+  "audit_table.accountActive": "Account activated",
+  "audit_table.accountInactive": "Account deactivated",
  "audit_table.action": "操作",
  "audit_table.attemptedAllowOAuthAccess": "试图允许一个新的OAuth服务访问",
  "audit_table.attemptedLicenseAdd": "试图添加新的许可证",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "未找到自定义表情符",
  "custom_emoji.header": "自定义表情符",
  "custom_emoji.search": "搜索自定义表情符",
+  "deactivate_member_modal.cancel": "取消",
+  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "发表您想所有人看到的消息。所有人在加入团队时候自动成员此频道的永久成员。",
  "delete_channel.cancel": "取消",
  "delete_channel.confirm": "确认删除频道",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "名称必须为3至15个字母",
  "ldap_signup.teamName": "输入新团队名",
  "ldap_signup.team_error": "请输入团队名",
+  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "您将会从所有公共频道和私有频道移除。如果团队是私有的，您将无法再加入。您确定吗？",
  "leave_team_modal.no": "否",
  "leave_team_modal.title": "退出团队？",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "取消",
  "mobile.post.delete_question": "您确认要删除此消息？",
  "mobile.post.delete_title": "删除消息",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "刷新",
  "mobile.request.invalid_response": "从服务器收到了无效回应。",
  "mobile.routes.channelInfo": "信息",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "团队名必须为3-15个字母",
  "sso_signup.teamName": "输入新团队名",
  "sso_signup.team_error": "输入团队名",
-  "suggestion.mention.all": "通知频道全员，使用在 {townsquare} 来通知团队",
+  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
  "suggestion.mention.channel": "通知每个频道",
  "suggestion.mention.channels": "我的频道",
  "suggestion.mention.here": "通知所有在此频道在线的人",
@@ -2031,9 +2042,9 @@
  "team_members_dropdown.confirmDemotionCmd": "platform roles system_admin {username}",
  "team_members_dropdown.inactive": "停用",
  "team_members_dropdown.leave_team": "从团队删除",
-  "team_members_dropdown.makeActive": "设置活跃",
+  "team_members_dropdown.makeActive": "活动的",
  "team_members_dropdown.makeAdmin": "设置团队管理员",
-  "team_members_dropdown.makeInactive": "设置为停用状态",
+  "team_members_dropdown.makeInactive": "Deactivate",
  "team_members_dropdown.makeMember": "设置成员",
  "team_members_dropdown.member": "成员",
  "team_members_dropdown.systemAdmin": "系统管理员",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "查看你的电子邮件来验证你的新地址",
  "user.settings.general.close": "关闭",
  "user.settings.general.confirmEmail": "确认电子邮件",
+  "user.settings.general.currentEmail": "Current Email",
  "user.settings.general.email": "电子邮件",
  "user.settings.general.emailGitlabCantUpdate": "通过GitLab进行登录。电子邮件不能被更新，用于通知的电子邮件地址是{email}。",
  "user.settings.general.emailGoogleCantUpdate": "通过Google进行登录。电子邮件不能被更新。用于通知的电子邮件地址是{email}。",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "通过Office 365({email})登录",
  "user.settings.general.loginSaml": "通过SAML ({email}) 登录",
  "user.settings.general.newAddress": "新地址：{email}<br/>查看您的邮箱来验证上面的地址。",
+  "user.settings.general.newEmail": "New Email",
  "user.settings.general.nickname": "昵称",
  "user.settings.general.nicknameExtra": "使用一个您可能会称呼的与您的名字和用户名不同的昵称作为名字。此方法最常用于两个或多个人有类似的名字和用户名时。",
  "user.settings.general.notificationsExtra": "默认情况下，当有人输入您的名字时，您将收到提及通知。您可在{notify}设置中更改此默认设置。",
  "user.settings.general.notificationsLink": "通知",
  "user.settings.general.position": "职位",
  "user.settings.general.positionExtra": "使用职位表示您的角色或职称。这将会在个人资料提示中显示。",
-  "user.settings.general.primaryEmail": "主要电子邮件",
  "user.settings.general.profilePicture": "照片",
  "user.settings.general.title": "基本设置",
  "user.settings.general.uploadImage": "点击 '编辑' 上传图片。",
--- a/webapp/i18n/zh-TW.json
+++ b/webapp/i18n/zh-TW.json
@@ -532,6 +532,7 @@
  "admin.log.locationPlaceholder": "輸入檔案位置",
  "admin.log.locationTitle": "記錄檔案目錄：",
  "admin.log.logSettings": "記錄檔設定值",
+  "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.",
  "admin.logs.reload": "重新載入",
  "admin.logs.title": "主機記錄",
  "admin.metrics.enableDescription": "啟用時，Mattermost 會啟用效能監視的收集與分析。詳細如何設定 Mattermost 的效能監視，請參閱<a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>文件</a>。",
@@ -897,7 +898,7 @@
  "admin.user_item.emailTitle": "<strong>電子郵件：</strong> {email}",
  "admin.user_item.inactive": "停用",
  "admin.user_item.makeActive": "啟用",
-  "admin.user_item.makeInactive": "停用",
+  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "設為成員",
  "admin.user_item.makeSysAdmin": "設為系統管理員",
  "admin.user_item.makeTeamAdmin": "設為團隊管理員",
@@ -988,8 +989,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} 已移除頻道用途(原為：{old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} 已更新頻道用途：從 {old} 改為 {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} 已更新頻道用途為：{new}",
-  "audit_table.accountActive": "啟用帳號",
-  "audit_table.accountInactive": "停用帳號",
+  "audit_table.accountActive": "Account activated",
+  "audit_table.accountInactive": "Account deactivated",
  "audit_table.action": "動作",
  "audit_table.attemptedAllowOAuthAccess": "嘗試允許新的 OAuth 服務存取",
  "audit_table.attemptedLicenseAdd": "嘗試加入新的授權",
@@ -1230,6 +1231,10 @@
  "custom_emoji.empty": "沒有自訂繪文字",
  "custom_emoji.header": "自訂繪文字",
  "custom_emoji.search": "搜尋自訂繪文字",
+  "deactivate_member_modal.cancel": "取消",
+  "deactivate_member_modal.deactivate": "Deactivate",
+  "deactivate_member_modal.desc": "This action deactivates {username}. They will be logged out and not have access to any teams or channels on this system. Are you sure you want to deactivate {username}?",
+  "deactivate_member_modal.title": "Deactivate {username}",
  "default_channel.purpose": "在此張貼希望所有人都可以看到的訊息。每個人在加入團隊的時候會自動成為此頻道的永久成員。",
  "delete_channel.cancel": "取消",
  "delete_channel.confirm": "請確認刪除頻道",
@@ -1582,6 +1587,9 @@
  "ldap_signup.length_error": "名稱長度為3到15字元",
  "ldap_signup.teamName": "輸入新團隊名稱",
  "ldap_signup.team_error": "請輸入團隊名稱",
+  "leave_private_channel_modal.leave": "Yes, leave channel",
+  "leave_private_channel_modal.message": "Are you sure you wish to leave the private channel {channel}? You must be re-invited in order to re-join this channel in the future.",
+  "leave_private_channel_modal.title": "Leave Private Channel {channel}",
  "leave_team_modal.desc": "將離開所有的公開與私人頻道。如果團隊是私人團隊，將無法重新加入。您確定嘛？",
  "leave_team_modal.no": "否",
  "leave_team_modal.title": "離開團隊？",
@@ -1706,6 +1714,9 @@
  "mobile.post.cancel": "取消",
  "mobile.post.delete_question": "確定要刪除此訊息嘛？",
  "mobile.post.delete_title": "刪除訊息",
+  "mobile.post.failed_delete": "Delete Message",
+  "mobile.post.failed_retry": "Try Again",
+  "mobile.post.failed_title": "Unable to send your message",
  "mobile.post.retry": "Refresh",
  "mobile.request.invalid_response": "從伺服器傳來無效的回應。",
  "mobile.routes.channelInfo": "相關資訊",
@@ -1992,7 +2003,7 @@
  "sso_signup.length_error": "名稱長度為3到15字元",
  "sso_signup.teamName": "輸入新團隊名稱",
  "sso_signup.team_error": "請輸入團隊名稱",
-  "suggestion.mention.all": "通知頻道全員。在{townsquare}使用來通知全團隊。",
+  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
  "suggestion.mention.channel": "通知頻道全員",
  "suggestion.mention.channels": "我的頻道",
  "suggestion.mention.here": "通知此頻道所有在線的人",
@@ -2033,7 +2044,7 @@
  "team_members_dropdown.leave_team": "移出團隊",
  "team_members_dropdown.makeActive": "啟用",
  "team_members_dropdown.makeAdmin": "設為團隊管理員",
-  "team_members_dropdown.makeInactive": "停用",
+  "team_members_dropdown.makeInactive": "Deactivate",
  "team_members_dropdown.makeMember": "設為成員",
  "team_members_dropdown.member": "成員",
  "team_members_dropdown.systemAdmin": "系統管理",
@@ -2158,6 +2169,7 @@
  "user.settings.general.checkEmailNoAddress": "請檢查電子郵件信箱以驗證新的電子郵件地址。",
  "user.settings.general.close": "關閉",
  "user.settings.general.confirmEmail": "電子郵件地址確認",
+  "user.settings.general.currentEmail": "Current Email",
  "user.settings.general.email": "電子郵件地址",
  "user.settings.general.emailGitlabCantUpdate": "經由 GitLab 登入。無法變更電子郵件地址。通知將會寄送到 {email}。",
  "user.settings.general.emailGoogleCantUpdate": "經由 Google 登入。無法變更電子郵件地址。通知將會寄送到 {email}。",
@@ -2185,13 +2197,13 @@
  "user.settings.general.loginOffice365": "已經由 Office 365 登入 ({email})",
  "user.settings.general.loginSaml": "已經由 SAML 登入 ({email})",
  "user.settings.general.newAddress": "新電子郵件地址：{email}<br />請檢查電子郵件信箱以驗證上面的地址。",
+  "user.settings.general.newEmail": "New Email",
  "user.settings.general.nickname": "匿稱",
  "user.settings.general.nicknameExtra": "暱稱讓您有個除了名字跟使用者名稱以外的稱呼。這通常使用在有多個人的名字跟使用者名稱聽起來差不多的情況。",
  "user.settings.general.notificationsExtra": "預設情況下當有人輸入您的名字時您將會收到提及通知。請到{notify}以變更設定。",
  "user.settings.general.notificationsLink": "通知",
  "user.settings.general.position": "職位",
  "user.settings.general.positionExtra": "用職位表示您的角色或職稱。這將會顯示於個人資訊中。",
-  "user.settings.general.primaryEmail": "主要電子郵件地址",
  "user.settings.general.profilePicture": "個人圖像",
  "user.settings.general.title": "一般設定",
  "user.settings.general.uploadImage": "按下'編輯'以上傳圖像。",