daily translations 20160708 (#3533)

12 files changed, 1436 insertions, 562 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 463c7f74d..c7a8d2966 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -49,19 +49,19 @@
   },
   {
     "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Leeres Array unterhalb von 'Datei' in der Anfrage"
+    "translation": "Leeres Array unterhalb von 'certificate' in der Anfrage"
   },
   {
     "id": "api.admin.add_certificate.no_file.app_error",
-    "translation": "keine Datei unter 'file' in der Anfrage"
+    "translation": "keine Datei unter 'certificate' in der Anfrage"
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "Could not open certificate file"
+    "translation": "Konnte die Zertifikatsdatei nicht öffnen"
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
-    "translation": "Could not save certificate file"
+    "translation": "Konnte die Zertifikatsdatei nicht speichern"
   },
   {
     "id": "api.admin.file_read_error",
@@ -89,11 +89,11 @@
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
-    "translation": "An error occurred while deleting the certificate. Make sure the file config/{{.Filename}} exists."
+    "translation": "Ein Fehler ist beim Löschen des Zertifikats aufgetreten. Stellen Sie sicher, dass die Datei config/{{.Filename}} existiert."
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata"
+    "translation": "Beim Erstellen der Service Provider Metadaten ist ein Fehler aufgetreten"
   },
   {
     "id": "api.admin.test_email.body",
@@ -172,6 +172,22 @@
     "translation": "Der Benutzer konnte dem Channel-Typ nicht hinzugefügt werden"
   },
   {
+    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
+    "translation": "Management und Erstellung von privaten Gruppen ist auf Systemadministratoren begrenzt."
+  },
+  {
+    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
+    "translation": "Management und Erstellung von privaten Gruppen ist auf Team- und Systemadministratoren begrenzt."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
+    "translation": "Management und Erstellung von öffentlichen Kanälen ist auf Systemadministratoren begrenzt."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
+    "translation": "Management und Erstellung von öffentlichen Kanälen ist auf Team- und Systemadministratoren begrenzt."
+  },
+  {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Für die Erstellung eines Direct-Messenging Channel muss der createDirectChannel API Service verwendet werden"
   },
@@ -613,7 +629,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Unable to create emoji. Image must be less than 64 KB in size."
+    "translation": "Das Emoji konnte nicht erstellt werden. Das Bild darf maximal 64 KB groß sein."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -645,7 +661,7 @@
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image must be at most 128 by 128 pixels."
+    "translation": "Das Emoji konnte nicht erstellt werden. Das Bild darf maximal 128 x 128 pixel groß sein."
   },
   {
     "id": "api.export.json.app_error",
@@ -1125,7 +1141,7 @@
   },
   {
     "id": "api.saml.save_certificate.app_error",
-    "translation": "Certificate did not save properly."
+    "translation": "Das Zertifikat konnte nicht korrekt gespeichert werden."
   },
   {
     "id": "api.server.new_server.init.info",
@@ -1360,6 +1376,10 @@
     "translation": "Team gelöscht. %v id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "Der Benutzer scheint nicht Teil dieses Teams zu sein."
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Team Anmeldung mit einer E-Mailadresse ist ausgeschaltet."
   },
@@ -1756,6 +1776,10 @@
     "translation": "Login nicht möglich weil Ihr Account inaktiv ist.   Bitte melden Sie sich bei einem Administrator."
   },
   {
+    "id": "api.user.login.invalid_credentials",
+    "translation": "User ID or password incorrect."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "Entweder Nutzername oder Teamname und E-Mail-Addresse müssen angegeben werden"
   },
@@ -1833,7 +1857,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "MFA ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt"
+    "translation": "SAML ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2068,6 +2092,10 @@
     "translation": "Die Berechtigungen für die Erneuerung des Webhooks-Tokens sind ungeeignet"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "Feature erfordert Enterprise Lizenz. Bitte kontaktieren Sie Ihren Systemadministrator wegen Upgrade Ihrer Enterprise Lizenz."
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "Konnte Bild nicht dekodieren."
   },
@@ -2113,7 +2141,7 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "Compliance Funktionalität durch die aktuelle Lizenz deaktiviert. Bitte kontaktieren Sie Ihren Systemadministrator wegen eines Enterprise Lizenzupgrades."
+    "translation": "Benutzerdefinierte Emojireaktionen durch die aktuelle Lizenz deaktiviert. Bitte kontaktieren Sie Ihren Systemadministrator wegen eines Enterprise Lizenzupgrades."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2205,71 +2233,71 @@
   },
   {
     "id": "ent.saml.build_request.app_error",
-    "translation": "An error occurred while initiating the request to the Identity Provider. Please contact your System Administrator."
+    "translation": "Bei der Verbindung zum Identitäten Anbieter trat ein Fehler auf. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.build_request.encoding.app_error",
-    "translation": "An error occurred while encoding the request for the Identity Provider. Please contact your System Administrator."
+    "translation": "Beim Kodieren der Anfrage für den Identitäten Anbieter trat ein Fehler auf. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.build_request.encoding_signed.app_error",
-    "translation": "An error occurred while encoding the signed request for the Identity Provider. Please contact your System Administrator."
+    "translation": "Fehler beim enkodieren der verschlüsselten Anfrage an den Identitätsprovider. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.configure.app_error",
-    "translation": "An error occurred while configuring SAML Service Provider, err=%v"
+    "translation": "Fehler beim Konfigurieren des SAML Service Providers, err=%v"
   },
   {
     "id": "ent.saml.configure.encryption_not_enabled.app_error",
-    "translation": "SAML login was unsuccessful because encryption is not enabled. Please contact your System Administrator."
+    "translation": "SAML login war nicht erfolgreich da Verschlüsselung nicht aktiviert ist. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.configure.load_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "Datei des öffentlichen Zertifikats des Identitätsproviders nicht gefunden. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.configure.load_private_key.app_error",
-    "translation": "SAML login was unsuccessful because the Service Provider Private Key was not found. Please contact your System Administrator."
+    "translation": "SAML Login war nicht erfolgreich da der private Schlüssel des Service Providers nicht gefunden wurde. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.configure.load_public_cert.app_error",
-    "translation": "Service Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "Datei für das öffentliche Zertifikat des Serviceproviders nicht gefunden. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.configure.not_encrypted_response.app_error",
-    "translation": "SAML login was unsuccessful as the Identity Provider response is not encrypted. Please contact your System Administrator."
+    "translation": "SAML Login war nicht erfolgreich da die Antwort des Identitätsproviders nicht verschlüsselt war. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.do_login.decrypt.app_error",
-    "translation": "SAML login was unsuccessful because an error occurred while decrypting the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "SAML Login war nicht erfolgreich da ein Fehler beim entschlüsseln der Antwort des Identitätsproviders auftrat. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.do_login.empty_response.app_error",
-    "translation": "We received an empty response from the Identity Provider"
+    "translation": "Leere Antwort vom Identitätsprovider erhalten"
   },
   {
     "id": "ent.saml.do_login.parse.app_error",
-    "translation": "An error occurred while parsing the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "Es trat ein Fehler beim Verarbeiten der Antwort des Identitätsproviders auf. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.do_login.validate.app_error",
-    "translation": "An error occurred while validating the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "Es trat ein Fehler beim Validieren der Antwort des Identitätsproviders auf. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
   {
     "id": "ent.saml.license_disable.app_error",
-    "translation": "Your license does not support SAML authentication."
+    "translation": "Ihre Lizenz unterstützt keine SAML Authentifizierung."
   },
   {
     "id": "ent.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata."
+    "translation": "Beim Erstellen der Service Provider Metadaten ist ein Fehler aufgetreten."
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "MFA ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt"
+    "translation": "SAML ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
-    "translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
+    "translation": "Konnte existierenden SAML User nicht aktualisieren. Erlaube login trotzdem. err=%v"
   },
   {
     "id": "error.generic.link_message",
@@ -2296,6 +2324,22 @@
     "translation": "Seite nicht gefunden"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "Sie werden von allen öffentlichen Kanälen und privaten Gruppen entferne.  Wenn das Team privat ist können Sie nicht erneut beitreten.  Sind Sie sich sicher?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "Nein"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "Dieses Team verlassen?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Ja"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Konnte Kanal nicht finden: %v, %v Möglichkeiten gesucht"
   },
@@ -2545,7 +2589,7 @@
   },
   {
     "id": "model.command.is_valid.url_http.app_error",
-    "translation": "Ungültige URL. Muss eine gültige URL sein und mit http:// oder https:// starten"
+    "translation": "Ungültige URL. Muss eine gültige URL sein und mit http:// oder https:// beginnen."
   },
   {
     "id": "model.command.is_valid.user_id.app_error",
@@ -2660,6 +2704,14 @@
     "translation": "Ungültige maximale Anzahl an Benutzers pro Team in Teameinstellungen.  Muss eine positive Zahl sein."
   },
   {
+    "id": "model.config.is_valid.password_length.app_error",
+    "translation": "Minimale Passwortlänge muss eine ganze Zahl größer oder gleich zu  {{.MinLength}} und weniger oder gleich zu {{.MaxLength}} sein."
+  },
+  {
+    "id": "model.config.is_valid.password_length_max_min.app_error",
+    "translation": "Maximale Passwortlänge muss größer oder gleich der minimalen Länge sein."
+  },
+  {
     "id": "model.config.is_valid.rate_mem.app_error",
     "translation": "Ungültige Speichergröße für Anfragenbegrenzer Einstellungen.  Muss eine positive Zahl sein."
   },
@@ -2673,43 +2725,43 @@
   },
   {
     "id": "model.config.is_valid.saml_assertion_consumer_service_url.app_error",
-    "translation": "Ungültige URL. Muss eine gültige URL sein und mit http:// oder https:// starten"
+    "translation": "Service Provider Login URL muss eine gültige URL sein und mit http:// oder https:// beginnen."
   },
   {
     "id": "model.config.is_valid.saml_email_attribute.app_error",
-    "translation": "Invalid Email attribute. Must be set."
+    "translation": "Ungültiges E-Mail Attribut. Muss gesetzt sein."
   },
   {
     "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Invalid First Name attribute. Must be set."
+    "translation": "Ungültiges Vornamen Attribut. Muss gesetzt sein."
   },
   {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "Öffentliches Zertifikat des Identitätsproviders fehlt. Haben Sie vergessen es hochzuladen?"
   },
   {
     "id": "model.config.is_valid.saml_idp_descriptor_url.app_error",
-    "translation": "Identity Provider Issuer URL must be a valid URL and start with http:// or https://."
+    "translation": "Identitätsprovider Issuer URL muss eine gültige URL sein und mit http:// oder https:// beginnen."
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
-    "translation": "Ungültige URL. Muss eine gültige URL sein und mit http:// oder https:// starten"
+    "translation": "SAML SSO URL muss eine gültige URL sein und mit http:// oder https:// beginnen."
   },
   {
     "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Invalid Last Name attribute. Must be set."
+    "translation": "Ungültiges Nachnamen Attribut. Muss gesetzt sein."
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
-    "translation": "Service Provider Private Key missing. Did you forget to upload it?"
+    "translation": "Privater Schlüssel des Service Providers fehlt. Haben Sie vergessen Ihn hochzuladen?"
   },
   {
     "id": "model.config.is_valid.saml_public_cert.app_error",
-    "translation": "Service Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "Öffentliches Zertifikat des Service Providers fehlt. Haben Sie vergessen es hochzuladen?"
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
-    "translation": "Invalid Username attribute. Must be set."
+    "translation": "Ungültiges Benuternamen Attribut. Muss gesetzt sein."
   },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
@@ -3037,7 +3089,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "Ungültiges Passwort"
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben und eine Ziffer enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben und ein Symbol (wie \"~!@#$%^&*()\"). enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben und einen Großbuchstaben enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben, einen Großbuchstaben und eine Ziffer enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben, einen Großbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Kleinbuchstaben, einen Großbuchstaben und ein Symbol (wie \"~!@#$%^&*()\") enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens eine Ziffer enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens ein Symbol (wie \"~!@#$%^&*()\") enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Großbuchstaben enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Großbuchstaben und eine Ziffer enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Großbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "Ihr Passwort muss mindestens {{.Min}} Zeichen lang sein und mindestens einen Großbuchstaben und ein Symbol (wie \"~!@#$%^&*()\") enthalten."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3360,10 @@
     "translation": "Wir konnte den Kanal nicht finden"
   },
   {
+    "id": "store.sql_channel.get_all.app_error",
+    "translation": "Wir konnten nicht alle Kanäle laden"
+  },
+  {
     "id": "store.sql_channel.get_by_name.existing.app_error",
     "translation": "Wir konnten den Kanal nicht finden"
   },
@@ -3465,7 +3581,7 @@
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "Wir konnten das Emoji nicht speichern "
+    "translation": "Wir konnten das Emoji nicht speichern"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -3937,7 +4053,7 @@
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
-    "translation": "Dieser Account verwendet keine LDAP Authentifikation. Bitte melden Sie sich mit E-Mail-Adresse und Passwort an."
+    "translation": "Dieser Account verwendet keine SAML Authentifikation. Bitte melden Sie sich mit E-Mail-Adresse und Passwort an."
   },
   {
     "id": "store.sql_user.save.existing.app_error",
@@ -4200,6 +4316,10 @@
     "translation": "SMTP Einstellungen scheinen nicht korrekt konfiguriert zu sein err=%v details=%v"
   },
   {
+    "id": "utils.mail.test.configured.error",
+    "translation": "SMTP Einstellungen scheinen nicht korrekt konfiguriert zu sein err=%v details=%v"
+  },
+  {
     "id": "web.admin_console.title",
     "translation": "Admin Konsole"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 792c835bb..e3fba5de2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -172,6 +172,22 @@
     "translation": "Can not add user to this channel type"
   },
   {
+    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
+    "translation": "Private Group management and creation is restricted to System Administrators."
+  },
+  {
+    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
+    "translation": "Private Group management and creation is restricted to Team and System Administrators."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
+    "translation": "Public Channel management and creation is restricted to System Administrators."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
+    "translation": "Public Channel management and creation is restricted to Team and System Administrators."
+  },
+  {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Must use createDirectChannel api service for direct message channel creation"
   },
@@ -312,22 +328,6 @@
     "translation": "The channel has been archived or deleted"
   },
   {
-    "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
-    "translation": "Public Channel management and creation is restricted to System Administrators."
-  },
-  {
-    "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
-    "translation": "Public Channel management and creation is restricted to Team and System Administrators."
-  },
-  {
-    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Private Group management and creation is restricted to System Administrators."
-  },
-  {
-    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Private Group management and creation is restricted to Team and System Administrators."
-  },
-  {
     "id": "api.channel.update_channel.permission.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -1264,10 +1264,6 @@
     "translation": "Unable to open zip file"
   },
   {
-    "id": "api.team.remove_user_from_team.missing.app_error",
-    "translation": "The user does not appear to be part of this team."
-  },
-  {
     "id": "api.team.create_team.email_disabled.app_error",
     "translation": "Team sign-up with email is disabled."
   },
@@ -1380,6 +1376,10 @@
     "translation": "Permanently deleted team %v id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "The user does not appear to be part of this team."
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Team sign-up with email is disabled."
   },
@@ -1772,14 +1772,14 @@
     "translation": "Password field must not be blank"
   },
   {
-    "id": "api.user.login.invalid_credentials",
-    "translation": "User ID or password incorrect."
-  },
-  {
     "id": "api.user.login.inactive.app_error",
     "translation": "Login failed because your account has been set to inactive.  Please contact an administrator."
   },
   {
+    "id": "api.user.login.invalid_credentials",
+    "translation": "User ID or password incorrect."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "Either user id or team name and user email must be provided"
   },
@@ -2092,6 +2092,10 @@
     "translation": "Inappropriate permissions to regenerate outcoming webhook token"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "Unable to decode image."
   },
@@ -2320,6 +2324,22 @@
     "translation": "Page not found"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "No"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "Leave the team?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Yes"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Could not find channel: %v, %v possibilites searched"
   },
@@ -2684,14 +2704,14 @@
     "translation": "Invalid maximum users per team for team settings.  Must be a positive number."
   },
   {
-    "id": "model.config.is_valid.password_length_max_min.app_error",
-    "translation": "Maximum password length must be greater than or equal to minimum password length."
-  },
-  {
     "id": "model.config.is_valid.password_length.app_error",
     "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}."
   },
   {
+    "id": "model.config.is_valid.password_length_max_min.app_error",
+    "translation": "Maximum password length must be greater than or equal to minimum password length."
+  },
+  {
     "id": "model.config.is_valid.rate_mem.app_error",
     "translation": "Invalid memory store size for rate limit settings.  Must be a positive number"
   },
@@ -3076,32 +3096,44 @@
     "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter."
   },
   {
-    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one uppercase letter."
-  },
-  {
     "id": "model.user.is_valid.pwd_lowercase_number.app_error",
     "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one number."
   },
   {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
     "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
     "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one uppercase letter."
+  },
+  {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
     "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number."
   },
   {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
     "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
-    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number."
   },
   {
-    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.pwd_uppercase.app_error",
@@ -3112,24 +3144,12 @@
     "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one number."
   },
   {
-    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
-  },
-  {
     "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
     "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
-    "id": "model.user.is_valid.pwd_number.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number."
-  },
-  {
-    "id": "model.user.is_valid.pwd_number_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\")."
-  },
-  {
-    "id": "model.user.is_valid.pwd_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,10 +3268,6 @@
     "translation": "More than 1 read replica functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
   },
   {
-    "id": "cli.license.critical",
-    "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
-  },
-  {
     "id": "store.sql.remove_index.critical",
     "translation": "Failed to remove index %v"
   },
@@ -3344,6 +3360,10 @@
     "translation": "We encountered an error finding the channel"
   },
   {
+    "id": "store.sql_channel.get_all.app_error",
+    "translation": "We couldn't get all the channels"
+  },
+  {
     "id": "store.sql_channel.get_by_name.existing.app_error",
     "translation": "We couldn't find the existing channel"
   },
@@ -3372,10 +3392,6 @@
     "translation": "We couldn't get all the channels"
   },
   {
-    "id": "store.sql_channel.get_all.app_error",
-    "translation": "We couldn't get all the channels"
-  },
-  {
     "id": "store.sql_channel.get_member.app_error",
     "translation": "We couldn't get the channel member"
   },
@@ -4299,28 +4315,11 @@
     "id": "utils.mail.test.configured.error",
     "translation": "SMTP server settings do not appear to be configured properly err=%v details=%v"
   },
-
   {
     "id": "utils.mail.test.configured.error",
     "translation": "SMTP server settings do not appear to be configured properly err=%v details=%v"
   },
   {
-    "id": "leave_team_modal.title",
-    "translation": "Leave the team?"
-  },
-  {
-    "id": "leave_team_modal.desc",
-    "translation": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?"
-  },
-  {
-    "id": "leave_team_modal.no",
-    "translation": "No"
-  },
-  {
-    "id": "leave_team_modal.yes",
-    "translation": "Yes"
-  },
-  {
     "id": "web.admin_console.title",
     "translation": "Admin Console"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 8514b64b9..ab4319935 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -172,6 +172,22 @@
     "translation": "No se puede agregar al usuario a este tipo de canal"
   },
   {
+    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
+    "translation": "La gestión y creación de Grupos Privados está restringido a los Administradores del Sistema."
+  },
+  {
+    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
+    "translation": "La gestión y creación de Grupos Privados está restringido a los Administradores de Equipo y Sistema."
+  },
+  {
+    "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."
+  },
+  {
+    "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."
+  },
+  {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Debe usar el servicio del api createDirectChannel para crear un mensaje directo al canal"
   },
@@ -1360,6 +1376,10 @@
     "translation": "Equipo eliminado permanentemente %v id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "El usuario no parece ser parte de este equipo."
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "El registro a equipos por correo electrónico está deshabilitado."
   },
@@ -1756,6 +1776,10 @@
     "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",
+    "translation": "ID de usuario o contraseña incorrectos."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "Ya sea el id de usuario o el nombre del equipo y la dirección de correo del usuario deben ser suministradas"
   },
@@ -2068,6 +2092,10 @@
     "translation": "Permisos inapropiados para regenerar un token para el Webhook saliente"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "La característica requiere una licencia enterprise. Por favor, póngase en contacto con su Administrador del Sistema acerca de la actualización de su licencia enterprise."
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "No se puede decodificar la imagen."
   },
@@ -2296,6 +2324,22 @@
     "translation": "Página no encontrada"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "Serás removido de todos los canales públicos y privados.  Si el equipo es privado no serás capaz de regresar al equipo.  ¿Estás seguro?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "No"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "¿Abandonar el equipo?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Sí"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "No pudimos encontrar el canal: %v, búsqueda realizada con estas posibilidades %v"
   },
@@ -2660,6 +2704,14 @@
     "translation": "Número inválido del máximo de usuarios por equipo en la configuración de equipo.  Debe ser un número positivo."
   },
   {
+    "id": "model.config.is_valid.password_length.app_error",
+    "translation": "Longitud mínima de la contraseña debe ser un número entero mayor que o igual a {{.MinLength}} y menor o igual que {{.MaxLength}}."
+  },
+  {
+    "id": "model.config.is_valid.password_length_max_min.app_error",
+    "translation": "Longitud máxima de la contraseña debe ser mayor que o igual a la longitud mínima de la contraseña."
+  },
+  {
     "id": "model.config.is_valid.rate_mem.app_error",
     "translation": "Tamaño del almacen de memoria inválido en la configuración de límites de velocidad.  Debe ser un número positivo."
   },
@@ -3037,7 +3089,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "Contraseña inválida"
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula y al menos un número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula, al menos un número, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula, y al menos una letra en mayúscula."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula, al menos una letra mayúscula y al menos un número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula, al menos una letra mayúscula, al menos un número, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra minúscula, al menos una letra mayúscula y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos un número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos un número y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra mayúscula."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra mayúscula y al menos un número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra mayúscula, al menos un número, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "La contraseña debe contener al menos {{.Min}} caracteres compuesta de al menos una letra mayúscula y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3360,10 @@
     "translation": "Encontramos un error buscando el canal"
   },
   {
+    "id": "store.sql_channel.get_all.app_error",
+    "translation": "No pudimos obtener todos los canales"
+  },
+  {
     "id": "store.sql_channel.get_by_name.existing.app_error",
     "translation": "No pudimos encontrar el canal"
   },
@@ -4200,6 +4316,10 @@
     "translation": "El servidor SMTP parece no estar configurado apropiadamente err=%v details=%v"
   },
   {
+    "id": "utils.mail.test.configured.error",
+    "translation": "El servidor SMTP parece no estar configurado apropiadamente err=%v details=%v"
+  },
+  {
     "id": "web.admin_console.title",
     "translation": "Consola de Administración"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index eae4edca2..ea6142a2c 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -49,19 +49,19 @@
   },
   {
     "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Tableau vide pour les 'fichiers' dans la requête"
+    "translation": "Tableau vide pour les 'certificats' dans la requête"
   },
   {
     "id": "api.admin.add_certificate.no_file.app_error",
-    "translation": "Aucun fichier pour les 'fichiers' dans la requête"
+    "translation": "Aucun fichier pour les 'certificats' dans la requête"
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "Could not open certificate file"
+    "translation": "Impossible d'ouvrir le fichier du certificat"
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
-    "translation": "Could not save certificate file"
+    "translation": "Impossible d'enregistrer le certificat"
   },
   {
     "id": "api.admin.file_read_error",
@@ -89,11 +89,11 @@
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
-    "translation": "An error occurred while deleting the certificate. Make sure the file config/{{.Filename}} exists."
+    "translation": "Erreur lors de la suppression du certificat. Veuillez vérifier que le fichier config/{{.Filename}} existe."
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata"
+    "translation": "Une erreur s'est produite lors de la construction des métadonnées du fournisseur de services"
   },
   {
     "id": "api.admin.test_email.body",
@@ -172,6 +172,22 @@
     "translation": "Impossible d'ajouter l'utilisateur à ce type de canal"
   },
   {
+    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
+    "translation": "La création et l'administration de groupes privés sont réservées aux administrateurs systèmes."
+  },
+  {
+    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
+    "translation": "La création et l'administration du canal public sont réservées aux administrateurs systèmes et administrateurs d'équipes."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
+    "translation": "La création et l'administration du canal public sont réservées aux administrateurs systèmes."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
+    "translation": "La création et l'administration du canal public sont réservées aux administrateurs systèmes et administrateurs d'équipe."
+  },
+  {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Vous devez utilisez le service api createDirectChannel pour la création d'un canal de messages privés"
   },
@@ -537,7 +553,7 @@
   },
   {
     "id": "api.command_shortcuts.list",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL/CMD+K: Open a quick channel switcher dialog\nCTRL/CMD+SHIFT+A: Open account settings\nCTRL/CMD+SHIFT+M: Open recent mentions\n\n#### Files\n\nCTRL/CMD+U: Upload file(s)\n\n#### Messages\n\nCTRL/CMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL/CMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n#### Built-in Browser Commands\n\nALT+LEFT/CMD+[: Previous channel in your history\nALT+RIGHT/CMD+]: Next channel in your history\nCTRL/CMD+PLUS: Increase font size (zoom in)\nCTRL/CMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "### Raccourcis clavier\n\n#### Navigation\n\nALT+HAUT: Canal ou message privé précédent dans la barre de gauche\nALT+BAS: Canal ou message privé suivant dans la barre de gauche\nALT+SHIFT+HAUT: Canal ou message privé précédent avec messages non-lus dans la barre de gauche\nALT+SHIFT+BAS: Canal ou message privé suivant avec messages non-lus dans la barre de gauche\nCTRL/CMD+K: Fenêtre de changemetn de canal rapide\nCTRL/CMD+SHIFT+A: Préférences du compte\nCTRL/CMD+SHIFT+M: Dernières mentions\n\n#### Fichiers\n\nCTRL/CMD+U: Télécharger des fichiers\n\n#### Messages\n\nCTRL/CMD+HAUT (dans un champ vide): Affiche le message ou commande slash précédent\nCTRL/CMD+DOWN (dans un champ vide): Affiche le message ou commande slash suivant\nHAUT (dans un champ vide): Édite votre dernier message dans le canal actuel\n@[lettre]+TAB: Autocomplète un @nom commençant par [lettre]\n:[lettre]+TAB: Autocomplète emoji commençant par [lettre]\n\n#### Commandes du navigateur intégré\n\nALT+GAUCH/CMD+[: Canal précédent dans votre historique\nALT+RIGHT/CMD+]: Canal suivant dans votre historique\nCTRL/CMD+PLUS: Augmente la taille de la police\nCTRL/CMD+MOINS: Diminue la taille de la police\nSHIFT+HAUT (dans un champ de saisie): Surligne le texte jusqu'à la ligne précédente\nSHIFT+BAS (dans un champ de saisie): Surligne le texte jusqu'à la ligne suivante\nSHIFT+ENTRÉE (dans un champ de saisie): Saut de ligne\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -613,7 +629,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Unable to create emoji. Image must be less than 64 KB in size."
+    "translation": "Impossible de créer un emoji. L'image doit faire moins de 64Ko."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -1360,6 +1376,10 @@
     "translation": "Équipe %v supprimée définitivement id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "The user does not appear to be part of this team."
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "L'inscription avec une adresse électronique est désactivée."
   },
@@ -1756,6 +1776,10 @@
     "translation": "Votre compte a été désactivé.  Veuillez contacter un administrateur."
   },
   {
+    "id": "api.user.login.invalid_credentials",
+    "translation": "User ID or password incorrect."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "Veuillez entrer soit un identifiant utilisateur, soit le nom d'une équipe"
   },
@@ -2068,6 +2092,10 @@
     "translation": "Droits insuffisants pour regénérer le jeton du webhook sortant"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "Fonctionnalité de conformité désactivée par la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "Impossible de décoder l'image."
   },
@@ -2261,7 +2289,7 @@
   },
   {
     "id": "ent.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata."
+    "translation": "Une erreur s'est produite lors de la construction des métadonnées du fournisseur de services"
   },
   {
     "id": "ent.saml.service_disable.app_error",
@@ -2296,6 +2324,22 @@
     "translation": "Page introuvable"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "No"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "Leave the team?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Yes"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Impossible de trouver le canal : %v, %v possibilités recherchées"
   },
@@ -2660,6 +2704,14 @@
     "translation": "Nombre maximum d'utilisateurs par équipe invalide dans les paramètres d'équipes. Doit être un entier positif."
   },
   {
+    "id": "model.config.is_valid.password_length.app_error",
+    "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}."
+  },
+  {
+    "id": "model.config.is_valid.password_length_max_min.app_error",
+    "translation": "Maximum password length must be greater than or equal to minimum password length."
+  },
+  {
     "id": "model.config.is_valid.rate_mem.app_error",
     "translation": "Taille du stockage mémoire invalide pour les paramètres de limite de fréquence. Doit être un entier positif."
   },
@@ -2689,7 +2741,7 @@
   },
   {
     "id": "model.config.is_valid.saml_idp_descriptor_url.app_error",
-    "translation": "Identity Provider Issuer URL must be a valid URL and start with http:// or https://."
+    "translation": "URL invalude. Il doit s'agir d'une URL valide et commencer par http:// ou https://"
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
@@ -3037,7 +3089,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "Mot de passe invalide"
+    "translation": "Your password must contain at least {{.Min}} characters."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one uppercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3360,10 @@
     "translation": "Nous avons rencontré une erreur lors de la recherche du canal"
   },
   {
+    "id": "store.sql_channel.get_all.app_error",
+    "translation": "Nous n'avons pas pu charger tous les canaux"
+  },
+  {
     "id": "store.sql_channel.get_by_name.existing.app_error",
     "translation": "Nous n'avons pas pu trouver le canal existant"
   },
@@ -4200,6 +4316,10 @@
     "translation": "Les paramètres de serveur SMTP ne semblent pas avoir été configurés correctement err=%v détails=%v"
   },
   {
+    "id": "utils.mail.test.configured.error",
+    "translation": "Les paramètres de serveur SMTP ne semblent pas avoir été configurés correctement err=%v détails=%v"
+  },
+  {
     "id": "web.admin_console.title",
     "translation": "Console Administration"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index bf8214e83..943ab6a03 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -49,19 +49,19 @@
   },
   {
     "id": "api.admin.add_certificate.array.app_error",
-    "translation": "リクエストの'file'以下の配列が空です"
+    "translation": "リクエストの'certificate'以下の配列が空です"
   },
   {
     "id": "api.admin.add_certificate.no_file.app_error",
-    "translation": "リクエストの'file'以下にファイルがありません"
+    "translation": "リクエストの'certificate'以下にファイルがありません"
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "Could not open certificate file"
+    "translation": "証明書ファイルを開くことができませんでした"
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
-    "translation": "Could not save certificate file"
+    "translation": "証明書ファイルを保存できませんでした"
   },
   {
     "id": "api.admin.file_read_error",
@@ -89,11 +89,11 @@
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
-    "translation": "An error occurred while deleting the certificate. Make sure the file config/{{.Filename}} exists."
+    "translation": "証明書を削除する際にエラーが発生しました。config/{{.Filename}}にファイルが存在することを確認してください、"
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata"
+    "translation": "サービスプロバイダーのメタデータを構築中にエラーが発生しました"
   },
   {
     "id": "api.admin.test_email.body",
@@ -172,6 +172,22 @@
     "translation": "この種類のチャンネルにはユーザーを追加することはできません"
   },
   {
+    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
+    "translation": "プライベートグループの作成と管理は、システム管理者しかできません。"
+  },
+  {
+    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
+    "translation": "プライベートグループの作成と管理は、チーム管理者かシステム管理者しかできません。"
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
+    "translation": "公開チャンネルの作成と管理は、システム管理者しかできません。"
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
+    "translation": "公開チャンネルの作成と管理は、チーム管理者かシステム管理者しかできません。"
+  },
+  {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "ダイレクトメッセージチャンネルを作成するためには、createDirectChannel APIを使ってください"
   },
@@ -613,7 +629,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Unable to create emoji. Image must be less than 64 KB in size."
+    "translation": "絵文字を作成できません。画像サイズは64KB未満でなければなりません。"
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -645,7 +661,7 @@
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image must be at most 128 by 128 pixels."
+    "translation": "絵文字を作成できません。画像は128x128ピクセル以内である必要があります。"
   },
   {
     "id": "api.export.json.app_error",
@@ -1125,7 +1141,7 @@
   },
   {
     "id": "api.saml.save_certificate.app_error",
-    "translation": "Certificate did not save properly."
+    "translation": "証明書が正常に保存されませんでした。"
   },
   {
     "id": "api.server.new_server.init.info",
@@ -1360,6 +1376,10 @@
     "translation": "チーム%vを完全に削除しました id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "The user does not appear to be part of this team."
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "電子メールによるチームへの利用登録は無効です。"
   },
@@ -1756,6 +1776,10 @@
     "translation": "あなたのアカウントは無効化されています。システム管理者に連絡してください。"
   },
   {
+    "id": "api.user.login.invalid_credentials",
+    "translation": "User ID or password incorrect."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "ユーザーIDまたはチーム名と電子メールアドレスの組み合わせを指定しなくてはいけません"
   },
@@ -1833,7 +1857,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "MFAは設定されていないか、このサーバーではサポートされていません"
+    "translation": "SAMLは設定されていないか、このサーバーではサポートされていません"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2068,6 +2092,10 @@
     "translation": "外向きのウェブフックトークンを再生成するのに十分な権限が付与されていません"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "カスタム絵文字の制限機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "画像をデコードできません。"
   },
@@ -2113,7 +2141,7 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "コンプライアンス機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
+    "translation": "カスタム絵文字の制限機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2261,11 +2289,11 @@
   },
   {
     "id": "ent.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata."
+    "translation": "サービスプロバイダーのメタデータを構築中にエラーが発生しました"
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "MFAは設定されていないか、このサーバーではサポートされていません"
+    "translation": "SAMLは設定されていないか、このサーバーではサポートされていません"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -2296,6 +2324,22 @@
     "translation": "ページが見付かりません"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "No"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "Leave the team?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Yes"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "チャンネルが見付かりません: %v、%vではありませんか"
   },
@@ -2660,6 +2704,14 @@
     "translation": "チーム設定のチーム毎の最大ユーザー数が不正です。正の数を指定してください。"
   },
   {
+    "id": "model.config.is_valid.password_length.app_error",
+    "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}."
+  },
+  {
+    "id": "model.config.is_valid.password_length_max_min.app_error",
+    "translation": "Maximum password length must be greater than or equal to minimum password length."
+  },
+  {
     "id": "model.config.is_valid.rate_mem.app_error",
     "translation": "投稿頻度設定のメモリー保存サイズが不正です。正の数を指定してください。"
   },
@@ -2689,7 +2741,7 @@
   },
   {
     "id": "model.config.is_valid.saml_idp_descriptor_url.app_error",
-    "translation": "Identity Provider Issuer URL must be a valid URL and start with http:// or https://."
+    "translation": "不正なURLです。正しいURLはhttp://またはhttps://で始まります"
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
@@ -3037,7 +3089,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "不正なパスワードです"
+    "translation": "Your password must contain at least {{.Min}} characters."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one uppercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3360,10 @@
     "translation": "チャンネルを探す際にエラーが発生しました"
   },
   {
+    "id": "store.sql_channel.get_all.app_error",
+    "translation": "チャンネルが全ては取得できませんでした"
+  },
+  {
     "id": "store.sql_channel.get_by_name.existing.app_error",
     "translation": "チャンネルが見付かりませんでした"
   },
@@ -3937,7 +4053,7 @@
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
-    "translation": "このアカウントはLDAP認証を使用していません。電子メールアドレスとパスワードを使ってサインインしてください。"
+    "translation": "このアカウントはSAML認証を使用していません。電子メールアドレスとパスワードを使ってサインインしてください。"
   },
   {
     "id": "store.sql_user.save.existing.app_error",
@@ -4200,6 +4316,10 @@
     "translation": "SMTPサーバー用の設定が正しくありません err=%v details=%v"
   },
   {
+    "id": "utils.mail.test.configured.error",
+    "translation": "SMTPサーバー用の設定が正しくありません err=%v details=%v"
+  },
+  {
     "id": "web.admin_console.title",
     "translation": "管理コンソール"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 2cf59fe35..f46690fc1 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -49,19 +49,19 @@
   },
   {
     "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Matriz vazia em 'file' na requisição"
+    "translation": "Matriz vazia sob o 'certificado' na requisição"
   },
   {
     "id": "api.admin.add_certificate.no_file.app_error",
-    "translation": "Nenhum arquivo sobre a 'file' no pedido"
+    "translation": "Nenhum arquivo sob o 'certificado' na requisição"
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "Could not open certificate file"
+    "translation": "Não foi possível abrir o arquivo do certificado"
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
-    "translation": "Could not save certificate file"
+    "translation": "Não foi possível salvar o arquivo do certificado"
   },
   {
     "id": "api.admin.file_read_error",
@@ -89,11 +89,11 @@
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
-    "translation": "An error occurred while deleting the certificate. Make sure the file config/{{.Filename}} exists."
+    "translation": "Um erro aconteceu ao apagar o certificado. Verifique se o arquivo config/{{.Filename}} existe."
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata"
+    "translation": "Um erro aconteceu enquanto construindo o Service Provider Metadata"
   },
   {
     "id": "api.admin.test_email.body",
@@ -172,6 +172,22 @@
     "translation": "Não foi possível adicionar usuário para este tipo de canal"
   },
   {
+    "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
+    "translation": "Gerenciamento de Canais Privados e criação é restrito apenas para Administradores do Sistema."
+  },
+  {
+    "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
+    "translation": "Gerenciamento de Canais Privados e criação é restrito apenas para o Time e Administradores do Sistema."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
+    "translation": "Gerenciamento de Canais Públicos e criação é restrito apenas para Administradores do Sistema."
+  },
+  {
+    "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
+    "translation": "Gerenciamento de Canais Públicos e criação é restrito apenas para o Time e Administradores do Sistema."
+  },
+  {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Deve usar a api de serviço createDirectChannel para criação do canal de mensagens diretas"
   },
@@ -605,7 +621,7 @@
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Não foi possível criar o emoji. A requisição não foi entendida."
+    "translation": "Não foi possível criar o emoji. A requisição está errada."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
@@ -613,7 +629,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Unable to create emoji. Image must be less than 64 KB in size."
+    "translation": "Não foi possível criar o emoji. A imagem tem que ser menor que 64 KB em tamanho."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -645,7 +661,7 @@
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image must be at most 128 by 128 pixels."
+    "translation": "Não foi possível criar o emoji. A imagem deve ser, no máximo 128 por 128 pixels."
   },
   {
     "id": "api.export.json.app_error",
@@ -1125,7 +1141,7 @@
   },
   {
     "id": "api.saml.save_certificate.app_error",
-    "translation": "Certificate did not save properly."
+    "translation": "O certificado não foi salvo corretamente."
   },
   {
     "id": "api.server.new_server.init.info",
@@ -1360,6 +1376,10 @@
     "translation": "Equipe permanentemente deletada %v id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "O usuário não parece ser parte desta equipe."
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Inscrição com e-mail na equipe está desativado."
   },
@@ -1756,6 +1776,10 @@
     "translation": "Login falhou devido a sua conta estar inativa.  Por favor entre em contado com um administrador."
   },
   {
+    "id": "api.user.login.invalid_credentials",
+    "translation": "User ID or password incorrect."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "Id do usuário ou o nome da equipe e e-mail deve ser fornecido"
   },
@@ -1833,7 +1857,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "MFA não configurado ou disponível neste servidor"
+    "translation": "SAML não está configurado ou disponível neste servidor."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2068,6 +2092,10 @@
     "translation": "Permissões inadequadas para re-gerar o token do webhook de saída"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "Funcionalidade Compliance desabilitada pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "Não foi possível ler a imagem."
   },
@@ -2113,7 +2141,7 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "Funcionalidade Compliance desabilitada pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
+    "translation": "Emoji personalizado desabilitado pela licença atual. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2205,71 +2233,71 @@
   },
   {
     "id": "ent.saml.build_request.app_error",
-    "translation": "An error occurred while initiating the request to the Identity Provider. Please contact your System Administrator."
+    "translation": "Ocorreu um erro ao iniciar a solicitação para o Provedor de Identidade. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.build_request.encoding.app_error",
-    "translation": "An error occurred while encoding the request for the Identity Provider. Please contact your System Administrator."
+    "translation": "Ocorreu um erro durante a codificação do pedido para o Provedor de Identidade. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.build_request.encoding_signed.app_error",
-    "translation": "An error occurred while encoding the signed request for the Identity Provider. Please contact your System Administrator."
+    "translation": "Ocorreu um erro durante a codificação do pedido assinado para o Provedor de Identidade. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.configure.app_error",
-    "translation": "An error occurred while configuring SAML Service Provider, err=%v"
+    "translation": "Ocorreu um erro durante a configuração do Provedor de Serviço SAML, err=%v"
   },
   {
     "id": "ent.saml.configure.encryption_not_enabled.app_error",
-    "translation": "SAML login was unsuccessful because encryption is not enabled. Please contact your System Administrator."
+    "translation": "SAML login não foi bem sucedido pois a criptografia não está ativada. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.configure.load_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "O Arquivo do Certificado Publico do Provedor de Identidade não foi encontrado. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.configure.load_private_key.app_error",
-    "translation": "SAML login was unsuccessful because the Service Provider Private Key was not found. Please contact your System Administrator."
+    "translation": "SAML login não foi bem sucedido pois a Chave Privada do Provedor do Serviço não foi encontrada. Entre em contato com a Administrador do Sistema."
   },
   {
     "id": "ent.saml.configure.load_public_cert.app_error",
-    "translation": "Service Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "O Arquivo do Certificado Publico do Provedor de Serviço não foi encontrado. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.configure.not_encrypted_response.app_error",
-    "translation": "SAML login was unsuccessful as the Identity Provider response is not encrypted. Please contact your System Administrator."
+    "translation": "SAML login não foi bem sucedido pois a resposta do Provedor de Identidade não está criptografada. Entre em contato com a Administrador do Sistema."
   },
   {
     "id": "ent.saml.do_login.decrypt.app_error",
-    "translation": "SAML login was unsuccessful because an error occurred while decrypting the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "SAML login não foi bem sucedida porque ocorreu um erro ao descriptografar a resposta do Provedor de Identidade. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.do_login.empty_response.app_error",
-    "translation": "We received an empty response from the Identity Provider"
+    "translation": "Recebido uma resposta em branco do Provedor de Identidade"
   },
   {
     "id": "ent.saml.do_login.parse.app_error",
-    "translation": "An error occurred while parsing the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "Ocorreu um erro ao analisar a resposta do Provedor de Identidade. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.do_login.validate.app_error",
-    "translation": "An error occurred while validating the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "Ocorreu um erro ao validar a resposta do Provedor de Identidade. Entre em contato com o Administrador do Sistema."
   },
   {
     "id": "ent.saml.license_disable.app_error",
-    "translation": "Your license does not support SAML authentication."
+    "translation": "Sua licença não suporta autenticação SAML."
   },
   {
     "id": "ent.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata."
+    "translation": "Ocorreu um erro ao construir Serviço de Provedor de Metadados."
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "MFA não configurado ou disponível neste servidor"
+    "translation": "SAML não está configurado ou disponível neste servidor."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
-    "translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
+    "translation": "Não é possível atualizar o usuário SAML existente. Permitindo o login de qualquer maneira. err=%v"
   },
   {
     "id": "error.generic.link_message",
@@ -2296,6 +2324,22 @@
     "translation": "Página não encontrada"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "Não"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "Leave the team?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Sim"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Não foi possível encontrar o canal %v, procurado %v possibilidades"
   },
@@ -2660,6 +2704,14 @@
     "translation": "Inválido máximo de usuários por equipe em configurações de equipe.  Deve ser um número positivo."
   },
   {
+    "id": "model.config.is_valid.password_length.app_error",
+    "translation": "Tamanho mínimo de senha deve ser um número inteiro maior ou igual a {{.MinLength}} e menor ou igual a {{.MaxLength}}."
+  },
+  {
+    "id": "model.config.is_valid.password_length_max_min.app_error",
+    "translation": "Tamanho máximo da senha deve ser maior ou igual ao tamanho mínimo de senha."
+  },
+  {
     "id": "model.config.is_valid.rate_mem.app_error",
     "translation": "Tamanho do armazenamento de memória inválido para configurações de limite de velocidade.  Deve ser um número positivo"
   },
@@ -2673,23 +2725,23 @@
   },
   {
     "id": "model.config.is_valid.saml_assertion_consumer_service_url.app_error",
-    "translation": "URL inválida. Deve ser uma URL válida e começar com http:// ou https://"
+    "translation": "URL do Provedor de Serviço de Login deve ser uma URL válida e começar com http:// ou https://."
   },
   {
     "id": "model.config.is_valid.saml_email_attribute.app_error",
-    "translation": "Invalid Email attribute. Must be set."
+    "translation": "Atributo Email Inválido. Deve ser definido."
   },
   {
     "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Invalid First Name attribute. Must be set."
+    "translation": "Atributo Primeiro Nome Inválido. Deve ser definido."
   },
   {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "Faltando Certificado Público do Provedor de Identidade. Esqueceu-se de carregá-lo?"
   },
   {
     "id": "model.config.is_valid.saml_idp_descriptor_url.app_error",
-    "translation": "Identity Provider Issuer URL must be a valid URL and start with http:// or https://."
+    "translation": "URL inválida. Deve ser uma URL válida e começar com http:// ou https://"
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
@@ -2697,7 +2749,7 @@
   },
   {
     "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Invalid Last Name attribute. Must be set."
+    "translation": "Atributo Primeiro Nome Inválido. Deve ser definido."
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
@@ -2705,11 +2757,11 @@
   },
   {
     "id": "model.config.is_valid.saml_public_cert.app_error",
-    "translation": "Service Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "Faltando Certificado Público do Provedor de Identidade. Esqueceu-se de carregá-lo?"
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
-    "translation": "Invalid Username attribute. Must be set."
+    "translation": "Atributo Primeiro Nome Inválido. Deve ser definido."
   },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
@@ -3037,7 +3089,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "Senha inválida"
+    "translation": "Your password must contain at least {{.Min}} characters."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one uppercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one number."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3360,10 @@
     "translation": "Encontramos um erro ao procurar o canal"
   },
   {
+    "id": "store.sql_channel.get_all.app_error",
+    "translation": "Não foi possível obter todos os canais"
+  },
+  {
     "id": "store.sql_channel.get_by_name.existing.app_error",
     "translation": "Não foi possível encontrar o canal existente"
   },
@@ -4200,6 +4316,10 @@
     "translation": "Configurações do servidor SMTP não parecem estar configuradas corretamente err=%v detalhes=%v"
   },
   {
+    "id": "utils.mail.test.configured.error",
+    "translation": "Configurações do servidor SMTP não parecem estar configuradas corretamente err=%v detalhes=%v"
+  },
+  {
     "id": "web.admin_console.title",
     "translation": "Console Admin"
   },
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index c4918c590..c6de06c3d 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -10,7 +10,7 @@
   "about.hashee": "EE Build Hash:",
   "about.licensed": "Lizensiert durch:",
   "about.number": "Build Nummer:",
-  "about.teamEditionLearn": "Schleiße dich der Mattermost Community an auf ",
+  "about.teamEditionLearn": "Schließe dich der Mattermost Community an auf ",
   "about.teamEditionSt": "Ihre gesamte Team Kommunikation an einem Ort, sofort durchsuchbar und überall verfügbar.",
   "about.teamEditiont0": "Team Edition",
   "about.teamEditiont1": "Enterprise Edition",
@@ -66,17 +66,17 @@
   "add_command.username.placeholder": "Benutzername",
   "add_emoji.cancel": "Abbrechen",
   "add_emoji.header": "Hinzufügen",
-  "add_emoji.image": "Bilder",
+  "add_emoji.image": "Bild",
   "add_emoji.image.button": "Auswählen",
-  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 64 KB and dimensions up to 128 by 128 pixels.",
-  "add_emoji.imageRequired": "An image is required for the emoji",
+  "add_emoji.image.help": "Wähle ein Bild für dein Emoji aus. Das Bild kann eine gif, png oder jpeg-Datei sein. Die maximale Größe beträgt 64 KB und 128 x 128 pixel.",
+  "add_emoji.imageRequired": "Für das Emoji ist ein Bild erforderlich.",
   "add_emoji.name": "Name",
-  "add_emoji.name.help": "Choose a name for your emoji made of up to 64 characters consisting of lowercase letters, numbers, and the symbols '-' and '_'.",
-  "add_emoji.nameInvalid": "An emoji's name can only contain numbers, letters, and the symbols '-' and '_'.",
-  "add_emoji.nameRequired": "A name is required for the emoji",
-  "add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
+  "add_emoji.name.help": "Wähle einen Namen für dein Emoji. Der Name darf maximal 64 Zeichen lang sein und kann aus Kleinbuchstaben, Zahlen und den Symbolen '-' und '_' bestehen.",
+  "add_emoji.nameInvalid": "Der Name des Emoji´s darf nur Zahlen, Buchstaben und die Symbole '-' und '_' enthalten.",
+  "add_emoji.nameRequired": "Für das Emoji ist ein Name erforderlich",
+  "add_emoji.nameTaken": "Dieser Name wird bereits von einem Emoji verwendet. Wähle bitte einen anderen Namen.",
   "add_emoji.preview": "Vorschau",
-  "add_emoji.preview.sentence": "This is a sentence with {image} in it.",
+  "add_emoji.preview.sentence": "Das ist ein Satz mit {image}.",
   "add_emoji.save": "Speichern",
   "add_incoming_webhook.cancel": "Abbrechen",
   "add_incoming_webhook.channel": "Kanal",
@@ -106,11 +106,11 @@
   "admin.banner.heading": "Notiz:",
   "admin.compliance.directoryDescription": "Verzeichnis in welchem die Bilddateien gespeichert werden. Standardwert: ./data/.",
   "admin.compliance.directoryExample": "Bsp.: \"./data/\"",
-  "admin.compliance.directoryTitle": "Compliance Report Directory:",
+  "admin.compliance.directoryTitle": "Compliance Report Verzeichnis:",
   "admin.compliance.enableDailyDesc": "Wenn wahr erstellt Mattermost einen täglichen Compliance-Bericht.",
   "admin.compliance.enableDailyTitle": "Täglichen Bericht aktivieren:",
   "admin.compliance.enableDesc": "Wenn wahr erlaubt Mattermost Compliance-Berichterstattung",
-  "admin.compliance.enableTitle": "Enable Compliance Reporting:",
+  "admin.compliance.enableTitle": "Aktiviere Compliance Reporting:",
   "admin.compliance.false": "falsch",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Hinweis:</h4><p>LDAP-Funktionen sind Bestandteil der Enterprise Edition. Ihre derzeitige Lizenz unterstützt LDAP nicht. Besuchen Sie unsere <a href=\"http://mattermost.com\" target=\"_blank\">Webseite</a> für Information und Preise der Enterprise Lizenzen.</p>",
   "admin.compliance.save": "Speichern",
@@ -148,23 +148,23 @@
   "admin.connectionSecurityTlsDescription": "Verschlüsselt die Kommunikation zwischen Mattermost und Ihrem E-Mail-Server.",
   "admin.customization.customBrand": "Eigenes Branding",
   "admin.customization.customEmoji": "Benutzerdefinierte Emoji",
-  "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting \"Custom Emoji\".",
+  "admin.customization.enableCustomEmojiDesc": "Erlaube es Benutzern eigene Emojis für Nachrichten zu erstellen. Wenn aktiviert, können eigene Emojis durch wechseln zu einem Team, Klicken auf die drei Punkte über der Channel Sidebar und dem Auswählen von \"Eigene Emoji\" aufgerufen werden.",
   "admin.customization.enableCustomEmojiTitle": "Eigene Emoji ermöglichen:",
-  "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji",
+  "admin.customization.restrictCustomEmojiCreationAdmin": "Erlaube System und Team Administratoren eigene Emojis zu erstellen.",
   "admin.customization.restrictCustomEmojiCreationAll": "Erlaube jedem eigene Emoji zu erstellen",
   "admin.customization.restrictCustomEmojiCreationDesc": "Beschränke die Erstellung eigener Emoji auf bestimmte Benutzer.",
-  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Erlaube nur Systemadministratoren die Erstellung eigener Emoji",
+  "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Erlaube nur Systemadministratoren eigene Emojis zu erstellen.",
   "admin.customization.restrictCustomEmojiCreationTitle": "Beschränke Erstellung eigener Emoji:",
   "admin.customization.support": "Rechtsabteilung und Support",
   "admin.database.title": "Datenbank Einstellungen",
   "admin.developer.title": "Entwickler Einstellungen",
   "admin.email.agreeHPNS": " Ich verstehe und akzeptiere <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">die Bedingungen</a> des Mattermost Hosted Push Notification Service Terms of Service und die <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Datenschutzerklärung</a>.",
   "admin.email.allowEmailSignInDescription": "Wenn wahr, Mattermost erlaubt Nutzern sich mit E-Mail und Passwort anzumelden.",
-  "admin.email.allowEmailSignInTitle": "Erlaube den Login mit LDAP:",
+  "admin.email.allowEmailSignInTitle": "Erlaube den Login mit E-Mail: ",
   "admin.email.allowSignupDescription": "Wenn wahr erlaubt Mattermost Teamerstellung und Registrierung via E-Mail und Passwort.  Dieser Wert sollte nur Falsch sein, wenn Sie Anmeldungen nur via SSO Dienste wie OAuth oder LDAP zulassen möchten.",
-  "admin.email.allowSignupTitle": "Enable account creation with email: ",
+  "admin.email.allowSignupTitle": "Erlaube die Erstellen einen Accounts mit der E-Mail: ",
   "admin.email.allowUsernameSignInDescription": "Wenn wahr erlaubt Mattermost Nutzern sich mit Benutzername und Passwort anzumelden.  Diese Einstellungen wird typischerweise nur genutzt, wenn E-Mail Bestätigung deaktiviert ist.",
-  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
+  "admin.email.allowUsernameSignInTitle": "Erlaube das Anmelden mit dem Benutzernamen: ",
   "admin.email.connectionSecurityTest": "Verbindung testen",
   "admin.email.easHelp": "Erfahren Sie mehr zum Erstellen und Ausrollen Ihrer eigenen mobilen App aus einem <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
   "admin.email.emailFail": "Verbindung nicht erfolgreich: {error}",
@@ -173,7 +173,7 @@
   "admin.email.genericPushNotification": "Sende allgemeine Beschreibung mit Benutzer- und Kanalnamen",
   "admin.email.inviteSaltDescription": "32 Zeichen langer Salt der zum Signieren von E-Mail Einladungen hinzugefügt wird. Zufallsgeneriert bei Installation. \"Neu generieren\" klicken um einen neuen Salt zu erstellen.",
   "admin.email.inviteSaltExample": "z.B.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.inviteSaltTitle": "Email Invite Salt:",
+  "admin.email.inviteSaltTitle": "Salt für E-Mail Einladung:",
   "admin.email.mhpns": "Benutze verschlüsselte, production-quality HPNS Verbindung zu iOS und Android Apps",
   "admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">Mattermost iOS app</a> bei iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">Mattermost Android app</a> bei Google Play. Erfahren Sie mehr über <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>.",
   "admin.email.mtpns": "Benutze iOS und Android Apps von iTunes und Google Play mit TPNS",
@@ -188,7 +188,7 @@
   "admin.email.notificationOrganization": "Adresse in der Fußzeile von Benachrichtigungen",
   "admin.email.notificationOrganizationDescription": "Name und Adresse der Organisation bzw. des Unternehmens, wie sie in E-Mail-Benachrichtigungen von Mattermost angezeigt werden sollen, z.B. \"© Musterfirma GmbH, Musterstraße 23, 59424 Musterhausen, Deutschland\". Wenn dieses Feld leer bleibt, werden der Name und Adresse der Organisation nicht angezeigt.",
   "admin.email.notificationsDescription": "Normalerweise wahr in Produktionsumgebungen. Wenn wahr versucht Mattermost E-Mail Benachrichtigungen zu versenden. Entwickler sollten dies auf falsch für eine schnellere Entwicklung setzen.<br />Durch setzen auf wahr wird der Vorschau Modus Banner entfernt (benötigt aus- und einloggen nach Änderung).",
-  "admin.email.notificationsTitle": "Sende E-Mail Benachrichtigungen: ",
+  "admin.email.notificationsTitle": "Aktiviere E-Mail Benachrichtigungen: ",
   "admin.email.passwordSaltDescription": "32 Zeichen langer Salt der zum Signieren von Passwort zurücksetzen E-Mails hinzugefügt wird. Zufallsgeneriert bei Installation. \"Neu generieren\" klicken um einen neuen Salt zu erstellen.",
   "admin.email.passwordSaltExample": "z.B.: \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Passwort zurücksetzen Salt:",
@@ -200,13 +200,13 @@
   "admin.email.pushServerDesc": "Adresse des Mattermost Push Notification Servers. Dieser kann hinter einer Firewall mit https://github.com/mattermost/push-proxy betrieben werden. Für Tests können Sie http://push-test.mattermost.com verwenden, welcher mit der Mattermost iOS Beispielanwendung im Apple AppStore zusammenarbeiten. Bitte verwenden Sie den Testdienst nicht für Produktionsumgebungen.",
   "admin.email.pushServerEx": "z.B.: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "Push Notification Server:",
-  "admin.email.pushTitle": "Sende Push Nachrichten: ",
+  "admin.email.pushTitle": "Aktiviere Push Nachrichten: ",
   "admin.email.requireVerificationDescription": "Normalerweise wahr in Produktionsumgebungen. Wenn wahr erfordert Mattermost E-Mail-Adressen nach Account Erstellung zu bestätigen bevor ein Anmelden erlaubt wird. Entwickler sollten dies auf falsch setzen um für eine schnellere Entwicklung die E-Mail Bestätigung zu überspringen.",
   "admin.email.requireVerificationTitle": "Erzwinge E-Mail Bestätigung: ",
   "admin.email.selfPush": "Manuelle Eingabe des Orts zum Push-Mitteilungs-Service",
   "admin.email.smtpPasswordDescription": " Die Zugangsdaten erhalten Sie vom Administrator des E-Mail Servers.",
   "admin.email.smtpPasswordExample": "z.B.: \"IhrPasswort\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "SMTP Server Password:",
+  "admin.email.smtpPasswordTitle": "SMTP Server Passwort:",
   "admin.email.smtpPortDescription": "SMTP Port des E-Mail-Servers.",
   "admin.email.smtpPortExample": "z.B.: \"25\", \"465\"",
   "admin.email.smtpPortTitle": "SMTP Server Port:",
@@ -215,7 +215,7 @@
   "admin.email.smtpServerTitle": "SMTP Server:",
   "admin.email.smtpUsernameDescription": " Die Zugangsdaten erhalten Sie vom Administrator des E-Mail Servers.",
   "admin.email.smtpUsernameExample": "z.B.: \"admin@ihrefirma.de\", \"AKIADTOVBGERKLCBV\"",
-  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
+  "admin.email.smtpUsernameTitle": "SMTP Server Benutzername:",
   "admin.email.testing": "Überprüfen...",
   "admin.false": "falsch",
   "admin.file_upload.chooseFile": "Datei auswählen",
@@ -233,10 +233,14 @@
   "admin.general.localization.serverLocaleTitle": "Standardsprache Server:",
   "admin.general.log": "Protokollierung",
   "admin.general.policy": "Richtlinie",
-  "admin.general.policy.teamInviteAdmin": "Team- und Systemadministratoren",
-  "admin.general.policy.teamInviteAll": "Alle Teammitglieder",
+  "admin.general.policy.permissionsAdmin": "Team- und Systemadministratoren",
+  "admin.general.policy.permissionsAll": "Alle Teammitglieder",
+  "admin.general.policy.permissionsSystemAdmin": "Systemadministratoren",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Bei der Wahl von \"Alle Teammitglieder\" erlaubt jedem Teammitglied private Gruppen zu erstellen, löschen und umzubenennen, sowie die Überschrift und Zweck zu bearbeiten.<br/><br/>Bei der Wahl von \"Team- und Systemadministratoren\" begrenzt das Gruppenmanagement Recht für private Gruppen auf Team- und Systemadministratoren, inklusive erstellen, löschen, umbenennen sowie Gruppenüberschrift und Zweck setzen.<br/><br/>Bei der Wahl \"Systemadministratoren\" erlaubt nur Systemadministratoren private Gruppen zu erstellen, löschen und umzubenennen, sowie die Überschrift und den Zweck zu bearbeiten.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Aktiviere Managementrechte für private Gruppen für:",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Bei der Wahl von \"Alle Teammitglieder\" erlaubt jedem Teammitglied öffentliche Kanäle zu erstellen, löschen und umzubenennen, sowie die Überschrift und Zweck zu bearbeiten.<br/><br/>Bei der Wahl von \"Team- und Systemadministratoren\" begrenzt das Kanalmanagement Recht für öffentliche Kanäle auf Team- und Systemadministratoren, inklusive erstellen, löschen, umbenennen sowie Kanalüberschrift und Zweck setzen.<br/><br/>Bei der Wahl \"Systemadministratoren\" erlaubt nur Systemadministratoren öffentliche Kanäle  zu erstellen, löschen und umzubenennen, sowie die Überschrift und den Zweck zu bearbeiten.",
+  "admin.general.policy.restrictPublicChannelManagementTitle": "Aktiviere Managementrechte für öffentliche Kanäle für:",
   "admin.general.policy.teamInviteDescription": "Das Aktivieren von \"Alle Team Mitglieder\" erlaubt es allen Team Mitgliedern Andere Personen per E-Mail oder Link einzuladen.<br/><br/>Das Auswählen von \"Team und Systemadministratoren\" versteckt die E-Mail und Link Einladung im Menü für alle, die nicht zum Team oder zur Gruppe der Systemadministratoren gehören. Hinweis: Wenn der \"Team Einladung\" Link genutzt wird, muss dieser neu generiert werden nachdem die gewünschten Benutzer beigetreten sind.<br/><br/>Das Auswählen von \"Systemadministratoren\" versteckt die E-Mail und Link Einladung im Menü für alle, die nicht zur Gruppe der Systemadministratoren gehören. Hinweis: Wenn der \"Team Einladung\" Link genutzt wird, muss dieser neu generiert werden nachdem die gewünschten Benutzer beigetreten sind.",
-  "admin.general.policy.teamInviteSystemAdmin": "Systemadministrator",
   "admin.general.policy.teamInviteTitle": "Erlaube das Senden von Teameinladungen:",
   "admin.general.privacy": "Privatsphäre",
   "admin.general.usersAndTeams": "Benutzer und Teams",
@@ -247,11 +251,11 @@
   "admin.gitlab.authTitle": "Auth Endpunkt:",
   "admin.gitlab.clientIdDescription": "Befolgen Sie die Anleitung zum Login in Gitlab, um diesen Wert zu erhalten",
   "admin.gitlab.clientIdExample": "z.B.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientIdTitle": "Name der Anwendung",
+  "admin.gitlab.clientIdTitle": "Anwendungs ID:",
   "admin.gitlab.clientSecretExample": "z.B.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "Application Secret Key:",
+  "admin.gitlab.clientSecretTitle": "Geheimer Schlüssel der Anwendung:",
   "admin.gitlab.enableDescription": "Wenn wahr, erlaubt Mattermost die Erstellung von Teams und die Registrierung mittels GitLab OAuth.",
-  "admin.gitlab.enableTitle": "Enable authentication with GitLab: ",
+  "admin.gitlab.enableTitle": "Erlaube die Authentifizierung mit GitLab: ",
   "admin.gitlab.settingsTitle": "GitLab Einstellungen",
   "admin.gitlab.tokenDescription": "Geben Sie https://<your-gitlab-url>/oauth/token ein.   Stellen Sie sicher, dass Sie, abhängig von Ihrer Serverkonfiguration, HTTP oder HTTPS in der URL verwenden.",
   "admin.gitlab.tokenExample": "z.B.: \"https://<your-gitlab-url>/oauth/token\"",
@@ -271,39 +275,39 @@
   "admin.image.amazonS3SecretDescription": "Erhalten Sie diesen Wert von Ihrem Amazon EC2 Administrator.",
   "admin.image.amazonS3SecretExample": "z.B.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 geheimer Zugangsschlüssel:",
-  "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
+  "admin.image.localDescription": "Ort, in den Dateien und Bilder gespeichert werden. Wenn leer, ist der Standard ./data/.",
   "admin.image.localExample": "Bsp.: \"./data/\"",
-  "admin.image.localTitle": "Local Storage Directory:",
-  "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
+  "admin.image.localTitle": "Lokaler Speicherort:",
+  "admin.image.maxFileSizeDescription": "Maximale Dateigröße für Anhänge in MB. Achtung: Stelle sicher, dass der Server die gewählte Größe unterstützt. Große Dateien erhöhen das Risiko eines Servercrashes und von abgebrochenen Uploads bei Netzwerkstörungen.",
   "admin.image.maxFileSizeExample": "50",
-  "admin.image.maxFileSizeTitle": "Maximum File Size:",
+  "admin.image.maxFileSizeTitle": "Maximale Dateigröße:",
   "admin.image.previewHeightDescription": "Maximale Höhe des Vorschaubildes (\"0\": Automatische Berechnung). Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
   "admin.image.previewHeightExample": "z.B.: \"0\"",
-  "admin.image.previewHeightTitle": "Image Preview Height:",
+  "admin.image.previewHeightTitle": "Vorschau der Bildhöhe:",
   "admin.image.previewWidthDescription": "Maximale Breite des Vorschaubildes. Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
   "admin.image.previewWidthExample": "z.B.: \"1024\"",
-  "admin.image.previewWidthTitle": "Profile Picture Width:",
+  "admin.image.previewWidthTitle": "Profilbild Breite:",
   "admin.image.profileHeightDescription": "Höhe des Profilbildes.",
   "admin.image.profileHeightExample": "z.B.: \"0\"",
-  "admin.image.profileHeightTitle": "Profile Picture Height:",
+  "admin.image.profileHeightTitle": "Profilbild Höhe:",
   "admin.image.profileWidthDescription": "Breite des Profilbildes.",
   "admin.image.profileWidthExample": "z.B.: \"1024\"",
-  "admin.image.profileWidthTitle": "Image Preview Width:",
+  "admin.image.profileWidthTitle": "Vorschau der Bildbreite:",
   "admin.image.publicLinkDescription": "32-Zeichen Salt um die öffentlich Links von Bildern zu signieren. Wird bei der Installation zufällig generiert. Klicken Sie \"Neu generieren\" um einen neuen Salt zu erstellen.",
   "admin.image.publicLinkExample": "Bsp.: \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Salt für öffentlichen Links:",
   "admin.image.shareDescription": "Erlaubt Nutzern öffentliche Links zu Dateien und Bildern zu teilen.",
-  "admin.image.shareTitle": "Teile öffentliche Dateilinks: ",
+  "admin.image.shareTitle": "Erlaube öffentliche Dateilinks: ",
   "admin.image.storeAmazonS3": "Amazon S3",
-  "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
+  "admin.image.storeDescription": "Dateisystem, in dem Dateien und Bilder gespeichert werden.<br /><br />Die Auswahl von \"Amazon S3\" aktiviert die Felder zur Eingabe des Amazonzuganges.<br /><br />Die Auswahl von lokalem Speicher aktiviert das Feld um einen lokalen Dateipfad auszuwählen.",
   "admin.image.storeLocal": "Lokales Dateisystem",
-  "admin.image.storeTitle": "File Storage System:",
+  "admin.image.storeTitle": "Dateisystem:",
   "admin.image.thumbHeightDescription": "Höhe der Vorschaubilder welche beim Hochladen von Bildern generiert werden. Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
   "admin.image.thumbHeightExample": "z.B.: \"100\"",
-  "admin.image.thumbHeightTitle": "Attachment Thumbnail Height:",
+  "admin.image.thumbHeightTitle": "Höhe des Vorschaubildes:",
   "admin.image.thumbWidthDescription": "Breite der Vorschaubilder welche beim Hochladen von Bildern generiert werden. Änderungen dieses Wertes wirken sich auf die zukünftige Darstellung der Vorschaubilder aus, aber nicht auf bereits bestehende Bilder.",
   "admin.image.thumbWidthExample": "z.B.: \"120\"",
-  "admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
+  "admin.image.thumbWidthTitle": "Breite des Vorschaubildes:",
   "admin.integrations.external": "Externe Dienste",
   "admin.integrations.webhook": "Webhooks und Kommandos",
   "admin.ldap.baseDesc": "Die Basisdomäne ist der ausgezeichnete Name, mit dem Mattermost mit der Suche nach Nutzern im LDAP Baum beginnen soll.",
@@ -321,7 +325,7 @@
   "admin.ldap.firstnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird, um den Vornamen des Nutzers in Mattermost zu anzuzeigen.",
   "admin.ldap.firstnameAttrEx": "z.B.: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Attribut Vorname",
-  "admin.ldap.idAttrDesc": "Das Attribut des LDAP Server, welches von Mattermost als eindeutiger Identifikator benutzt wird. Es sollte ein LDAP Attribut sein, dessen Wert sich nicht ändert, z.B. Nutzername oder UID. Wenn die ID eines Nutzer sich ändert, wird Mattermost einen neues Konto erstellen, welches nicht mit dem Alten verbunden ist. Dieser Wert wird für den Login in Mattermost als \"LDAP Nutzername\" auf der Anmeldeseite verwendet. Normalerweise ist das Attribut dasselbe wie das vorherige Feld \"Nutzername Attribut\". Wenn ihr Team, zur Anmeldung an andere Dienste mittels LDAP, die Formulierung Domäne\\\\Nutzername verwendet, wählen Sie Domäne\\\\Nutzername in diesem Feld, um die Konsistenz zwischen den Seiten beizubehalten.",
+  "admin.ldap.idAttrDesc": "Das Attribut des LDAP Server, welches von Mattermost als eindeutiger Identifikator benutzt wird. Es sollte ein LDAP Attribut sein, dessen Wert sich nicht ändert, z.B. Nutzername oder UID. Wenn die ID eines Nutzer sich ändert, wird Mattermost einen neues Konto erstellen, welches nicht mit dem Alten verbunden ist. Dieser Wert wird für den Login in Mattermost als \"LDAP Nutzername\" auf der Anmeldeseite verwendet. Normalerweise ist das Attribut dasselbe wie das vorherige Feld \"Attribut Benutzername\". Wenn ihr Team, zur Anmeldung an andere Dienste mittels LDAP, die Formulierung Domäne\\Benutzername verwendet, wählen Sie Domäne\\Benutzername in diesem Feld, um die Konsistenz zwischen den Seiten beizubehalten.",
   "admin.ldap.idAttrEx": "z.B.: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Attribut ID: ",
   "admin.ldap.lastnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszfüllen.",
@@ -330,9 +334,9 @@
   "admin.ldap.loginNameDesc": "Der Platzhalter der im Loginfeld der Loginseite angezeigt wird. Standart ist \"LDAP Benutzername\".",
   "admin.ldap.loginNameEx": "z.B.: \"LDAP Benutzername\"",
   "admin.ldap.loginNameTitle": "Login Feld Name:",
-  "admin.ldap.maxPageSizeEx": "z.B.: \"10000\"",
-  "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.",
-  "admin.ldap.maxPageSizeTitle": "Maximum Page Size",
+  "admin.ldap.maxPageSizeEx": "z.B.: \"2000\"",
+  "admin.ldap.maxPageSizeHelpText": "Die maximale Anzahl von Benutzern, die der Mattermost Server vom LDAP Server auf einmal anfordern wird. 0 ist unendlich.",
+  "admin.ldap.maxPageSizeTitle": "Maximale Seitengröße",
   "admin.ldap.nicknameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
   "admin.ldap.nicknameAttrEx": "z.B.: \"Spitzname\"",
   "admin.ldap.nicknameAttrTitle": "Spitznamen Attribut:",
@@ -348,10 +352,13 @@
   "admin.ldap.serverTitle": "LDAP Server:",
   "admin.ldap.skipCertificateVerification": "Zertifikatsprüfung überspringen",
   "admin.ldap.skipCertificateVerificationDesc": "Zertifikatsprüfung für TLS oder STARTTLS Verbindungen überspringen. Nicht empfohlen bei Produktiv-Umgebungen bei denen TLS benötigt wird. Nur zum Test gedacht.",
+  "admin.ldap.syncFailure": "Sync Fehler: {error}",
   "admin.ldap.syncIntervalHelpText": "LDAP Synchronisation ist der Prozess mit dem Mattermost seine Benutzerdaten mit geänderten Daten vom LDAP Server abgleicht. Wenn zum Beispiel der Name eines Benutzers auf dem LDAP Server aktualisiert wird, wird diese Änderung im Mattermost übertragen sobald die Synchronisation ausgeführt wird. Wenn Zugänge vom LDAP Server gelöscht werden, dann werden alle aktiven Sitzungen des Accounts gelöscht und der Nutzer kann sich nicht mehr in Mattermost anmelden. Mattermost wird die Synchrinisation regelmäßig zum hier angegebenen Intervall ausführen. Wenn zum Beispiel 60 angegeben wird, wird Mattermost die Nutzerdaten jede Stunde aktualisieren.",
   "admin.ldap.syncIntervalTitle": "Synchronisationsintervall (in Minuten)",
+  "admin.ldap.syncNowHelpText": "Initiiert eine sofortige LDAP Synchronisation.",
+  "admin.ldap.sync_button": "LDAP jetzt abgleichen",
   "admin.ldap.uernameAttrDesc": "Das Attribut des LDAP-Servers das zum Befüllen des Benutzernamens in Mattermost verwendet wird. Das kann auch dem des ID-Attributes entsprechen.",
-  "admin.ldap.userFilterDisc": "Optional die Angabe eines LDAP-Filters zur Nutzung bei der Suche nach Benutzer-Objekten. Nur die ausgewählten Benutzer dieser Abfrage werden Zugriff auf Mattermost haben. Bei Active-Directory lautet die Abfrage zum Ausschluss von deaktivierten Benutzern (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
+  "admin.ldap.userFilterDisc": "(Optional)Geben Sie einen LDAP-Filters zur Begrenzung bei der Suche nach Benutzer-Objekten ein. Nur die zurückgegebenen Benutzer dieser Abfrage werden Zugriff auf Mattermost erhalten. Für Active-Directory lautet die Abfrage zum Ausschluss von deaktivierten Benutzern (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "z.B.: \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "Benutzerfilter:",
   "admin.ldap.usernameAttrEx": "z.B.: \"sAMAccountName\"",
@@ -369,13 +376,13 @@
   "admin.license.uploadDesc": "Laden Sie einen Mattermost Enterprise Edition Lizenzschlüssel hoch um den Server upzugraden. <a href=\"http://mattermost.com\" target=\"_blank\">Besuchen Sie uns online</a> um mehr über die Vorteile der Enterprise Edition zu erfahren oder um eine Lizenz zu kaufen.",
   "admin.license.uploading": "Lizenz wird hochgeladen...",
   "admin.log.consoleDescription": "Üblicherweise Falsch bei Produktiv-Umgebungen. Entwickler können dieses auf Wahr stellen um Logmeldungen auf der Konsole anhand der Konsolen-Level Option zu erhalten.  Wenn Wahr, schreibt der Server die Meldungen in den Standard-Ausgabe-Stream (stdout).",
-  "admin.log.consoleTitle": "Output logs to console: ",
+  "admin.log.consoleTitle": "Log auf der Konsole ausgeben:",
   "admin.log.enableWebhookDebugging": "Aktiviere Webhook Debugging:",
   "admin.log.enableWebhookDebuggingDescription": "Sie können dies auf falsch setzen, um das Debuglogging von eingehenden Webhook Anfragen zu deaktivieren.",
   "admin.log.fileDescription": "In Produktionsumgebungen normalerweise wahr.   Wenn wahr werden Logdateien im Speicherort abgelegt, welcher im unteren Feld spezifiziert wird.",
   "admin.log.fileLevelDescription": "Diese Einstellung bestimmt auf welchem Detailgrad Lognachrichten in die Konsole geschrieben werden. FEHLER: Gibt nur Fehlernachrichten aus. INFO: Gibt Fehlernachrichten und Informationen zum Start und Initialisierung aus. DEBUG: Gibt einen hohen Detailgrad für Entwickler zur Fehlersuche aus.",
   "admin.log.fileLevelTitle": "Datei Log-Level:",
-  "admin.log.fileTitle": "Output logs to file: ",
+  "admin.log.fileTitle": "Log in eine Datei schreiben:",
   "admin.log.formatDateLong": "Datum (2006/01/02)",
   "admin.log.formatDateShort": "Datum (01/02/06)",
   "admin.log.formatDescription": "Format der Lognachrichten. Wenn leer wird \"[%D %T] [%L] %M\" verwendet, wo:",
@@ -384,12 +391,12 @@
   "admin.log.formatPlaceholder": "Dateiformat eingeben",
   "admin.log.formatSource": "Quelle",
   "admin.log.formatTime": "Zeit (15:04:05 MST)",
-  "admin.log.formatTitle": "Dateiformat:",
+  "admin.log.formatTitle": "Log-Dateiformat:",
   "admin.log.levelDescription": "Diese Einstellung bestimmt auf welchem Detailgrad Lognachrichten in die Konsole geschrieben werden. ERROR: Gibt nur Fehlernachrichten aus. INFO: Gibt Fehlernachrichten und Informationen zum Start und Initialisierung aus. DEBUG: Gibt einen hohen Detailgrad für Entwickler zur Fehlersuche aus.",
   "admin.log.levelTitle": "Konsole Log Level:",
   "admin.log.locationDescription": "Datei in welche die Lognachrichten geschrieben werden. Wenn leer wird ./logs/mattermost verwendet welches in mattermost.log schreibt. Log Rotation ist aktiviert und alle 10.000 Zeilen wird in eine neue Datei im selben Verzeichnis geschrieben, zum Beispiel mattermost.2015-09-23.001, mattermost.2015-09-23.002, und so weiter.",
   "admin.log.locationPlaceholder": "Einen Dateiort eingeben",
-  "admin.log.locationTitle": "File Log Directory:",
+  "admin.log.locationTitle": "Log-Verzeichnis:",
   "admin.log.logSettings": "Protokoll-Einstellungen",
   "admin.logs.reload": "Erneut laden",
   "admin.logs.title": "Serverprotokoll",
@@ -400,25 +407,35 @@
   "admin.notifications.email": "E-Mail",
   "admin.notifications.push": "Mobile Push",
   "admin.notifications.title": "Benachrichtigungseinstellungen",
+  "admin.password.lowercase": "Mindestens ein Kleinbuchstabe",
+  "admin.password.minimumLength": "Minimale Passwort Länge:",
+  "admin.password.minimumLengthDescription": "Minimale Anzahl an Zeichen, die für ein gültiges Passwort benötigt werden. Muss eine ganze Zahl größer oder gleich zu {min} und weniger oder gleich {max} sein.",
+  "admin.password.minimumLengthExample": "z.B.: \"25\"",
+  "admin.password.number": "Mindestens eine Ziffer",
+  "admin.password.preview": "Vorschau der Fehlermeldung",
+  "admin.password.requirements": "Passwortanforderungen:",
+  "admin.password.requirementsDescription": "Erforderliche Zeichentypen für ein gültiges Passwort.",
+  "admin.password.symbol": "Mindestens ein Symbol (wie \"~!@#$%^&*()\")",
+  "admin.password.uppercase": "Mindestens ein Großbuchstabe",
   "admin.privacy.showEmailDescription": "Wenn Falsch, versteckt die E-Mail-Adresse von Nutzern gegenüber anderen Nutzern, inklusive Team Eigentümer und Team Administratoren. Wird verwendet, wenn das System für die Verwaltung von Teams eingerichtet ist in dem einige Nutzer ihre Kontaktinformationen privat halten möchten.",
   "admin.privacy.showEmailTitle": "Zeige E-Mail-Adresse: ",
   "admin.privacy.showFullNameDescription": "Wenn falsch, versteckt den vollen Namen von Nutzern gegenüber anderen Nutzern, inklusive Team Eigentümer und Team Administratoren. Stattdessen wird der Benutzername angezeigt.",
   "admin.privacy.showFullNameTitle": "Zeige vollen Namen: ",
   "admin.rate.enableLimiterDescription": "Wenn wahr, werden API Anfragen auf die eingestellten Werte begrenzt.",
-  "admin.rate.enableLimiterTitle": "Aktiviere Anfragenbegrenzer: ",
+  "admin.rate.enableLimiterTitle": "Anfragen drosseln: ",
   "admin.rate.httpHeaderDescription": "Wenn ausgefüllt, wird der Begrenzer an dem spezifizierten HTTP Header unterschieden (z.B. NGINX auf \"X-Real-IP\" stellen, bei Amazon ELB auf \"X-Forwarded-For\" stellen).",
   "admin.rate.httpHeaderExample": "z.B.: \"X-Real-IP\", \"X-Forwarded-For\"",
-  "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header",
-  "admin.rate.memoryDescription": "Maximale Anzahl an mit dem System verbundenen Benutzer Sitzungen, festgelegt nach \"Unterscheiden nach Absender Adresse\" und \"Unterscheiden nach HTTP Header\".",
+  "admin.rate.httpHeaderTitle": "Mittels HTTP Header drosseln",
+  "admin.rate.memoryDescription": "Die maximale Anzahl an verbundenen Benutzer-Sitzungen, festgelegt durch die Einstellungen \"Mittels Absender-Adresse drosseln\" bzw. \"Mittels HTTP Header drosseln\".",
   "admin.rate.memoryExample": "z.B.: \"10000\"",
   "admin.rate.memoryTitle": "Speichergröße:",
   "admin.rate.noteDescription": "Änderungen an Einstellungen in diesem Bereich erfordern einen Server Neustart.",
   "admin.rate.noteTitle": "Notiz:",
   "admin.rate.queriesDescription": "Begrenzt die API auf diese Anzahl an Anfragen pro Sekunde.",
   "admin.rate.queriesExample": "z.B.: \"10\"",
-  "admin.rate.queriesTitle": "Maximum Queries per Second:",
+  "admin.rate.queriesTitle": "Maximale Anfragen pro Sekunde:",
   "admin.rate.remoteDescription": "Wenn wahr, begrenze API Zugriff durch IP Adresse.",
-  "admin.rate.remoteTitle": "Vary rate limit by remote address: ",
+  "admin.rate.remoteTitle": "Mittels Absender-Adresse drosseln:",
   "admin.rate.title": "Begrenzer-Einstellungen",
   "admin.recycle.button": "Datenbankverbindungen recyclen",
   "admin.recycle.loading": " recycle...",
@@ -435,63 +452,67 @@
   "admin.reset_password.submit": "Bitte geben Sie mindestens {chars} Zeichen ein.",
   "admin.reset_password.titleReset": "Passwort zurücksetzen",
   "admin.reset_password.titleSwitch": "Zugang auf E-Mail-Adresse/Passwort umstellen",
-  "admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.",
-  "admin.saml.assertionConsumerServiceURLEx": "Ex \"https://<your-mattermost-url>/login/sso/saml\"",
+  "admin.saml.assertionConsumerServiceURLDesc": "Geben Sie https://<your-mattermost-url>/login/sso/saml ein. Stellen Sie sicher Sie verwenden HTTP oder HTTPS in Ihrer URL entsprechend Ihrer Serverkonfiguration. Dieses Feld ist auch bekannt als die \"Assertion Consumer Service URL\".",
+  "admin.saml.assertionConsumerServiceURLEx": "z.B. \"https://<your-mattermost-url>/login/sso/saml\"",
   "admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:",
   "admin.saml.emailAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um die E-Mailadressen der Nutzer in Mattermost auszfüllen.",
-  "admin.saml.emailAttrEx": "Ex \"Email\" or \"PrimaryEmail\"",
+  "admin.saml.emailAttrEx": "z.B. \"E-Mail\" oder \"primäre E-Mail\"",
   "admin.saml.emailAttrTitle": "E-Mail Attribut:",
-  "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.",
-  "admin.saml.enableTitle": "Erlaube den Login mit LDAP:",
-  "admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.",
-  "admin.saml.encryptTitle": "Enable Encryption:",
+  "admin.saml.enableDescription": "Wenn wahr erlaubt Mattermost Login mit SAML. Bitte sehen Sie sich die <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>Dokumentation</a> an um mehr über die SAML Konfiguration für Mattermost zu lernen.",
+  "admin.saml.enableTitle": "Erlaube den Login mit SAML:",
+  "admin.saml.encryptDescription": "Wenn wahr wird Mattermost SAML Assertions entschlüsseln, die mit Ihrem öffentlichen Zertifikat des Service Providers verschlüsselt wurden.",
+  "admin.saml.encryptTitle": "Verschlüsselung aktivieren:",
   "admin.saml.firstnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird, um den Vornamen des Nutzers in Mattermost zu anzuzeigen.",
-  "admin.saml.firstnameAttrEx": "Ex \"FirstName\"",
-  "admin.saml.firstnameAttrTitle": "Attribut Vorname",
-  "admin.saml.idpCertificateFileDesc": "The public authentication certificate issued by your Identity Provider.",
-  "admin.saml.idpCertificateFileRemoveDesc": "Remove the public authentication certificate issued by your Identity Provider.",
-  "admin.saml.idpCertificateFileTitle": "Identity Provider Public Certificate:",
-  "admin.saml.idpDescriptorUrlDesc": "The issuer URL for the Identity Provider you use for SAML requests.",
-  "admin.saml.idpDescriptorUrlEx": "Ex \"https://idp.example.org/SAML2/issuer\"",
-  "admin.saml.idpDescriptorUrlTitle": "Identity Provider Issuer URL:",
-  "admin.saml.idpUrlDesc": "The URL where Mattermost sends a SAML request to start login sequence.",
-  "admin.saml.idpUrlEx": "Ex \"https://idp.example.org/SAML2/SSO/Login\"",
+  "admin.saml.firstnameAttrEx": "z.B. \"Vorname\"",
+  "admin.saml.firstnameAttrTitle": "Attribut Vorname:",
+  "admin.saml.idpCertificateFileDesc": "Das öffentliche Authentifizierungszertifikat, ausgestellt durch Ihren Identitätsprovider.",
+  "admin.saml.idpCertificateFileRemoveDesc": "Das durch Ihren Identitätsprovider ausgestellte öffentliche Authentifizierungszertifikat entfernen.",
+  "admin.saml.idpCertificateFileTitle": "Öffentliches Zertifikat des Identitätsproviders:",
+  "admin.saml.idpDescriptorUrlDesc": "Die issuer URL für den Identitätsprovider für SAML anfragen.",
+  "admin.saml.idpDescriptorUrlEx": "z.B. \"https://idp.beispiel.org/SAML2/issuer\"",
+  "admin.saml.idpDescriptorUrlTitle": "Identitätsprovider Issuer URL:",
+  "admin.saml.idpUrlDesc": "Die URL, an die Mattermost SAML Anfragen zum Start der Loginsequenz schickt.",
+  "admin.saml.idpUrlEx": "z.B. \"https://idp.beispiel.org/SAML2/SSO\"Login\"",
   "admin.saml.idpUrlTitle": "SAML SSO URL:",
   "admin.saml.lastnameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszfüllen.",
-  "admin.saml.lastnameAttrEx": "Ex \"LastName\"",
-  "admin.saml.lastnameAttrTitle": "Attibut Nachname:",
-  "admin.saml.localeAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
-  "admin.saml.localeAttrEx": "Ex \"Locale\" or \"PrimaryLanguage\"",
-  "admin.saml.localeAttrTitle": "Preferred Language Attribute:",
-  "admin.saml.loginButtonTextDesc": "(Optional) The text that appears in the login button on the login page. Defaults to \"With SAML\".",
-  "admin.saml.loginButtonTextEx": "Ex \"With OKTA\"",
+  "admin.saml.lastnameAttrEx": "z.B. \"Nachname\"",
+  "admin.saml.lastnameAttrTitle": "Attribut Nachname:",
+  "admin.saml.localeAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um de Sprache des Nutzers in Mattermost auszufüllen.",
+  "admin.saml.localeAttrEx": "z.B. \"Sprache\"",
+  "admin.saml.localeAttrTitle": "Attribut bevorzugte Sprache:",
+  "admin.saml.loginButtonTextDesc": "(Optional) Der Text der auf dem Login Button auf der Loginseite erscheint. Standardmäßig \"Mit SAML\".",
+  "admin.saml.loginButtonTextEx": "z.B. \"Mit OKTA\"",
   "admin.saml.loginButtonTextTitle": "Login Button Text:",
-  "admin.saml.nicknameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszufüllen.",
+  "admin.saml.nicknameAttrDesc": "(Optional) Das Attribut des LDAP Servers, welches benutzt wird um den Spitznamen des Nutzers in Mattermost auszufüllen.",
   "admin.saml.nicknameAttrEx": "z.B.: \"Spitzname\"",
-  "admin.saml.nicknameAttrTitle": "Spitznamen Attribut:",
-  "admin.saml.privateKeyFileFileDesc": "The private key used to decrypt SAML Assertions from the Identity Provider.",
-  "admin.saml.privateKeyFileFileRemoveDesc": "Remove the private key used to decrypt SAML Assertions from the Identity Provider.",
-  "admin.saml.privateKeyFileTitle": "Service Provider Private Key:",
-  "admin.saml.publicCertificateFileDesc": "The certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
-  "admin.saml.publicCertificateFileRemoveDesc": "Remove the certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
-  "admin.saml.publicCertificateFileTitle": "Service Provider Public Certificate:",
-  "admin.saml.remove.idp_certificate": "Remove Identity Provider Certificate",
-  "admin.saml.remove.privKey": "Remove Service Provider Private Key",
-  "admin.saml.remove.sp_certificate": "Remove Service Provider Certificate",
-  "admin.saml.removing.certificate": "Removing Certificate...",
-  "admin.saml.removing.privKey": "Removing Private Key...",
-  "admin.saml.uploading.certificate": "Uploading Certificate...",
-  "admin.saml.uploading.privateKey": "Uploading Private Key...",
-  "admin.saml.usernameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um den Nachname des Nutzers in Mattermost auszfüllen.",
-  "admin.saml.usernameAttrEx": "Ex \"Username\"",
+  "admin.saml.nicknameAttrTitle": "Attribut Spitzname:",
+  "admin.saml.privateKeyFileFileDesc": "Der private Schlüssel der zur Entschlüsselung der SAML Assertions des Identitätsproviders verwendet wird.",
+  "admin.saml.privateKeyFileFileRemoveDesc": "Den privaten Schlüssel zur Entschlüsselung der SAML Assertions löschen.",
+  "admin.saml.privateKeyFileTitle": "Service Provider Privater Schlüssel:",
+  "admin.saml.publicCertificateFileDesc": "Das Zertifikat mit dem die Signatur für SAML Anfragen an den Identitätsprovider für den Service Provider initiierten SAML Login generiert wird, wenn Mattermost der Service Provider ist.",
+  "admin.saml.publicCertificateFileRemoveDesc": "Entferne das Zertifikat mit dem die Signatur für SAML Anfragen an den Identitätsprovider für den Service Provider initiierten SAML Login generiert wird, wenn Mattermost der Service Provider ist.",
+  "admin.saml.publicCertificateFileTitle": "Öffentliches Zertifikat des Service Providers:",
+  "admin.saml.remove.idp_certificate": "Entferne Zertifikat des Identitätsproviders",
+  "admin.saml.remove.privKey": "Entferne privaten Schlüssel des Service Providers",
+  "admin.saml.remove.sp_certificate": "Entferne Zertifikat des Service Providers",
+  "admin.saml.removing.certificate": "Entferne Zertifikat...",
+  "admin.saml.removing.privKey": "Entferne privaten Schlüssel...",
+  "admin.saml.uploading.certificate": "Lade Zertifikat hoch...",
+  "admin.saml.uploading.privateKey": "Lade privaten Schlüssel hoch...",
+  "admin.saml.usernameAttrDesc": "Das Attribut des LDAP Servers, welches benutzt wird um den Benutzernamen des Nutzers in Mattermost auszfüllen.",
+  "admin.saml.usernameAttrEx": "z.B. \"Benutzername\"",
   "admin.saml.usernameAttrTitle": "Attribut Benutzername:",
-  "admin.saml.verifyDescription": "When true, Mattermost verifies that the signature sent from the SAML Response matches the Service Provider Login URL",
-  "admin.saml.verifyTitle": "Verify Signature:",
+  "admin.saml.verifyDescription": "Wenn wahr verifiziert Mattermost das die Signatur in den SAML Antworten der Service Provider Login URL entspricht",
+  "admin.saml.verifyTitle": "Signatur überprüfen:",
   "admin.save": "Speichern",
   "admin.saving": "Speichere Einstellungen...",
   "admin.security.connection": "Verbindungen",
+  "admin.security.inviteSalt.disabled": "Der Salt für Einladungen kann nicht geändert werden solange der E-Mail Versand deaktiviert ist.",
   "admin.security.login": "Anmelden",
+  "admin.security.password": "Passwort",
+  "admin.security.passwordResetSalt.disabled": "Der Salt für Passwort Zurücksetzen kann nicht geändert werden solange der E-Mail Versand deaktiviert ist.",
   "admin.security.public_links": "Öffentliche Links",
+  "admin.security.requireEmailVerification.disabled": "E-Mail Bestätigung kann nicht geändert werden solange der E-Mail Versand deaktiviert ist.",
   "admin.security.session": "Sitzungen",
   "admin.security.signup": "Registrieren",
   "admin.select_team.close": "Schließen",
@@ -501,46 +522,46 @@
   "admin.service.attemptExample": "z.B.: \"10\"",
   "admin.service.attemptTitle": "Max. Anmeldeversuche:",
   "admin.service.cmdsDesc": "Wenn wahr, vom Nutzer erstellte Slash Befehle werden erlaubt.",
-  "admin.service.cmdsTitle": "Aktiviere Slash Befehle: ",
+  "admin.service.cmdsTitle": "Aktiviere benutzerdefinierte Slash Befehle: ",
   "admin.service.corsDescription": "Aktiviere HTTP Cross Origin Request für spezifische Domains. Verwenden Sie \"*\" wenn Sie CORS von jeder Domain zulassen möchten oder lassen sie es leer um es zu deaktivieren.",
   "admin.service.corsEx": "http://beispiel.com",
   "admin.service.corsTitle": "Erlaube Cross Origin Requests von:",
-  "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
+  "admin.service.developerDesc": "Wenn wahr werden Javascript Fehler in einer roten Zeile im oberen Bereich des Interfaces angezeigt. Nicht empfohlen für Produktivumgebungen. ",
   "admin.service.developerTitle": "Aktiviere Entwickler Modus: ",
   "admin.service.googleDescription": "Geben Sie den Schlüssel ein um eingebettete YouTube Video Vorschauen basiert auf den Hyperlinks in Nachrichten oder Kommentaren zu aktivieren. Eine Anleitung um einen Schlüssel zu erhalten finden sie unter <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">https://www.youtube.com/watch?v=Im69kzhpR3I</a>. Dieses Feld leer lassen um die automatische Generierung von YouTube Video Vorschauen von Links zu deaktivieren.",
   "admin.service.googleExample": "z.B.: \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API Key:",
   "admin.service.iconDescription": "Wenn wahr werden Webhooks und Slash Befehle erlaubt das Icon, mit dem Sie posten, zu ändern. Hinweis: Zusammen mit dem Erlauben den Nutzernamen zu ändern könnten Phishing Attacken auf die Nutzer ermöglicht werden.",
-  "admin.service.iconTitle": "Enable webhooks and slash commands to override profile picture icons:",
+  "admin.service.iconTitle": "Erlaube Webhooks und Slashbefehlen das Profilbild zu ersetzen:",
   "admin.service.insecureTlsDesc": "Wenn Wahr werden alle ausgehenden HTTPS Anfragen von selbst-signierten Zertifikaten ungeprüft angenommen. Zum Beispiel werden ausgehende Webhooks an einen Server mit einem selbst-signiertem TLS Zertifikat an eine beliebige Domäne zugelassen. Hinweis: das macht diese Verbindungen anfällig für \"Man-In-The-Middle\" Attacken.",
   "admin.service.insecureTlsTitle": "Erlaube unsichere ausgehende Verbindungen: ",
-  "admin.service.integrationAdmin": "Restrict creating integrations to Team and System Admins: ",
+  "admin.service.integrationAdmin": "Begrenze die Erstellung von Integrationen auf Team- und Systemadministratoren: ",
   "admin.service.integrationAdminDesc": "Sofern Wahr, können vom Benutzer erstellte Integrationen nur von Admins erstellt werden.",
   "admin.service.listenAddress": "Empfangs-Adresse:",
   "admin.service.listenDescription": "Die Adresse auf die gebunden und gehört werden soll. Die Eingabe von \":8065\" bindet alle Schnittstellen, \"127.0.0.1:8065\" bindet an die angegebene Schnittstelle.  Änderung dieses Wertes erfordert einen Serverneustart bevor er gültig wird.",
   "admin.service.listenExample": "z.B.: \":8065\"",
   "admin.service.mfaDesc": "Wenn wahr erhalten Nutzer die Möglichkeit Multi-Faktor-Authentifizierung zu ihren Zugängen hinzuzufügen. Sie benötigen ein Smartphone und eine Authenticator App wie Google Authenticator.",
   "admin.service.mfaTitle": "Multi-Faktor Authentifizierung einschalten:",
-  "admin.service.mobileSessionDays": "Session length for mobile apps (days):",
-  "admin.service.mobileSessionDaysDesc": "Die Web Sitzung wird nach der angegebenen Anzahl an Tagen ablaufen und fordert den Nutzer zum erneuten anmelden auf.",
+  "admin.service.mobileSessionDays": "Sessiondauer für mobile Anwendungen (Tage):",
+  "admin.service.mobileSessionDaysDesc": "Die mobile Session wird nach der angegebenen Anzahl an Tagen ablaufen und fordert den Nutzer zum erneuten anmelden auf.",
   "admin.service.outWebhooksDesc": "Sofern Wahr werden ausgehende Webhooks zugelassen.",
   "admin.service.outWebhooksTitle": "Aktiviere ausgehende Webhooks: ",
   "admin.service.overrideDescription": "Wenn wahr werden Webhooks und Slash Befehle erlaubt das Icon, mit dem Sie posten, zu ändern. Hinweis: Zusammen mit dem Erlauben den Nutzernamen zu ändern könnten Phishing Attacken auf die Nutzer ermöglicht werden.",
-  "admin.service.overrideTitle": "Enable webhooks and slash commands to override usernames:",
+  "admin.service.overrideTitle": "Erlaube Webhooks und Slashbefehlen den Benutzernamen zu ersetzen:",
   "admin.service.securityDesc": "Wenn Wahr werden System Administratoren durch E-Mails informiert, dass ein Sicherheitsrelevantes Update in den letzen 12 Stunden angekündigt wurde. Setzt voraus, dass E-Mail aktiviert wurde.",
   "admin.service.securityTitle": "Sicherheitsbenachrichtigungen aktivieren: ",
   "admin.service.segmentDescription": "Segment.com ist ein Online Dienst der zur optionalen Erhebung von detaillierten Systemstatistiken. Sie können einen Schlüssel über einen kostenlosen Account bei Segment.com erhalten.",
   "admin.service.segmentExample": "z.B.: \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Segment Write Key:",
-  "admin.service.sessionCache": "Session Cache in Minuten:",
+  "admin.service.sessionCache": "Session Cache (Minuten):",
   "admin.service.sessionCacheDesc": "Die Anzahl von Minuten in denen der Sitzungs-Cache im Speicher gehalten wird.",
   "admin.service.sessionDaysEx": "z.B.: \"30\"",
-  "admin.service.ssoSessionDays": "Session length for GitLab SSO authentication (days):",
-  "admin.service.ssoSessionDaysDesc": "Die Web Sitzung wird nach der angegebenen Anzahl an Tagen ablaufen und fordert den Nutzer zum erneuten anmelden auf.",
-  "admin.service.testingDescription": "(Entwickler Option) Wenn wahr wird der /loadtest Slash Befehl aktiviert um Testaccounts und Testdaten zu laden. Änderung erfordern einen Server Neustart.",
-  "admin.service.testingTitle": "Enable Testing Commands: ",
-  "admin.service.webSessionDays": "Session length for email and LDAP authentication (days):",
-  "admin.service.webSessionDaysDesc": "Die SSO Sitzung wird nach der angegebenen Anzahl an Tagen ablaufen und fordert den Nutzer zum erneuten anmelden auf.",
+  "admin.service.ssoSessionDays": "Sessiondauer für GitLab SSO Authentifizierung (Tage):",
+  "admin.service.ssoSessionDaysDesc": "Die GitLab SSO Sitzung wird nach der angegebenen Anzahl an Tagen ablaufen und fordert den Nutzer zum erneuten anmelden auf.",
+  "admin.service.testingDescription": "Wenn wahr wird der /loadtest Slash Befehl aktiviert um Testaccounts, -daten und -Textformatierungen zu laden. Änderung erfordern einen Server Neustart.",
+  "admin.service.testingTitle": "Aktiviere Testkommandos: ",
+  "admin.service.webSessionDays": "Sessiondauer für E-Mail und LDAP Authentifizierung (Tage):",
+  "admin.service.webSessionDaysDesc": "Die E-Mail oder LDAP Sitzung wird nach der angegebenen Anzahl an Tagen ablaufen und fordert den Nutzer zum erneuten anmelden auf.",
   "admin.service.webhooksDescription": "Wenn wahr werden eingehende Webhooks erlaubt. Um Phishing Attacken abzuwehren werden allen Nachrichten von Webhooks mit dem BOT Tag markiert.",
   "admin.service.webhooksTitle": "Aktiviere eingehende Webhooks: ",
   "admin.sidebar.addTeamSidebar": "Team aus dem Seitenmenü hinzufügen",
@@ -571,6 +592,7 @@
   "admin.sidebar.logs": "Protokolle",
   "admin.sidebar.notifications": "Benachrichtigungen",
   "admin.sidebar.other": "ANDERE",
+  "admin.sidebar.password": "Passwort",
   "admin.sidebar.policy": "Richtlinie",
   "admin.sidebar.privacy": "Privatsphäre",
   "admin.sidebar.publicLinks": "Öffentliche Links",
@@ -584,7 +606,7 @@
   "admin.sidebar.settings": "EINSTELLUNGEN",
   "admin.sidebar.signUp": "Registrieren",
   "admin.sidebar.sign_up": "Registrieren",
-  "admin.sidebar.statistics": "Team Statistics",
+  "admin.sidebar.statistics": "Teamstatistiken",
   "admin.sidebar.storage": "Speicher",
   "admin.sidebar.support": "Rechtsabteilung und Support",
   "admin.sidebar.teams": "TEAMS ({count, number})",
@@ -647,7 +669,7 @@
   "admin.team.restrictExample": "z.B.: \"corp.mattermost.com, mattermost.org\"",
   "admin.team.restrictNameDesc": "Wenn aktiviert ist es nicht möglich Teams zu erstellen deren Namen reservierte Wörter wie www, admin, support, test, channel, etc. beinhalten",
   "admin.team.restrictNameTitle": "Beschränke Teamnamen: ",
-  "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
+  "admin.team.restrictTitle": "Begrenze Accounterstellung auf spezifizierte E-Mail Domains:",
   "admin.team.restrict_direct_message_any": "Jeder Nutzer auf dem Mattermost Server",
   "admin.team.restrict_direct_message_team": "Jedes Mitglied des Teams",
   "admin.team.siteNameDescription": "Name des Dienstes, der auf der Anmeldeseite und der Seiten angezeigt wird.",
@@ -660,7 +682,7 @@
   "admin.team.uploaded": "Hochgeladen!",
   "admin.team.uploading": "Lade hoch..",
   "admin.team.userCreationDescription": "Wenn falsch wird die Möglichkeit Accounts zu erstellen deaktiviert. Der Account erstellen Button zeigt dann einen Fehler wenn er gedrückt wird.",
-  "admin.team.userCreationTitle": "Enable Account Creation: ",
+  "admin.team.userCreationTitle": "Aktiviere Accounterstellung: ",
   "admin.team_analytics.activeUsers": "Aktive Nutzer mit Beiträgen",
   "admin.team_analytics.totalPosts": "Summe aller Beiträge",
   "admin.true": "wahr",
@@ -687,6 +709,14 @@
   "admin.user_item.switchToEmail": "Umschalten zu E-Mail-Adresse/Passwort",
   "admin.user_item.sysAdmin": "Systemadministrator",
   "admin.user_item.teamAdmin": "Team Administrator",
+  "admin.webserverModeDisabled": "Deaktiviert",
+  "admin.webserverModeDisabledDescription": "Der Mattermost Server wird keine statischen Dateien bereitstellen.",
+  "admin.webserverModeGzip": "gzip",
+  "admin.webserverModeGzipDescription": "Der Mattermostserver wird statische Dateien gzip komprimiert bereitstellen.",
+  "admin.webserverModeHelpText": "Gzip Komprimierung bezieht sich auf statische Dateien. Es wird empfohlen gzip zu aktivieren um die Performance zu verbessern, es sei denn Ihre Umgebung hat bestimmte Einschränkungen, wie ein Web Proxy welcher mit gzip Dateien schlecht umgehen kann. Diese Einstellung erfordert einen Serverneustart um wirksam zu werden.",
+  "admin.webserverModeTitle": "Webserver Modus:",
+  "admin.webserverModeUncompressed": "Unkomprimiert",
+  "admin.webserverModeUncompressedDescription": "Der Mattermostserver wird statische Dateien unkomprimiert bereitstellen.",
   "analytics.chart.loading": "Lade...",
   "analytics.chart.meaningful": "Nicht genügend Daten für eine aussagekräftige Darstellung.",
   "analytics.system.activeUsers": "Aktive Nutzer mit Beiträgen",
@@ -899,7 +929,7 @@
   "claim.ldap_to_email.title": "LDAP Zugang auf E-Mail-Adresse/Passwort umstellen",
   "claim.oauth_to_email.confirm": "Passwort bestätigen",
   "claim.oauth_to_email.description": "Sobald Sie Ihren Accounttyp wechseln, können Sie sich nur noch mit Ihrer E-Mail-Adresse und Ihrem Passwort anmelden.",
-  "claim.oauth_to_email.enterNewPwd": "Geben Sie das Passwort für den {site} E-Mail-Account ein",
+  "claim.oauth_to_email.enterNewPwd": "Geben Sie ein neues Passwort für Ihren {site} E-Mail-Account ein",
   "claim.oauth_to_email.enterPwd": "Bitte geben Sie Ihr Passwort ein.",
   "claim.oauth_to_email.newPwd": "Neues Passwort",
   "claim.oauth_to_email.pwdNotMatch": "Die Passwörter stimmen nicht überein.",
@@ -934,9 +964,9 @@
   "create_team.team_url.teamUrl": "Team URL",
   "create_team.team_url.unavailable": "Diese URL ist nicht verfügbar. Bitte eine andere versuchen.",
   "create_team.team_url.webAddress": "Wählen Sie die Webadresse für Ihr neues Team:",
-  "custom_emoji.empty": "No custom emoji found",
-  "custom_emoji.header": "Benutzerdefinierte Emoji",
-  "custom_emoji.search": "Search Custom Emoji",
+  "custom_emoji.empty": "Kein eigenes Emoji gefunden",
+  "custom_emoji.header": "Eigenes Emoji",
+  "custom_emoji.search": "Suche eigenes Emoji",
   "delete_channel.cancel": "Abbrechen",
   "delete_channel.channel": "Kanal",
   "delete_channel.confirm": "Bestätige LÖSCHUNG des Kanals",
@@ -980,15 +1010,16 @@
   "email_verify.verified": "{siteName} E-Mail-Adresse verifiziert",
   "email_verify.verifiedBody": "<p>Ihre E-Mail-Adresse wurde bestätigt! Klicken Sie <a href={url}>hier</a> um sich anzumelden.</p>",
   "email_verify.verifyFailed": "Fehler beim Bestätigen Ihrer E-Mail-Adresse.",
-  "emoji_list.actions": "Aktion",
-  "emoji_list.add": "Benutzerdefinierte Emoji",
-  "emoji_list.creator": "Creator",
+  "emoji_list.actions": "Aktionen",
+  "emoji_list.add": "Eigenes Emoji hinzufügen",
+  "emoji_list.creator": "Ersteller",
   "emoji_list.delete": "Löschen",
-  "emoji_list.empty": "No Custom Emoji Found",
-  "emoji_list.image": "Bilder",
+  "emoji_list.empty": "Kein eigenes Emoji gefunden",
+  "emoji_list.help": "Custom emoji are available to everyone on your server and will appear in the emoji autocomplete menu. Other users may need to refresh the page before new emojis appear.",
+  "emoji_list.image": "Bild",
   "emoji_list.name": "Name",
-  "emoji_list.search": "Search Custom Emoji",
-  "emoji_list.somebody": "Somebody on another team",
+  "emoji_list.search": "Suche eigenes Emoji",
+  "emoji_list.somebody": "Jemand in einem anderen Team",
   "error.not_found.link_message": "Zurück zu Mattermost",
   "error.not_found.message": "Die Seite, die Sie versuchten zu erreichen, existiert nicht",
   "error.not_found.title": "Seite nicht gefunden",
@@ -1001,8 +1032,8 @@
   "file_attachment.download": "Download",
   "file_info_preview.size": "Größe ",
   "file_info_preview.type": "Dateityp ",
-  "file_upload.fileAbove": "Datei ist über {max}MB und konnte nicht hochgeladen werden: {filename}",
-  "file_upload.filesAbove": "Die Dateien sind über {max}MB und konnte nicht hochgeladen werden: {filenames}",
+  "file_upload.fileAbove": "Datei über {max}MB kann nicht hochgeladen werden: {filename}",
+  "file_upload.filesAbove": "Dateien über {max}MB können nicht hochgeladen werden: {filenames}",
   "file_upload.limited": "Anzahl an Uploads begrenzt auf maximal {count}. Bitte nutzen Sie zusätzliche Nachrichten für mehr Dateien.",
   "file_upload.pasted": "Bild eingefügt am ",
   "filtered_user_list.any_team": "Alle Benutzer",
@@ -1048,12 +1079,16 @@
   "installed_commands.add": "Slash Befehl hinzufügen",
   "installed_commands.empty": "Keine Befehle gefunden",
   "installed_commands.header": "Slash Befehle",
-  "installed_commands.search": "Search Slash Commands",
+  "installed_commands.help": "Erstelle Slash Befehle zur Verwendung in externen Integrationen. Bitte {link} für mehr Informationen ansehen.",
+  "installed_commands.helpLink": "Dokumentation",
+  "installed_commands.search": "Suche nach Slash Befehlen",
   "installed_commands.unnamed_command": "Unbenannter Slash Befehl",
   "installed_incoming_webhooks.add": "Eingehenden Webhook hinzufügen",
   "installed_incoming_webhooks.empty": "Keine eingehende Webhooks gefunden",
   "installed_incoming_webhooks.header": "Eingehende Webhooks",
-  "installed_incoming_webhooks.search": "Search Incoming Webhooks",
+  "installed_incoming_webhooks.help": "Erstelle eingehende Webhook URLs zur Verwendung in externen Integrationen. Bitte {link} für mehr Informationen ansehen.",
+  "installed_incoming_webhooks.helpLink": "Dokumentation",
+  "installed_incoming_webhooks.search": "Suche nach eingehenden Webhooks",
   "installed_incoming_webhooks.unknown_channel": "Ein privater Webhook",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
   "installed_integrations.content_type": "Content-Type: {contentType}",
@@ -1066,7 +1101,9 @@
   "installed_outgoing_webhooks.add": "Ausgehenden Webhook hinzufügen",
   "installed_outgoing_webhooks.empty": "Keine ausgehenden Webhooks gefunden",
   "installed_outgoing_webhooks.header": "Ausgehende Webhooks",
-  "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
+  "installed_outgoing_webhooks.help": "Erstelle ausgehende Webhook URLs zur Verwendung in externen Integrationen. Bitte {link} für mehr Informationen ansehen.",
+  "installed_outgoing_webhooks.helpLink": "Dokumentation",
+  "installed_outgoing_webhooks.search": "Suche ausgehende Webhooks",
   "installed_outgoing_webhooks.unknown_channel": "Ein privater Webhook",
   "integrations.command.description": "Slash Befehle senden Events an externe Integrationen",
   "integrations.command.title": "Slash Befehle",
@@ -1181,10 +1218,11 @@
   "navbar_dropdown.accountSettings": "Kontoeinstellungen",
   "navbar_dropdown.console": "System Konsole",
   "navbar_dropdown.create": "Neues Team erstellen",
-  "navbar_dropdown.emoji": "Benutzerdefinierte Emoji",
+  "navbar_dropdown.emoji": "Eigenes Emoji",
   "navbar_dropdown.help": "Hilfe",
   "navbar_dropdown.integrations": "Integration",
   "navbar_dropdown.inviteMember": "Neues Mitglied einladen",
+  "navbar_dropdown.leave": "Team verlassen",
   "navbar_dropdown.logout": "Abmelden",
   "navbar_dropdown.manageMembers": "Mitglieder verwalten",
   "navbar_dropdown.report": "Fehler melden",
@@ -1320,19 +1358,20 @@
   "sidebar_right_menu.switch_team": "Teamauswahl",
   "sidebar_right_menu.teamLink": "Team Einladungslink erhalten",
   "sidebar_right_menu.teamSettings": "Team Einstellungen",
-  "signup_team.choose": "Teams, bei denen Sie Mitglied sind: ",
+  "signup_team.choose": "Ihre Teams: ",
   "signup_team.createTeam": "Oder erstellen Sie ein Team",
   "signup_team.disabled": "Teamerstellung wurde deaktiviert.  Bitte kontaktieren Sie einen Administrator.",
-  "signup_team.join_open": "Offene Teams denen Sie beitreten können: ",
+  "signup_team.join_open": "Teams denen Sie beitreten können: ",
   "signup_team.noTeams": "Es sind keine Teams im Teamverzeichnis gelistet und die Teamerstellung wurde deaktiviert.",
-  "signup_team.no_open_teams": "No open teams have been created. Please ask your administrator for an invite.",
-  "signup_team.no_open_teams_canCreate": "No open teams have been created. Please ask your administrator for an invite or create a new team.",
-  "signup_team.no_teams": "No teams have been created. Please contact your administrator.",
-  "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".",
+  "signup_team.no_open_teams": "Keine Teams zu Beitreten verfügbar. Bitte fragen Sie Ihren Administrator um eine Einladung.",
+  "signup_team.no_open_teams_canCreate": "Keine Teams zu Beitreten verfügbar. Bitte erstellen Sie ein neues Team oder fragen Sie Ihren Administrator um eine Einladung.",
+  "signup_team.no_teams": "Es wurden keine Teams erstellt. Bitte wenden Sie sich an Ihren Administrator.",
+  "signup_team.no_teams_canCreate": "Es wurden keine Teams erstellt. Sie können eines durch \"Erstelle neues Team\" erstellen.",
   "signup_team.none": "Keine Teamerstellungsmethode wurde aktiviert.  Bitte kontaktieren Sie einen Administrator.",
   "signup_team_complete.completed": "Du hast dich bereits angemeldet oder die Einladung ist abgelaufen.",
   "signup_team_confirm.checkEmail": "Bitte prüfen Sie Ihre E-Mail-Adresse: <strong>{email}</strong><br /> Die E-Mail enthält einen Link zur Erstellung Ihres Teams",
   "signup_team_confirm.title": "Anmeldung abgeschlossen",
+  "signup_team_system_console": "Zur Systemkonsole gehen",
   "signup_user_completed.choosePwd": "Wählen Sie Ihr Passwort",
   "signup_user_completed.chooseUser": "Wählen Sie einen Benutzernamen",
   "signup_user_completed.create": "Konto erstellen",
@@ -1388,6 +1427,7 @@
   "team_members_dropdown.confirmDemotion": "Bestätigung des Entziehens",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "Inaktiv",
+  "team_members_dropdown.leave_team": "Aus dem Team entfernen",
   "team_members_dropdown.makeActive": "Aktivieren",
   "team_members_dropdown.makeAdmin": "Zum Teamadministrator machen",
   "team_members_dropdown.makeInactive": "Inaktiv setzen",
@@ -1423,7 +1463,7 @@
   "tutorial_tip.out": "Diese Tipps deaktivieren.",
   "tutorial_tip.seen": "Wurde bereits angezeigt? ",
   "upload_overlay.info": "Datei zum Hochladen hier ablegen.",
-  "user.settings.advance.embed_preview": "Show experimental previews of link content, when available",
+  "user.settings.advance.embed_preview": "Zeige experimentelle Vorschauen von Linkinhalten, sofern verfügbar",
   "user.settings.advance.embed_toggle": "Zeige Umschalter für alle eingebetteten Vorschauen",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} aktiviert",
   "user.settings.advance.formattingDesc": "Wenn aktiviert werden Nachrichten formatiert, sodass Links erstellt, Emojis angezeigt, Text formatiert und Zeilenumbrüche hinzugefügt werden. Standardmäßig ist dies aktiviert. Ändern der Einstellung erfordert ein Neuladen der Seite.",
@@ -1469,8 +1509,8 @@
   "user.settings.display.channelDisplayTitle": "Kanalanzeige-Modus",
   "user.settings.display.channeldisplaymode": "Wählen Sie die Breite den mittleren Kanals.",
   "user.settings.display.clockDisplay": "Uhrzeit Format",
-  "user.settings.display.collapseDesc": "Expand links to show a preview of content, when available.",
-  "user.settings.display.collapseDisplay": "Link previews",
+  "user.settings.display.collapseDesc": "Erweitere Links um eine Vorschau des Inhaltes zu sehen, sofern verfügbar.",
+  "user.settings.display.collapseDisplay": "Link Vorschau",
   "user.settings.display.collapseOff": "Aus",
   "user.settings.display.collapseOn": "Ein",
   "user.settings.display.fixedWidthCentered": "Feste Breite, zentriert",
@@ -1479,9 +1519,9 @@
   "user.settings.display.fullScreen": "Ganze Breite",
   "user.settings.display.language": "Sprache",
   "user.settings.display.messageDisplayClean": "Standard",
-  "user.settings.display.messageDisplayCleanDes": "Easy to scan and read.",
+  "user.settings.display.messageDisplayCleanDes": "Einfach zu überblicken und lesen.",
   "user.settings.display.messageDisplayCompact": "Kompakt",
-  "user.settings.display.messageDisplayCompactDes": "Fit as many messages on the screen as we can.",
+  "user.settings.display.messageDisplayCompactDes": "So viele Mitteilungen auf dem Bildschirm wie möglich.",
   "user.settings.display.messageDisplayDescription": "Wählen Sie wie Nachrichten in einem Kanal angezeigt werden sollen.",
   "user.settings.display.messageDisplayTitle": "Nachrichtenanzeige",
   "user.settings.display.militaryClock": "24 Stunden Format (z.B.: 16:00)",
@@ -1511,7 +1551,7 @@
   "user.settings.general.emailHelp4": "Es wurde eine E-Mail zur Bestätigung an {email} gesendet.",
   "user.settings.general.emailLdapCantUpdate": "Anmeldung erfolgt durch LDAP. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
   "user.settings.general.emailMatch": "Die von Ihnen eingegebenen E-Mail-Adressen stimmen nicht überein.",
-  "user.settings.general.emailSamlCantUpdate": "Anmeldung erfolgt durch LDAP. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
+  "user.settings.general.emailSamlCantUpdate": "Anmeldung erfolgt durch SAML. E-Mail-Adresse kann nicht aktualisiert werden. Die E-Mail-Adresse zum Versand von Hinweisen lautet {email}.",
   "user.settings.general.emailUnchanged": "Ihre neue E-Mail-Adresse entspricht Ihrer alten E-Mail-Adresse.",
   "user.settings.general.emptyName": "Auf 'Bearbeiten' klicken um den vollen Namen hinzuzufügen",
   "user.settings.general.emptyNickname": "Auf 'Bearbeiten' klicken um den Spitznamen hinzuzufügen",
@@ -1523,7 +1563,7 @@
   "user.settings.general.lastName": "Nachname",
   "user.settings.general.loginGitlab": "Anmeldung erfolgt durch GitLab ({email})",
   "user.settings.general.loginLdap": "Anmeldung erfolgt durch LDAP ({email})",
-  "user.settings.general.loginSaml": "Anmeldung erfolgt durch LDAP ({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.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.",
@@ -1606,17 +1646,33 @@
   "user.settings.security.newPassword": "Neues Passwort",
   "user.settings.security.oneSignin": "Sie können immer nur eine Anmeldemethode haben. Der Wechsel der Anmeldemethode löst eine E-Mail mit dem Umstellungserfolg aus.",
   "user.settings.security.password": "Passwort",
+  "user.settings.security.passwordError": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen.",
+  "user.settings.security.passwordErrorLowercase": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben enthalten.",
+  "user.settings.security.passwordErrorLowercaseNumber": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben und eine Ziffer enthalten.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
+  "user.settings.security.passwordErrorLowercaseSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
+  "user.settings.security.passwordErrorLowercaseUppercase": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben und einen Großbuchstaben enthalten.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben, einen Großbuchstaben und eine Ziffer enthalten.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben, einen Großbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Kleinbuchstaben , einen Großbuchstaben und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
+  "user.settings.security.passwordErrorNumber": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens eine Ziffer enthalten.",
+  "user.settings.security.passwordErrorNumberSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
+  "user.settings.security.passwordErrorSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
+  "user.settings.security.passwordErrorUppercase": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben enthalten.",
+  "user.settings.security.passwordErrorUppercaseNumber": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben und eine Ziffer enthalten.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
+  "user.settings.security.passwordErrorUppercaseSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
   "user.settings.security.passwordGitlabCantUpdate": "Einloggen findet über GitLab statt. Die Adresse kann nicht aktualisiert werden.",
   "user.settings.security.passwordLdapCantUpdate": "Einloggen findet über LDAP statt. Die Adresse kann nicht aktualisiert werden.",
-  "user.settings.security.passwordLengthError": "Das neue Passwort muss mindestens {chars} Zeichen lang sein",
   "user.settings.security.passwordMatchError": "Die eingegebenen neuen Passwörter stimmen nicht überein",
+  "user.settings.security.passwordMinLength": "Ungültige minimale Länge, kann keine Vorschau anzeigen.",
   "user.settings.security.retypePassword": "Passwort erneut eingeben",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Wechsel auf E-Mail-Adresse und Passwort",
   "user.settings.security.switchGitlab": "Wechsel auf GitLab SSO",
   "user.settings.security.switchGoogle": "Wechsel auf Google SSO",
   "user.settings.security.switchLdap": "Wechsel auf LDAP",
-  "user.settings.security.switchSaml": "Wechsel auf GitLab SSO",
+  "user.settings.security.switchSaml": "Wechsel auf SAML SSO",
   "user.settings.security.title": "Sicherheitseinstellungen",
   "user.settings.security.viewHistory": "Zeige Zugriffshistorie",
   "user_list.notFound": "Keine Benutzer gefunden",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 7330d441b..d84aeb68b 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -233,15 +233,15 @@
   "admin.general.localization.serverLocaleTitle": "Default Server Language:",
   "admin.general.log": "Logging",
   "admin.general.policy": "Policy",
-  "admin.general.policy.permissionsAll": "All team members",
   "admin.general.policy.permissionsAdmin": "Team and System Admins",
+  "admin.general.policy.permissionsAll": "All team members",
   "admin.general.policy.permissionsSystemAdmin": "System Admins",
-  "admin.general.policy.teamInviteTitle": "Enable sending team invites from:",
-  "admin.general.policy.teamInviteDescription": "Selecting \"All team members\" allows any team member to invite others using an email invitation or team invite link.<br/><br/>Selecting \"Team and System Admins\" hides the email invitation and team invite link in the Main Menu from users who are not Team or System Admins. Note: If \"Get Team Invite Link\" is used to share a link, it will need to be regenerated after the desired users joined the team.<br/><br/>Selecting \"System Admins\" hides the email invitation and team invite link in the Main Menu from users who are not System Admins. Note: If \"Get Team Invite Link\" is used to share a link, it will need to be regenerated after the desired users joined the team.",
-  "admin.general.policy.restrictPublicChannelManagementTitle": "Enable public channel management permissions for:",
-  "admin.general.policy.restrictPublicChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for public channels.<br/><br/>Selecting \"Team and System Admins\" restricts channel management permissions for public channels to Team and System Admins, including creating, deleting, renaming, and setting the channel header or purpose.<br/><br/>Selecting \"System Admins\" restricts channel management permissions for public channels to System Admins, including creating, deleting, renaming, and setting the channel header or purpose.",
-  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group management permissions for:",
   "admin.general.policy.restrictPrivateChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for private groups.<br/><br/>Selecting \"Team and System Admins\" restricts group management permissions for private groups to Team and System Admins, including creating, deleting, renaming, and setting the group header or purpose.<br/><br/>Selecting \"System Admins\" restricts group management permissions for private groups to System Admins, including creating, deleting, renaming, and setting the group header or purpose.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group management permissions for:",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for public channels.<br/><br/>Selecting \"Team and System Admins\" restricts channel management permissions for public channels to Team and System Admins, including creating, deleting, renaming, and setting the channel header or purpose.<br/><br/>Selecting \"System Admins\" restricts channel management permissions for public channels to System Admins, including creating, deleting, renaming, and setting the channel header or purpose.",
+  "admin.general.policy.restrictPublicChannelManagementTitle": "Enable public channel management permissions for:",
+  "admin.general.policy.teamInviteDescription": "Selecting \"All team members\" allows any team member to invite others using an email invitation or team invite link.<br/><br/>Selecting \"Team and System Admins\" hides the email invitation and team invite link in the Main Menu from users who are not Team or System Admins. Note: If \"Get Team Invite Link\" is used to share a link, it will need to be regenerated after the desired users joined the team.<br/><br/>Selecting \"System Admins\" hides the email invitation and team invite link in the Main Menu from users who are not System Admins. Note: If \"Get Team Invite Link\" is used to share a link, it will need to be regenerated after the desired users joined the team.",
+  "admin.general.policy.teamInviteTitle": "Enable sending team invites from:",
   "admin.general.privacy": "Privacy",
   "admin.general.usersAndTeams": "Users and Teams",
   "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.",
@@ -352,17 +352,17 @@
   "admin.ldap.serverTitle": "LDAP Server:",
   "admin.ldap.skipCertificateVerification": "Skip Certificate Verification",
   "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
+  "admin.ldap.syncFailure": "Sync Failure: {error}",
   "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour.",
   "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes)",
+  "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
+  "admin.ldap.sync_button": "LDAP Synchronize Now",
   "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
   "admin.ldap.userFilterDisc": "(Optional) Enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "User Filter:",
   "admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"",
   "admin.ldap.usernameAttrTitle": "Username Attribute:",
-  "admin.ldap.sync_button": "LDAP Synchronize Now",
-  "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
-  "admin.ldap.syncFailure": "Sync Failure: {error}",
   "admin.license.choose": "Choose File",
   "admin.license.chooseFile": "Choose File",
   "admin.license.edition": "Edition: ",
@@ -507,22 +507,17 @@
   "admin.save": "Save",
   "admin.saving": "Saving Config...",
   "admin.security.connection": "Connections",
+  "admin.security.inviteSalt.disabled": "Invite salt cannot be changed while sending emails is disabled.",
   "admin.security.login": "Login",
+  "admin.security.password": "Password",
+  "admin.security.passwordResetSalt.disabled": "Password reset salt cannot be changed while sending emails is disabled.",
   "admin.security.public_links": "Public Links",
+  "admin.security.requireEmailVerification.disabled": "Email verification cannot be changed while sending emails is disabled.",
   "admin.security.session": "Sessions",
   "admin.security.signup": "Signup",
   "admin.select_team.close": "Close",
   "admin.select_team.select": "Select",
   "admin.select_team.selectTeam": "Select Team",
-  "admin.security.password": "Password",
-  "admin.security.login": "Login",
-  "admin.security.connection": "Connections",
-  "admin.security.public_links": "Public Links",
-  "admin.security.session": "Sessions",
-  "admin.security.signup": "Signup",
-  "admin.security.requireEmailVerification.disabled": "Email verification cannot be changed while sending emails is disabled.",
-  "admin.security.passwordResetSalt.disabled": "Password reset salt cannot be changed while sending emails is disabled.",
-  "admin.security.inviteSalt.disabled": "Invite salt cannot be changed while sending emails is disabled.",
   "admin.service.attemptDescription": "Number of login attempts allowed before a user is locked out and required to reset their password via email.",
   "admin.service.attemptExample": "Ex \"10\"",
   "admin.service.attemptTitle": "Maximum Login Attempts:",
@@ -594,10 +589,10 @@
   "admin.sidebar.localization": "Localization",
   "admin.sidebar.logging": "Logging",
   "admin.sidebar.login": "Login",
-  "admin.sidebar.password": "Password",
   "admin.sidebar.logs": "Logs",
   "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.other": "OTHER",
+  "admin.sidebar.password": "Password",
   "admin.sidebar.policy": "Policy",
   "admin.sidebar.privacy": "Privacy",
   "admin.sidebar.publicLinks": "Public Links",
@@ -714,14 +709,14 @@
   "admin.user_item.switchToEmail": "Switch to Email/Password",
   "admin.user_item.sysAdmin": "System Admin",
   "admin.user_item.teamAdmin": "Team Admin",
-  "admin.webserverModeGzip": "gzip",
-  "admin.webserverModeGzipDescription": "The Mattermost server will serve static files compressed with gzip.",
-  "admin.webserverModeUncompressed": "Uncompressed",
-  "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
   "admin.webserverModeDisabled": "Disabled",
   "admin.webserverModeDisabledDescription": "The Mattermost server will not serve static files.",
+  "admin.webserverModeGzip": "gzip",
+  "admin.webserverModeGzipDescription": "The Mattermost server will serve static files compressed with gzip.",
   "admin.webserverModeHelpText": "gzip compression applies to static content files. It is recommended to enable gzip to improve performance unless your environment has specific restrictions, such as a web proxy that distributes gzip files poorly. This setting requires a server restart to take effect.",
   "admin.webserverModeTitle": "Webserver Mode:",
+  "admin.webserverModeUncompressed": "Uncompressed",
+  "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
   "analytics.chart.loading": "Loading...",
   "analytics.chart.meaningful": "Not enough data for a meaningful representation.",
   "analytics.system.activeUsers": "Active Users With Posts",
@@ -1223,11 +1218,11 @@
   "navbar_dropdown.accountSettings": "Account Settings",
   "navbar_dropdown.console": "System Console",
   "navbar_dropdown.create": "Create a New Team",
-  "navbar_dropdown.leave": "Leave Team",
   "navbar_dropdown.emoji": "Custom Emoji",
   "navbar_dropdown.help": "Help",
   "navbar_dropdown.integrations": "Integrations",
   "navbar_dropdown.inviteMember": "Invite New Member",
+  "navbar_dropdown.leave": "Leave Team",
   "navbar_dropdown.logout": "Logout",
   "navbar_dropdown.manageMembers": "Manage Members",
   "navbar_dropdown.report": "Report a Problem",
@@ -1368,10 +1363,10 @@
   "signup_team.disabled": "Team creation has been disabled.  Please contact an administrator for access.",
   "signup_team.join_open": "Teams you can join: ",
   "signup_team.noTeams": "There are no teams included in the Team Directory and team creation has been disabled.",
-  "signup_team.no_teams": "No teams have been created. Please contact your administrator.",
-  "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".",
   "signup_team.no_open_teams": "No teams are available to join. Please ask your administrator for an invite.",
   "signup_team.no_open_teams_canCreate": "No teams are available to join. Please create a new team or ask your administrator for an invite.",
+  "signup_team.no_teams": "No teams have been created. Please contact your administrator.",
+  "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".",
   "signup_team.none": "No team creation method has been enabled.  Please contact an administrator for access.",
   "signup_team_complete.completed": "You've already completed the signup process for this invitation or this invitation has expired.",
   "signup_team_confirm.checkEmail": "Please check your email: <strong>{email}</strong><br />Your email contains a link to set up your team",
@@ -1432,11 +1427,11 @@
   "team_members_dropdown.confirmDemotion": "Confirm Demotion",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "Inactive",
+  "team_members_dropdown.leave_team": "Remove From Team",
   "team_members_dropdown.makeActive": "Make Active",
   "team_members_dropdown.makeAdmin": "Make Team Admin",
   "team_members_dropdown.makeInactive": "Make Inactive",
   "team_members_dropdown.makeMember": "Make Member",
-  "team_members_dropdown.leave_team": "Remove From Team",
   "team_members_dropdown.member": "Member",
   "team_members_dropdown.systemAdmin": "System Admin",
   "team_members_dropdown.teamAdmin": "Team Admin",
@@ -1651,26 +1646,26 @@
   "user.settings.security.newPassword": "New Password",
   "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
   "user.settings.security.password": "Password",
-  "user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
-  "user.settings.security.passwordLdapCantUpdate": "Login occurs through LDAP. Password cannot be updated.",
   "user.settings.security.passwordError": "Your password must contain at least {min} characters.",
   "user.settings.security.passwordErrorLowercase": "Your password must contain at least {min} characters made up of at least one lowercase letter.",
   "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one number.",
-  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one uppercase letter.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordErrorLowercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one uppercase letter.",
   "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number.",
-  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorUppercase": "Your password must contain at least {min} characters made up of at least one uppercase letter.",
-  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one number.",
-  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordErrorNumber": "Your password must contain at least {min} characters made up of at least one number.",
   "user.settings.security.passwordErrorNumberSymbol": "Your password must contain at least {min} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordErrorSymbol": "Your password must contain at least {min} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\").",
-  "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
+  "user.settings.security.passwordErrorUppercase": "Your password must contain at least {min} characters made up of at least one uppercase letter.",
+  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one number.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
+  "user.settings.security.passwordLdapCantUpdate": "Login occurs through LDAP. Password cannot be updated.",
   "user.settings.security.passwordMatchError": "The new passwords you entered do not match",
+  "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
   "user.settings.security.retypePassword": "Retype New Password",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Switch to using email and password",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 77207671e..6b533b900 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -233,10 +233,14 @@
   "admin.general.localization.serverLocaleTitle": "Idioma predeterminado para el Servidor:",
   "admin.general.log": "Registro de actividad",
   "admin.general.policy": "Política",
-  "admin.general.policy.teamInviteAdmin": "Administradores de Equipo y Sistema",
-  "admin.general.policy.teamInviteAll": "Todos los miembros del equipo",
+  "admin.general.policy.permissionsAdmin": "Administradores de Equipo y Sistema",
+  "admin.general.policy.permissionsAll": "Todos los miembros del equipo",
+  "admin.general.policy.permissionsSystemAdmin": "Administradores de Sistema",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Seleccionando la opción \"Todos los miembros del equipo\" permite que cualquiera de los miembros del equipo pueda crear, eliminar, cambiar el nombre, y establecer el encabezado o el propósito de grupos privados.<br/><br/>Seleccionando la opción \"Administradores de Equipo Sistema\" restringe la gestión de los permisos para los grupos privados a los Administradores de Equipo Sistemas, incluyendo la creación, eliminación, cambio de nombre, y ajuste del encabezado o propósito del grupo privado.<br/><br/>Seleccionando la opción \"Administradores de Sistema\" restringe la gestión de los permisos para los grupos privados a los Administradores de Sistema, incluyendo la creación, eliminación, cambio de nombre, y ajuste del encabezado o propósito del grupo privado.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Habilitar la gestión de los grupos privados a:",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Seleccionando la opción \"Todos los miembros del equipo\" permite que cualquiera de los miembros del equipo pueda crear, eliminar, cambiar el nombre, y establecer el encabezado o el propósito de canales públicos.<br/><br/>Seleccionando la opción \"Administradores de Equipo Sistema\" restringe la gestión de los permisos para los canales públicos a los Administradores de Equipo Sistemas, incluyendo la creación, eliminación, cambio de nombre, y ajuste del encabezado o propósito del canal.<br/><br/>Seleccionando la opción \"Administradores de Sistema\" restringe la gestión de los permisos para los canales públicos a los Administradores de Sistema, incluyendo la creación, eliminación, cambio de nombre, y ajuste del encabezado o propósito canal.",
+  "admin.general.policy.restrictPublicChannelManagementTitle": "Habilitar la gestión de canales públicos a:",
   "admin.general.policy.teamInviteDescription": "Al seleccionar \"Todos los miembros del equipo\" se permite a cualquier miembro de un equipo invitar a otros utilizando la invitación por correo electrónico o con el enlace de invitación.<br/><br/>Al seleccionar \"Administradores de Equipo y Sistema\" se esconde del Menú Principal las opciones de invitación por correo electrónico y enlace de invitación a los usuarios que no son Administradores de Equipo o de Sistema. Nota: Si \"Obtener enlace de Invitación\" es utilizado para compartir el enlace, se necesitará regenerar luego de que los usuarios deseados se unan al equipo.<br/><br/>Al seccionar \"Adminstradores de Sistema\" se esconde del Menú Principal las opciones de invitación por correo electrónico y enlace de invitación a los usuarios que no son Administradores de Systema. ota: Si \"Obtener enlace de Invitación\" es utilizado para compartir el enlace, se necesitará regenerar luego de que los usuarios deseados se unan al equipo.",
-  "admin.general.policy.teamInviteSystemAdmin": "Administradores de Sistema",
   "admin.general.policy.teamInviteTitle": "Habilitar el envío de invitaciones a equipo por:",
   "admin.general.privacy": "Privacidad",
   "admin.general.usersAndTeams": "Usuarios y Equipos",
@@ -348,10 +352,13 @@
   "admin.ldap.serverTitle": "Servidor LDAP:",
   "admin.ldap.skipCertificateVerification": "Omitir la Verificación del Certificado",
   "admin.ldap.skipCertificateVerificationDesc": "Omite la verificación del certificado para las conexiones TLS o STARTTLS. No recomendado para ambientes de producción donde TLS es requerido. Utilizalo sólamente para pruebas.",
+  "admin.ldap.syncFailure": "Error de Sincronización: {error}",
   "admin.ldap.syncIntervalHelpText": "La Sincronización con LDAP es el proceso con el cual Mattermost actualiza sus usuarios para reflejar cualquier actualización de la data en el servidor LDAP. Por ejemplo si el nombre de un usuario es actualizado en el servidor LDAP, el cambio se verá reflejado en Mattermost cuando la sincronización sea ejecutada. Las cuentas que han sido removidas desde el servidor LDAP tendrán sus sesiones activas revocadas y no podrán iniciar sesión en Mattermost. Mattermost realizará esta sincronización regularmente de acuerdo al intervalo de tiempo que se suministre aquí. Por ejemplo, si se suministra el valor 60, Mattermost realizará la actualización de usuarios cada hora.",
   "admin.ldap.syncIntervalTitle": "Intervalo de Sincronización (minutos)",
+  "admin.ldap.syncNowHelpText": "Inicia una sincronización LDAP inmediatamente.",
+  "admin.ldap.sync_button": "LDAP Sincronizar Ahora",
   "admin.ldap.uernameAttrDesc": "El atributo en el servidor LDAP que se utilizará para poblar el nombre de usuario en Mattermost. Este puede ser igual al Attributo Id.",
-  "admin.ldap.userFilterDisc": "Filtro de LDAP para buscar los objetos de los usuarios.",
+  "admin.ldap.userFilterDisc": "(Opcional) Introduce un Filtro LDAP a utilizar para buscar los objetos de usuario. Sólo los usuarios seleccionados por la consulta será capaz de acceder a Mattermost. Para Active Directory, la consulta para filtrar a los usuarios con deshabilitados es (&(objectCategory=Persona)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ej. \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "Filtro de Usuario:",
   "admin.ldap.usernameAttrEx": "Ej \"sAMAccountName\"",
@@ -400,6 +407,16 @@
   "admin.notifications.email": "Correo electrónico",
   "admin.notifications.push": "Push a Móvil",
   "admin.notifications.title": "Configuracón de Notificaciones",
+  "admin.password.lowercase": "Al menos una letra minúscula",
+  "admin.password.minimumLength": "Longitud Mínima de la Contraseña:",
+  "admin.password.minimumLengthDescription": "Número mínimo de caracteres necesarios para una contraseña válida. Debe ser un número entero mayor que o igual a {min} y menos que o igual a {max}.",
+  "admin.password.minimumLengthExample": "Ej \"5\"",
+  "admin.password.number": "Al menos un número",
+  "admin.password.preview": "Vista previa del mensaje de error",
+  "admin.password.requirements": "Requisitos de la Contraseña:",
+  "admin.password.requirementsDescription": "Los tipos de caracteres que se requiere para una contraseña válida.",
+  "admin.password.symbol": "Al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")",
+  "admin.password.uppercase": "Al menos una letra en mayúscula",
   "admin.privacy.showEmailDescription": "Cuando es falso, oculta la dirección de correo para otros usuarios en la interfaz de usuario, incluyendo a los dueños y administradores del grupo. Usado cuando el sistema es configurado para administrar grupos y donde algunos usuarios escogen mantener su información de contacto como privada.",
   "admin.privacy.showEmailTitle": "Mostrar dirección de correo electrónico: ",
   "admin.privacy.showFullNameDescription": "Cuando está asignado en falso, esconde el nombre completo de los usuarios para otros usuarios, incluyendo dueños de equipos y administradores de equipos. El nombre de usuario es mostrado en vez del nombre completo.",
@@ -490,14 +507,18 @@
   "admin.save": "Guardar",
   "admin.saving": "Guardando...",
   "admin.security.connection": "Conexiones",
+  "admin.security.inviteSalt.disabled": "El salt para invitaciones no puede ser cambiado, mientras que el envío de correos electrónicos está deshabilitado.",
   "admin.security.login": "Inicio de Sesión",
+  "admin.security.password": "Contraseña",
+  "admin.security.passwordResetSalt.disabled": "El salt para restablecer contraseñas no puede ser cambiado, mientras que el envío de correos electrónicos está deshabilitado.",
   "admin.security.public_links": "Enlaces Públicos",
+  "admin.security.requireEmailVerification.disabled": "Verificación de correo electrónico no puede ser cambiado, mientras que el envío de correos electrónicos está deshabilitado.",
   "admin.security.session": "Sesiones",
   "admin.security.signup": "Registro",
   "admin.select_team.close": "Cerrar",
   "admin.select_team.select": "Seleccionar",
   "admin.select_team.selectTeam": "Seleccionar grupo",
-  "admin.service.attemptDescription": "Inicio de sesión permitidos antes que el usuario sea bloqueado y se requiera volver a configurar la contraseña vía correo electrónico.",
+  "admin.service.attemptDescription": "Número de intentos de inicio de sesión permitidos antes de que un usuario sea bloqueado y sea necesario restablecer su contraseña a través de correo electrónico.",
   "admin.service.attemptExample": "Ej \"10\"",
   "admin.service.attemptTitle": "Máximo de intentos de conexión:",
   "admin.service.cmdsDesc": "Cuando es verdadero, se permite la creación de comandos de barra por usuarios.",
@@ -571,6 +592,7 @@
   "admin.sidebar.logs": "Registros",
   "admin.sidebar.notifications": "Notificaciones",
   "admin.sidebar.other": "OTROS",
+  "admin.sidebar.password": "Contraseña",
   "admin.sidebar.policy": "Política",
   "admin.sidebar.privacy": "Privacidad",
   "admin.sidebar.publicLinks": "Enlaces Públicos",
@@ -687,6 +709,14 @@
   "admin.user_item.switchToEmail": "Cambiar a Correo Electrónico/Contraseña",
   "admin.user_item.sysAdmin": "Admin de Sistema",
   "admin.user_item.teamAdmin": "Admin de Equipo",
+  "admin.webserverModeDisabled": "Desactivado",
+  "admin.webserverModeDisabledDescription": "El servidor Mattermost no servirá archivos estáticos.",
+  "admin.webserverModeGzip": "gzip",
+  "admin.webserverModeGzipDescription": "El servidor Mattermost servirá los archivos estáticos comprimidos con gzip.",
+  "admin.webserverModeHelpText": "La compresión gzip se aplica a archivos de contenido estático. Se recomienda habilitar la compresión gzip para mejorar el rendimiento, a menos que su entorno tenga restricciones específicas, tales como un proxy de web que distribuye archivos gzip de forma deficiente. Esta configuración requiere reiniciar el servidor para que surtan efecto.",
+  "admin.webserverModeTitle": "Modo del Servidor Web:",
+  "admin.webserverModeUncompressed": "Sin comprimir",
+  "admin.webserverModeUncompressedDescription": "El servidor Mattermost servirá los archivos estáticos sin comprimir.",
   "analytics.chart.loading": "Cargando...",
   "analytics.chart.meaningful": "No hay suficiente data para tener una representación significativa.",
   "analytics.system.activeUsers": "Usuarios Activos con Mensajes",
@@ -985,6 +1015,7 @@
   "emoji_list.creator": "Creado por",
   "emoji_list.delete": "Eliminar",
   "emoji_list.empty": "No se encontraron Emoji Personalizados",
+  "emoji_list.help": "Los Emoji personalizado están disponibles para todos los usuarios del servidor y aparecerán en el menú de autocompletado. Otros usuarios puede que necesiten refrescar la página antes de que los nuevos emojis aparezcan.",
   "emoji_list.image": "Imagen",
   "emoji_list.name": "Nombre",
   "emoji_list.search": "Buscar Emoji Personalizado",
@@ -1048,11 +1079,15 @@
   "installed_commands.add": "Agregar Comandos de Barra",
   "installed_commands.empty": "No se encontraron comandos",
   "installed_commands.header": "Comandos de Barra",
+  "installed_commands.help": "Crea comandos de barra para su uso en integraciones externas. Por favor, consulta la {link} para obtener más información.",
+  "installed_commands.helpLink": "documentación",
   "installed_commands.search": "Buscar Comandos de Barra",
   "installed_commands.unnamed_command": "Comando de Barra sin nombre",
   "installed_incoming_webhooks.add": "Agregar Webhook de Entrada",
   "installed_incoming_webhooks.empty": "No se encontraron webhooks de entrada",
   "installed_incoming_webhooks.header": "Webhooks de Entrada",
+  "installed_incoming_webhooks.help": "Crea webhooks de entrada para su uso en integraciones externas. Por favor, consulta la {link} para obtener más información.",
+  "installed_incoming_webhooks.helpLink": "documentación",
   "installed_incoming_webhooks.search": "Buscar Webhooks de Entrada",
   "installed_incoming_webhooks.unknown_channel": "Un Webhook Privado",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
@@ -1066,6 +1101,8 @@
   "installed_outgoing_webhooks.add": "Agregar Webhook de Salida",
   "installed_outgoing_webhooks.empty": "No se encontraron webhooks de salida",
   "installed_outgoing_webhooks.header": "Webhooks de Salida",
+  "installed_outgoing_webhooks.help": "Crea webhooks de salida para su uso en integraciones externas. Por favor, consulta la {link} para obtener más información.",
+  "installed_outgoing_webhooks.helpLink": "documentación",
   "installed_outgoing_webhooks.search": "Buscar Webhooks de Salida",
   "installed_outgoing_webhooks.unknown_channel": "Un Webhook Privado",
   "integrations.command.description": "Comandos de barra envían eventos a integraciones externar",
@@ -1185,6 +1222,7 @@
   "navbar_dropdown.help": "Ayuda",
   "navbar_dropdown.integrations": "Integraciones",
   "navbar_dropdown.inviteMember": "Invitar Nuevo Miembro",
+  "navbar_dropdown.leave": "Abandonar Equipo",
   "navbar_dropdown.logout": "Cerrar sesión",
   "navbar_dropdown.manageMembers": "Administrar Miembros",
   "navbar_dropdown.report": "Reportar un Problema",
@@ -1320,19 +1358,20 @@
   "sidebar_right_menu.switch_team": "Seleccionar Equipo",
   "sidebar_right_menu.teamLink": "Enlace Invitación al Equipo",
   "sidebar_right_menu.teamSettings": "Configurar Equipo",
-  "signup_team.choose": "Equipos a los que perteneces: ",
+  "signup_team.choose": "Tus equipos: ",
   "signup_team.createTeam": "O Crea un Equipo",
   "signup_team.disabled": "La creación de Equipos ha sido deshabilitada.",
-  "signup_team.join_open": "Equipos abiertos a los que te puedes unir: ",
+  "signup_team.join_open": "Equipos a los que te puedes unir: ",
   "signup_team.noTeams": "No hay equipos en el Directorio de Equipos y la creación de equipos ha sido deshabilitada.",
-  "signup_team.no_open_teams": "No se han creado equipos abiertos. Por favor solicita una invitación a tu administrador.",
-  "signup_team.no_open_teams_canCreate": "No se han creado equipos abiertos. Por favor solicita a tu administrador que te envíe una invitación o que cree un nuevo equipo.",
+  "signup_team.no_open_teams": "No hay equipos están disponibles para unirse. Por favor, solicita una invitación a tu administrador.",
+  "signup_team.no_open_teams_canCreate": "No hay equipos están disponibles para unirse. Por favor, crear un nuevo equipo, o solicita una invitación a tu administrador.",
   "signup_team.no_teams": "No se han creado equipos. Por favor contacta a tu administrador.",
   "signup_team.no_teams_canCreate": "No se han creado equipos. Puedes crear uno al pinchar \"Crear nuevo equipo\".",
   "signup_team.none": "No se ha habilitado ningún método para creación de equipos.  Por favor contacta a un administrador de sistema para solicitar acceso.",
   "signup_team_complete.completed": "Ya haz completado el proceso de entrada para esta invitación, o esta invitación ya ha expirado.",
   "signup_team_confirm.checkEmail": "Por favor revisa tu correo electrónico: <strong>{email}</strong><br />Se ha enviado un correo con un enlace para configurar tu equipo",
   "signup_team_confirm.title": "Registro Completado",
+  "signup_team_system_console": "Ir a la Consola del Sistema",
   "signup_user_completed.choosePwd": "Escoge tu contraseña",
   "signup_user_completed.chooseUser": "Escoge tu nombre de usuario",
   "signup_user_completed.create": "Crea una Cuenta",
@@ -1388,6 +1427,7 @@
   "team_members_dropdown.confirmDemotion": "Confirmar decenso",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"tuequipo\" -email=\"nombre@tuempresa.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "Inactivo",
+  "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",
@@ -1606,10 +1646,26 @@
   "user.settings.security.newPassword": "Nueva Contraseña",
   "user.settings.security.oneSignin": "Sólo puedes tener un método de inicio de sesión a la vez. El cambio del método de inicio de sesión te enviará un correo notificandote que el cambio se realizó con éxito.",
   "user.settings.security.password": "Contraseña",
+  "user.settings.security.passwordError": "La contraseña debe contener al menos {min} caracteres.",
+  "user.settings.security.passwordErrorLowercase": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula.",
+  "user.settings.security.passwordErrorLowercaseNumber": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula y al menos un número.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula, al menos un número, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercase": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula, y al menos una letra en mayúscula.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula, al menos una letra mayúscula y al menos un número.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula, al menos una letra mayúscula, al menos un número, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra minúscula, al menos una letra mayúscula y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorNumber": "La contraseña debe contener al menos {min} caracteres compuesta de al menos un número.",
+  "user.settings.security.passwordErrorNumberSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos un número y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercase": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra mayúscula.",
+  "user.settings.security.passwordErrorUppercaseNumber": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra mayúscula y al menos un número.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra mayúscula, al menos un número, y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercaseSymbol": "La contraseña debe contener al menos {min} caracteres compuesta de al menos una letra mayúscula y al menos un símbolo (por ejemplo,\"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "El inicio de sesión ocurre a través GitLab. La contraseña no se puede actualizar.",
   "user.settings.security.passwordLdapCantUpdate": "El inicio de sesión ocurre a través LDAP. La contraseña no se puede actualizar.",
-  "user.settings.security.passwordLengthError": "La nueva contraseña debe contener al menos {chars} carácteres",
   "user.settings.security.passwordMatchError": "La nueva contraseña que ingresaste no coincide",
+  "user.settings.security.passwordMinLength": "Longitud mínima no válida, no se puede mostrar la vista previa.",
   "user.settings.security.retypePassword": "Reescribe la Nueva Contraseña",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Cambiar para utilizar correo electrónico y contraseña",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 28239f32b..8f259325a 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -66,17 +66,17 @@
   "add_command.username.placeholder": "Nom d'utilisateur",
   "add_emoji.cancel": "Annuler",
   "add_emoji.header": "Ajouter",
-  "add_emoji.image": "Images",
+  "add_emoji.image": "Image",
   "add_emoji.image.button": "Sélectionner",
-  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 64 KB and dimensions up to 128 by 128 pixels.",
-  "add_emoji.imageRequired": "An image is required for the emoji",
+  "add_emoji.image.help": "Choisissez une image pour votre emoji. L'image peut être au format gif, png ou jpeg, doit faire moins de 64Ko et au maximum 128x128 pixels.",
+  "add_emoji.imageRequired": "Une image est requise pour l'emoji",
   "add_emoji.name": "Nom",
-  "add_emoji.name.help": "Choose a name for your emoji made of up to 64 characters consisting of lowercase letters, numbers, and the symbols '-' and '_'.",
-  "add_emoji.nameInvalid": "An emoji's name can only contain numbers, letters, and the symbols '-' and '_'.",
-  "add_emoji.nameRequired": "A name is required for the emoji",
-  "add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
+  "add_emoji.name.help": "Choisissez un nom pour votre emoji de 64 caractères au maximum, constitué de lettres minuscules, nombres et '-' ou '_'.",
+  "add_emoji.nameInvalid": "Un nom d'emoji ne peut contenir des lettres minuscules, nombres et les caractères '-' ou '_'.",
+  "add_emoji.nameRequired": "Saisissez un nom pour l'emoji",
+  "add_emoji.nameTaken": "Ce nom est déjà utilisé pour un emoji système. Choisissez un autre nom.",
   "add_emoji.preview": "Aperçu",
-  "add_emoji.preview.sentence": "This is a sentence with {image} in it.",
+  "add_emoji.preview.sentence": "Ceci est une phrase avec {image}.",
   "add_emoji.save": "Enregistrer",
   "add_incoming_webhook.cancel": "Annuler",
   "add_incoming_webhook.channel": "Canal",
@@ -106,11 +106,11 @@
   "admin.banner.heading": "Remarque :",
   "admin.compliance.directoryDescription": "Répertoire des rapports de conformité. Si non spécifié :  ./data/ .",
   "admin.compliance.directoryExample": "Ex : \"./data/\"",
-  "admin.compliance.directoryTitle": "Compliance Report Directory:",
+  "admin.compliance.directoryTitle": "Répertoire du rapport de conformité :",
   "admin.compliance.enableDailyDesc": "Si activé, Mattermost générera un rapport quotidien de conformité",
   "admin.compliance.enableDailyTitle": "Activer le rapport quotidien :",
   "admin.compliance.enableDesc": "Si activé, Mattermost permet des rapports de conformité",
-  "admin.compliance.enableTitle": "Enable Compliance Reporting:",
+  "admin.compliance.enableTitle": "Activer le rapport de conformité :",
   "admin.compliance.false": "non",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note :</h4><p>La conformité est une option disponible sur l'édition d’Enterprise. Votre licence ne permet pas d'utiliser cette fonction. Cliquez sur <a href=\"http://mattermost.com\" target=\"_blank\">ici</a> pour des informations et des prix sur la licence d’Enterprise.</p>",
   "admin.compliance.save": "Enregistrer",
@@ -148,9 +148,9 @@
   "admin.connectionSecurityTlsDescription": "Chiffre la communication entre Mattermost et votre serveur.",
   "admin.customization.customBrand": "Image de marque personnalisée",
   "admin.customization.customEmoji": "Emoji personnalisés",
-  "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting \"Custom Emoji\".",
+  "admin.customization.enableCustomEmojiDesc": "Permet aux utilisateurs de créer leurs propres emoji. Si activé, \"Emoji Personnalisés\" est accessible en sélectionnant une équipe, en cliquant sur les trois points en haut de la barre latérale et en choisissant l'option du menu.",
   "admin.customization.enableCustomEmojiTitle": "Activer les Emoji personnalisés :",
-  "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji",
+  "admin.customization.restrictCustomEmojiCreationAdmin": "Permet aux administrateurs système et d'équipe de créer des emoji personnalisés",
   "admin.customization.restrictCustomEmojiCreationAll": "Permettre à tout le monde de créer des Emoji personnalisés",
   "admin.customization.restrictCustomEmojiCreationDesc": "N'autoriser la création d'Emoji personnalisés qu'à certains utilisateurs.",
   "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Seuls les administrateurs peuvent créer des Emoji personnalisés",
@@ -160,11 +160,11 @@
   "admin.developer.title": "Paramètres de développement",
   "admin.email.agreeHPNS": " J’ai compris et j’accepte le service de notifications Push hébergé par Mattermost <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> et <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.",
   "admin.email.allowEmailSignInDescription": "Si activé, les utilisateurs pourront se connecter avec leur adresse électronique et mot de passe.",
-  "admin.email.allowEmailSignInTitle": "Activer la connexion avec LDAP :",
+  "admin.email.allowEmailSignInTitle": "Activer la connexion avec adresse électronique : ",
   "admin.email.allowSignupDescription": "Si activé, la création d'équipes et de comptes en utilisant une adresse électronique et un mot de passe sera autorisée. Cette valeur devrait être fausse seulement si vous souhaitez limiter les connexions via un service SSO comme OAuth ou LDAP.",
-  "admin.email.allowSignupTitle": "Enable account creation with email: ",
+  "admin.email.allowSignupTitle": "Activer la création de compte avec adresse électronique : ",
   "admin.email.allowUsernameSignInDescription": "Si activé, les utilisateurs seront autorisés à se connecter avec leur nom d'utilisateur et leur mot de passe. Cette option n'est généralement utilisée que lorsque la vérification de l'adresse électronique est désactivée.",
-  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
+  "admin.email.allowUsernameSignInTitle": "Activer la connexion avec nom d'utilisateur : ",
   "admin.email.connectionSecurityTest": "Tester la connexion",
   "admin.email.easHelp": "En savoir plus sur la compilation et le déploiement de vos propres applications mobiles à partir de <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
   "admin.email.emailFail": "Echec de la connexion : {error}",
@@ -173,7 +173,7 @@
   "admin.email.genericPushNotification": "Envoyer une description générale avec les noms des utilisateurs et des canaux",
   "admin.email.inviteSaltDescription": "Clé de salage de 32 caractères ajouté aux courriels d'invitation. Générée aléatoirement lors de l'installation. Cliquez sur \"Regénérer\" pour créer une nouvelle clé de salage.",
   "admin.email.inviteSaltExample": "Exemple : \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.inviteSaltTitle": "Email Invite Salt:",
+  "admin.email.inviteSaltTitle": "Clé de salage des courriels d'invitation :",
   "admin.email.mhpns": "La connexion à iOS et aux applications Android est cryptée",
   "admin.email.mhpnsHelp": "Télécharger <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target=\"_blank\">L'application IOS Mattermost</a> depuis iTunes. Télécharger <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target=\"_blank\">L'application Android Mattermost</a> depuis Google Play. Apprenez en plus sur <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target=\"_blank\">HPNS</a>.",
   "admin.email.mtpns": "Utilisez iOS et Android sur iTunes et Google Play avec TPNS",
@@ -184,8 +184,8 @@
   "admin.email.notificationDisplayTitle": "Nom affiché dans les notifications :",
   "admin.email.notificationEmailDescription": "L'adresse électronique affichée sur le compte utilisé lors de l'envoi de notifications par courriel à Mattermost.",
   "admin.email.notificationEmailExample": "Exemple : \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
-  "admin.email.notificationEmailTitle": "Notification par messagerie :",
-  "admin.email.notificationOrganization": "Adresse de notification en pied de page",
+  "admin.email.notificationEmailTitle": "Notification depuis l'adresse :",
+  "admin.email.notificationOrganization": "Adresse de notification en pied de page des courriels :",
   "admin.email.notificationOrganizationDescription": "Nom de société et adresse affichés sur les notifications par courrier électronique, comme \"(c) MaSociété, 21 avenue Niel, 75017 Paris, France\". Si ce champ est vide, il ne sera pas inclus dans les courriers électroniques.",
   "admin.email.notificationsDescription": "En général, activé en production. Si activé, Mattermost essaye d'envoyer des notifications par courrier électronique. Les développeurs peuvent en revanche désactiver cette option pour gagner du temps.<br />Activer cette option retire la bannière \"Mode découverte\" (cela nécessite de se déconnecter puis se re-connecter après avoir activé l'option).",
   "admin.email.notificationsTitle": "Envoyer des notifications par courriel : ",
@@ -206,20 +206,20 @@
   "admin.email.selfPush": "Configuration manuel du service de notification Push",
   "admin.email.smtpPasswordDescription": " Récupérez ces informations de la part de l'administrateur de votre serveur de mails.",
   "admin.email.smtpPasswordExample": "Exemple : \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "SMTP Server Password:",
+  "admin.email.smtpPasswordTitle": "Mot de passe du serveur SMTP :",
   "admin.email.smtpPortDescription": "Port du serveur SMTP.",
   "admin.email.smtpPortExample": "Exemple : \"25\", \"465\"",
-  "admin.email.smtpPortTitle": "SMTP Server Port:",
+  "admin.email.smtpPortTitle": "Port SMTP :",
   "admin.email.smtpServerDescription": "Adresse de votre serveur SMTP.",
   "admin.email.smtpServerExample": "Exemple : \"smtp. yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "Serveur SMTP :",
   "admin.email.smtpUsernameDescription": " Récupérez ces informations de la part de l'administrateur de votre serveur de mails.",
   "admin.email.smtpUsernameExample": "Exemple :  \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
-  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
+  "admin.email.smtpUsernameTitle": "Nom d'utilisateur SMTP :",
   "admin.email.testing": "Essai en cours...",
   "admin.false": "non",
   "admin.file_upload.chooseFile": "Parcourir",
-  "admin.file_upload.noFile": "Aucun fichier chargé",
+  "admin.file_upload.noFile": "Aucun fichier téléchargé",
   "admin.file_upload.uploadFile": "Télécharger",
   "admin.files.images": "Images",
   "admin.files.storage": "Stockage",
@@ -233,10 +233,14 @@
   "admin.general.localization.serverLocaleTitle": "Langue par défaut du serveur :",
   "admin.general.log": "Journalisation",
   "admin.general.policy": "Règles",
-  "admin.general.policy.teamInviteAdmin": "Administrateurs d'équipe et administrateurs système",
-  "admin.general.policy.teamInviteAll": "Tous les membres de l'équipe",
+  "admin.general.policy.permissionsAdmin": "Administrateurs d'équipe et administrateurs système",
+  "admin.general.policy.permissionsAll": "Tous les membres de l'équipe",
+  "admin.general.policy.permissionsSystemAdmin": "Administrateurs système",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for private groups.<br/><br/>Selecting \"Team and System Admins\" restricts group management permissions for private groups to Team and System Admins, including creating, deleting, renaming, and setting the group header or purpose.<br/><br/>Selecting \"System Admins\" restricts group management permissions for private groups to System Admins, including creating, deleting, renaming, and setting the group header or purpose.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Autoriser la gestion des groupes privés pour :",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for public channels.<br/><br/>Selecting \"Team and System Admins\" restricts channel management permissions for public channels to Team and System Admins, including creating, deleting, renaming, and setting the channel header or purpose.<br/><br/>Selecting \"System Admins\" restricts channel management permissions for public channels to System Admins, including creating, deleting, renaming, and setting the channel header or purpose.",
+  "admin.general.policy.restrictPublicChannelManagementTitle": "Autoriser la gestion des canaux publics pour :",
   "admin.general.policy.teamInviteDescription": "Selecting \"All team members\" allows any team member to invite others using an email invitation or team invite link.<br/><br/>Selecting \"Team and System Admins\" hides the email invitation and team invite link in the Main Menu from users who are not Team or System Admins. Note: If \"Get Team Invite Link\" is used to share a link, it will need to be regenerated after the desired users joined the team.<br/><br/>Selecting \"System Admins\" hides the email invitation and team invite link in the Main Menu from users who are not System Admins. Note: If \"Get Team Invite Link\" is used to share a link, it will need to be regenerated after the desired users joined the team.",
-  "admin.general.policy.teamInviteSystemAdmin": "Administrateurs système",
   "admin.general.policy.teamInviteTitle": "Autoriser l'envoi d'invitation depuis :",
   "admin.general.privacy": "Confidentialité",
   "admin.general.usersAndTeams": "Utilisateur et équipes",
@@ -247,11 +251,11 @@
   "admin.gitlab.authTitle": "URL d'authentification (auth endpoint) :",
   "admin.gitlab.clientIdDescription": "Récupérez cette information depuis les instructions ci-dessus pour vous connecter à GitLab",
   "admin.gitlab.clientIdExample": "Exemple : \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientIdTitle": "Nom de l'application",
+  "admin.gitlab.clientIdTitle": "ID d'application :",
   "admin.gitlab.clientSecretExample": "Exemple : \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "Application Secret Key:",
+  "admin.gitlab.clientSecretTitle": "Clé secrète de l'application :",
   "admin.gitlab.enableDescription": "Si activé, Mattermost autorise la création d'une équipe et l'inscription avec le service OAuth de GitLab.",
-  "admin.gitlab.enableTitle": "Enable authentication with GitLab: ",
+  "admin.gitlab.enableTitle": "Activer l'authentification par GitLab : ",
   "admin.gitlab.settingsTitle": "Configuration de GitLab",
   "admin.gitlab.tokenDescription": "Saisissez https://<your-gitlab-url>/oauth/token.   Veillez à saisir HTTP ou HTTPS dans l'URL suivant votre configuration.",
   "admin.gitlab.tokenExample": "Exemple \"https://<your-gitlab-url>/oauth/token\"",
@@ -264,46 +268,46 @@
   "admin.image.amazonS3BucketTitle": "Bucket S3 Amazon :",
   "admin.image.amazonS3IdDescription": "Demandez cette information à votre administrateur AWS.",
   "admin.image.amazonS3IdExample": "Exemple : \"AKIADTOVBGERKLCBV\"",
-  "admin.image.amazonS3IdTitle": "Access Key ID dAmazon S3 :",
+  "admin.image.amazonS3IdTitle": "Access Key ID d'Amazon S3 :",
   "admin.image.amazonS3RegionDescription": "Région AWS dans laquelle votre bucket S3 est hébergé.",
   "admin.image.amazonS3RegionExample": "Exemple : \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Région AWS S3 :",
   "admin.image.amazonS3SecretDescription": "Demandez cette information à votre administrateur AWS.",
   "admin.image.amazonS3SecretExample": "Exemple : \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Secret Access Key d'Amazon S3 :",
-  "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
+  "admin.image.localDescription": "Répertoire où écrire les fichiers et les images. Si vide : \"./data/\".",
   "admin.image.localExample": "Ex : \"./data/\"",
-  "admin.image.localTitle": "Local Storage Directory:",
+  "admin.image.localTitle": "Répertoire de stockage local :",
   "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
-  "admin.image.maxFileSizeTitle": "Taille de page maximum",
+  "admin.image.maxFileSizeTitle": "Taille de fichier maximum :",
   "admin.image.previewHeightDescription": "Hauteur maxi de l'aperçu d'image (\"0\" pour taille automatique). Mettre cette valeur à jour change la manière dont les aperçus d'image seront générés par la suite, mais ne modifie pas les aperçus déjà générés.",
   "admin.image.previewHeightExample": "Exemple : \"\"",
-  "admin.image.previewHeightTitle": "Image Preview Height:",
+  "admin.image.previewHeightTitle": "Hauteur d'aperçu d'image :",
   "admin.image.previewWidthDescription": "Largeur maximale de l'aperçu d'image. Mettre cette valeur à jour change la manière dont les aperçus d'image seront générés par la suite, mais ne modifie pas les aperçus déjà générés.",
   "admin.image.previewWidthExample": "Exemple : \"1024\"",
-  "admin.image.previewWidthTitle": "Profile Picture Width:",
+  "admin.image.previewWidthTitle": "Largeur de photo de profil :",
   "admin.image.profileHeightDescription": "Hauteur de la photo de profil",
   "admin.image.profileHeightExample": "Exemple : \"0\"",
-  "admin.image.profileHeightTitle": "Profile Picture Height:",
+  "admin.image.profileHeightTitle": "Hauteur de photo de profil :",
   "admin.image.profileWidthDescription": "Largeur de la photo de profil.",
   "admin.image.profileWidthExample": "Exemple : \"1024\"",
-  "admin.image.profileWidthTitle": "Image Preview Width:",
+  "admin.image.profileWidthTitle": "Largeur d'aperçu d'image :",
   "admin.image.publicLinkDescription": "Clé de salage de 32 caractères ajoutée aux courriels d'invitation. Générée aléatoirement lors de l'installation. Cliquez sur \"Regénérer\" pour créer une nouvelle clé de salage.",
   "admin.image.publicLinkExample": "Exemple : \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Clé de salage publique :",
   "admin.image.shareDescription": "Permettre aux utilisateurs de partager des liens et images publics.",
-  "admin.image.shareTitle": "Partager liens publics : ",
+  "admin.image.shareTitle": "Activer les liens publics pour les fichiers : ",
   "admin.image.storeAmazonS3": "Amazon S3",
   "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
   "admin.image.storeLocal": "Disque local",
-  "admin.image.storeTitle": "File Storage System:",
+  "admin.image.storeTitle": "Système de stockage des fichiers :",
   "admin.image.thumbHeightDescription": "Hauteur des vignettes générées pour les images. Changer cette valeur ne modifie pas les vignettes de l'historique.",
   "admin.image.thumbHeightExample": "Exemple : \"100\"",
-  "admin.image.thumbHeightTitle": "Attachment Thumbnail Height:",
+  "admin.image.thumbHeightTitle": "Hauteur des aperçus de pièces jointes :",
   "admin.image.thumbWidthDescription": "Largeur des vignettes générées pour les images. Changer cette valeur ne modifie pas les vignettes de l'historique.",
   "admin.image.thumbWidthExample": "Exemple : \"120\"",
-  "admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
+  "admin.image.thumbWidthTitle": "Largeur des aperçus de pièces jointes :",
   "admin.integrations.external": "Services externes",
   "admin.integrations.webhook": "Webhooks et commandes",
   "admin.ldap.baseDesc": "Le DN de base est le Distinguished Name à partir du quel Mattermost doit rechercher les utilisateurs dans l'arborescence LDAP.",
@@ -321,7 +325,7 @@
   "admin.ldap.firstnameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"prénom\" des utilisateurs dans Mattermost.",
   "admin.ldap.firstnameAttrEx": "Exemple : \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Attribut prénom",
-  "admin.ldap.idAttrDesc": "Attribut du serveur LDAP utilisé comme identifiant unique d'utilisateur dans Mattermost. Cela doit être un attribut dont la valeur ne change pas, tel que le username ou un uid. Si cette valeur change dans l'annuaire LDAP, un nouveau compte Mattermost sera créé avec l'ancien utilisateur. Il s'agit de la valeur à saisir dans le champ \"Utilisateur LDAP\" de la page de connexion. Normalement cet attribut est le même que celui du \"nom d'utilisateur\" ci-dessus. Si votre équipe utilise domain\\\\username pour se connecter à d'autres services avec LDAP, vous pouvez utiliser domain\\\\username pour rester cohérent.",
+  "admin.ldap.idAttrDesc": "Attribut du serveur LDAP utilisé comme identifiant unique d'utilisateur dans Mattermost. Cela doit être un attribut dont la valeur ne change pas, tel que le username ou un uid. Si cette valeur change dans l'annuaire LDAP, un nouveau compte Mattermost sera créé avec l'ancien utilisateur. Il s'agit de la valeur à saisir dans le champ \"Utilisateur LDAP\" de la page de connexion. Normalement cet attribut est le même que celui du \"nom d'utilisateur\" ci-dessus. Si votre équipe utilise domain\\username pour se connecter à d'autres services avec LDAP, vous pouvez utiliser domain\\username pour rester cohérent.",
   "admin.ldap.idAttrEx": "Exemple : \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "Attribut id : ",
   "admin.ldap.lastnameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
@@ -348,8 +352,11 @@
   "admin.ldap.serverTitle": "Serveur LDAP :",
   "admin.ldap.skipCertificateVerification": "Passer la vérification",
   "admin.ldap.skipCertificateVerificationDesc": "Saute l'étape de vérification des certificats pour les connexions TLS ou STARTTLS . Non recommandé pour les environnements de production où TLS est nécessaire. Pour tester seulement.",
+  "admin.ldap.syncFailure": "Erreur de synchronisation : {error}",
   "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour.",
   "admin.ldap.syncIntervalTitle": "Intervalle de synchronisation (en minutes)",
+  "admin.ldap.syncNowHelpText": "Provoque une synchronisation LDAP immédiate.",
+  "admin.ldap.sync_button": "Synchroniser maintenant l'annuaire LDAP",
   "admin.ldap.uernameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom d'utilisateur\" dans Mattermost. Utilisez de préférence le même champ que l'attribut \"identifiant d'utilisateur\".",
   "admin.ldap.userFilterDisc": "Entrez éventuellement un filtre LDAP à utiliser lors de la recherche d'objets utilisateur. Seuls les utilisateurs sélectionnés par la requête seront en mesure d'accéder à Mattermost . Pour Active Directory, la requête pour filtrer les utilisateurs désactivés est (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Exemple : \"(objectClass=utilisateur)\"",
@@ -369,13 +376,13 @@
   "admin.license.uploadDesc": "Téléchargez une licence de Mattermost pour mettre à jour ce serveur. Consultez <a href=\"http://mattermost.com\" target=\"_blank\">Mattermoste</a> pour plus d'informations.",
   "admin.license.uploading": "Téléchargement de la licence…",
   "admin.log.consoleDescription": "En principe désactivée en production. Utilisé pour le développement, pour afficher les messages d'information sur la console (stdout).",
-  "admin.log.consoleTitle": "Output logs to console: ",
+  "admin.log.consoleTitle": "Affiche les journaux sur la console : ",
   "admin.log.enableWebhookDebugging": "Activer le débogage des webhooks :",
   "admin.log.enableWebhookDebuggingDescription": "Si ce paramètre est faux, les traces de débogage des requêtes webhook entrantes seront désactivées.",
   "admin.log.fileDescription": "En principe activé en production. Si activé, les journaux sont écrits dans le fichier spécifié ci-dessous.",
   "admin.log.fileLevelDescription": "Ce paramètre indique le niveau de détail des journaux. ERROR : N'enregistre que les messages d'erreur. INFO : Affiche les erreurs et des informations sur le démarrage et l'initialisation du serveur. DEBUG : Affiche des informations utiles aux développeurs.",
   "admin.log.fileLevelTitle": "Niveau de détail des journaux :",
-  "admin.log.fileTitle": "Output logs to file: ",
+  "admin.log.fileTitle": "Enregistre les journaux dans un fichier : ",
   "admin.log.formatDateLong": "Date (2006/01/02)",
   "admin.log.formatDateShort": "Date (21/02/06)",
   "admin.log.formatDescription": "Format des journaux d'erreur. Si vide, sera \"[%D %T] [%L] %M\", où :",
@@ -384,12 +391,12 @@
   "admin.log.formatPlaceholder": "Entrez le format du fichier",
   "admin.log.formatSource": "Source",
   "admin.log.formatTime": "Heure (15:04:05 MST)",
-  "admin.log.formatTitle": "Format de fichier :",
+  "admin.log.formatTitle": "Format de fichier : ",
   "admin.log.levelDescription": "Ce paramètre détermine le niveau de détail des événements du journal affichés sur la console. ERROR : Affiche seulement les erreurs. INFO : Affiche les messages d'erreur ainsi que des informations sur le démarrage et l'initialisation du serveur. DEBUG : Affiche un haut niveau de détail pour les développeurs.",
   "admin.log.levelTitle": "Niveau de détail affiché sur la console :",
   "admin.log.locationDescription": "Fichier des journaux. Si vide, les journaux seront enregistrés dans \"./logs/mattermost.log\", avec une rotation toutes les 10000 lignes.",
   "admin.log.locationPlaceholder": "Saisir l'emplacement du fichier",
-  "admin.log.locationTitle": "File Log Directory:",
+  "admin.log.locationTitle": "Répertoire des fichiers journaux :",
   "admin.log.logSettings": "Configuration du journal (log)",
   "admin.logs.reload": "Recharger",
   "admin.logs.title": "Journaux du serveur",
@@ -400,6 +407,16 @@
   "admin.notifications.email": "Adresse électronique",
   "admin.notifications.push": "notifications Push sur mobile",
   "admin.notifications.title": "Paramètres de notification",
+  "admin.password.lowercase": "Au moins une lettre minuscule",
+  "admin.password.minimumLength": "Longueur minimale du mot de passe :",
+  "admin.password.minimumLengthDescription": "Nombre minimum de caractères acceptés pour un mot de passe. Doit être un nombre entier supérieur ou égal à {min} et inférieur ou égal à {max}.",
+  "admin.password.minimumLengthExample": "Exemple : \"5\"",
+  "admin.password.number": "Au moins un nombre",
+  "admin.password.preview": "Aperçu du message d'erreur",
+  "admin.password.requirements": "Gestion des mots de passe :",
+  "admin.password.requirementsDescription": "Lettres obligatoires pour un mot de passe valide.",
+  "admin.password.symbol": "Au moins un symbole (ex :  \"~!@#$%^&*()\")",
+  "admin.password.uppercase": "Au moins une majuscule",
   "admin.privacy.showEmailDescription": "Si désactivé, masque les adresses électronique des utilisateurs dans l'interface, y compris pour les responsables d'équipe. Cette option est pratique quand Mattermost est utilisé pour gérer des équipes dans lesquelles les utilisateurs préfèrent garder leurs informations privées.",
   "admin.privacy.showEmailTitle": "Afficher l'adresse électronique : ",
   "admin.privacy.showFullNameDescription": "Si désactivé, les utilisateurs ne peuvent voir le nom complet des autres utilisateurs (y compris le propriétaire de l'équipe et les adminsitrateurs). Le nom d'utilisateur est affiché à la place du nom de la personne.",
@@ -408,17 +425,17 @@
   "admin.rate.enableLimiterTitle": "Limiter l'accès aux API : ",
   "admin.rate.httpHeaderDescription": "Quand ce champ est rempli, les flux des requêtes sont limités par l'en-tête HTTP spécifié (par exemple \"X-Real-IP\" avec Nginx, \"X-Forwarded-For\" pour AmazonELB)",
   "admin.rate.httpHeaderExample": "Exemple : \"X-Real-IP\", \"X-Forwarded-For\"",
-  "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header",
-  "admin.rate.memoryDescription": "Nombre maximum de session utilisateur connectées au système, comme indiqué dans les paramètres \"Adresse distante Vary By\" et \"En-tête HTTP Vary By\" ci-dessous.",
+  "admin.rate.httpHeaderTitle": "Limiter l'accès au moyen d'un en-tête HTTP",
+  "admin.rate.memoryDescription": "Nombre maximum de sessions utilisateur connectées au système, comme indiqué dans les paramètres \"Adresse distante Vary By\" et \"En-tête HTTP Vary By\" ci-dessous.",
   "admin.rate.memoryExample": "Exemple : \"10000\"",
   "admin.rate.memoryTitle": "Taille du stockage en mémoire :",
   "admin.rate.noteDescription": "Modifier des paramètres dans cette section nécessite un redémarrage du serveur.",
   "admin.rate.noteTitle": "Remarque :",
   "admin.rate.queriesDescription": "Limite l'API à ce nombre de requêtes par seconde.",
   "admin.rate.queriesExample": "Exemple : \"10\"",
-  "admin.rate.queriesTitle": "Maximum Queries per Second:",
+  "admin.rate.queriesTitle": "Nombre maximum de requêtes par seconde :",
   "admin.rate.remoteDescription": "Si activé, l'API est limitée au moyen de l'adresse IP du client.",
-  "admin.rate.remoteTitle": "Vary rate limit by remote address: ",
+  "admin.rate.remoteTitle": "Adapter la limite en fonction de l'adresse distante : ",
   "admin.rate.title": "Configuration des limites de débit",
   "admin.recycle.button": "Recycler les connexions à la base de données",
   "admin.recycle.loading": " Recyclage...",
@@ -436,62 +453,66 @@
   "admin.reset_password.titleReset": "Réinitialiser le mot de passe",
   "admin.reset_password.titleSwitch": "Basculez  vers l’addresse électronique / mot de passe de votre compte",
   "admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.",
-  "admin.saml.assertionConsumerServiceURLEx": "Ex \"https://<your-mattermost-url>/login/sso/saml\"",
+  "admin.saml.assertionConsumerServiceURLEx": "Ex : \"https://<your-mattermost-url>/login/sso/saml\"",
   "admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:",
-  "admin.saml.emailAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"adresse électronique\" dans Mattermost.",
-  "admin.saml.emailAttrEx": "Ex \"Email\" or \"PrimaryEmail\"",
+  "admin.saml.emailAttrDesc": "Attribut du SAML pour le champ \"adresse électronique\" dans Mattermost.",
+  "admin.saml.emailAttrEx": "Exemple : \"Email\" ou \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Attribut \"adresse électronique\" :",
   "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.",
-  "admin.saml.enableTitle": "Activer la connexion avec LDAP :",
+  "admin.saml.enableTitle": "Activer la connexion avec SAML :",
   "admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.",
-  "admin.saml.encryptTitle": "Enable Encryption:",
-  "admin.saml.firstnameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"prénom\" des utilisateurs dans Mattermost.",
-  "admin.saml.firstnameAttrEx": "Ex \"FirstName\"",
-  "admin.saml.firstnameAttrTitle": "Attribut prénom",
+  "admin.saml.encryptTitle": "Activer le chiffrement :",
+  "admin.saml.firstnameAttrDesc": "Attribut SAML utilisé pour le champ \"prénom\" des utilisateurs dans Mattermost.",
+  "admin.saml.firstnameAttrEx": "Exemple : \"FirstName\"",
+  "admin.saml.firstnameAttrTitle": "Attribut prénom :",
   "admin.saml.idpCertificateFileDesc": "The public authentication certificate issued by your Identity Provider.",
   "admin.saml.idpCertificateFileRemoveDesc": "Remove the public authentication certificate issued by your Identity Provider.",
   "admin.saml.idpCertificateFileTitle": "Identity Provider Public Certificate:",
   "admin.saml.idpDescriptorUrlDesc": "The issuer URL for the Identity Provider you use for SAML requests.",
   "admin.saml.idpDescriptorUrlEx": "Ex \"https://idp.example.org/SAML2/issuer\"",
-  "admin.saml.idpDescriptorUrlTitle": "Identity Provider Issuer URL:",
+  "admin.saml.idpDescriptorUrlTitle": "URL du serveur d'identité :",
   "admin.saml.idpUrlDesc": "The URL where Mattermost sends a SAML request to start login sequence.",
-  "admin.saml.idpUrlEx": "Ex \"https://idp.example.org/SAML2/SSO/Login\"",
-  "admin.saml.idpUrlTitle": "SAML SSO URL:",
-  "admin.saml.lastnameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
-  "admin.saml.lastnameAttrEx": "Ex \"LastName\"",
+  "admin.saml.idpUrlEx": "Ex : \"https://idp.example.org/SAML2/SSO/Login\"",
+  "admin.saml.idpUrlTitle": "URL SSO SAML :",
+  "admin.saml.lastnameAttrDesc": "Attribut SAML utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
+  "admin.saml.lastnameAttrEx": "Ex : \"LastName\"",
   "admin.saml.lastnameAttrTitle": "Attribut \"nom de famille\" :",
-  "admin.saml.localeAttrDesc": "(Optionnel) Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
-  "admin.saml.localeAttrEx": "Ex \"Locale\" or \"PrimaryLanguage\"",
-  "admin.saml.localeAttrTitle": "Preferred Language Attribute:",
+  "admin.saml.localeAttrDesc": "(Optionnel) Attribut SAML utilisé pour le champ \"langue\" des utilisateurs dans Mattermost.",
+  "admin.saml.localeAttrEx": "Ex : \"Locale\" ou \"PrimaryLanguage\"",
+  "admin.saml.localeAttrTitle": "Attribut language préféré :",
   "admin.saml.loginButtonTextDesc": "(Optional) The text that appears in the login button on the login page. Defaults to \"With SAML\".",
-  "admin.saml.loginButtonTextEx": "Ex \"With OKTA\"",
-  "admin.saml.loginButtonTextTitle": "Login Button Text:",
-  "admin.saml.nicknameAttrDesc": "(Optionnel) Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
+  "admin.saml.loginButtonTextEx": "Ex : \"With OKTA\"",
+  "admin.saml.loginButtonTextTitle": "Texte du bouton de connexion :",
+  "admin.saml.nicknameAttrDesc": "(Optionnel) Attribut du serveur LDAP utilisé pour le champ \"surnom\" des utilisateurs dans Mattermost.",
   "admin.saml.nicknameAttrEx": "Exemple : \"surnom\"",
-  "admin.saml.nicknameAttrTitle": "Attribut \"nom d'utilisateur\" :",
-  "admin.saml.privateKeyFileFileDesc": "The private key used to decrypt SAML Assertions from the Identity Provider.",
-  "admin.saml.privateKeyFileFileRemoveDesc": "Remove the private key used to decrypt SAML Assertions from the Identity Provider.",
-  "admin.saml.privateKeyFileTitle": "Service Provider Private Key:",
+  "admin.saml.nicknameAttrTitle": "Attribut \"surnom\" : ",
+  "admin.saml.privateKeyFileFileDesc": "La clé privée utilisée pour déchiffrer le SAML de votre serveur d'identité.",
+  "admin.saml.privateKeyFileFileRemoveDesc": "La clé privée utilisée pour déchiffrer le SAML de votre serveur d'identité.",
+  "admin.saml.privateKeyFileTitle": "Clé privée du service d'identité :",
   "admin.saml.publicCertificateFileDesc": "The certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
   "admin.saml.publicCertificateFileRemoveDesc": "Remove the certificate used to generate the signature on a SAML request to the Identity Provider for a service provider initiated SAML login, when Mattermost is the Service Provider.",
   "admin.saml.publicCertificateFileTitle": "Service Provider Public Certificate:",
   "admin.saml.remove.idp_certificate": "Remove Identity Provider Certificate",
-  "admin.saml.remove.privKey": "Remove Service Provider Private Key",
+  "admin.saml.remove.privKey": "Clé privée du service d'identité :",
   "admin.saml.remove.sp_certificate": "Remove Service Provider Certificate",
-  "admin.saml.removing.certificate": "Removing Certificate...",
-  "admin.saml.removing.privKey": "Removing Private Key...",
-  "admin.saml.uploading.certificate": "Uploading Certificate...",
-  "admin.saml.uploading.privateKey": "Uploading Private Key...",
-  "admin.saml.usernameAttrDesc": "Attribut du serveur LDAP utilisé pour le champ \"nom de famille\" des utilisateurs dans Mattermost.",
-  "admin.saml.usernameAttrEx": "Ex \"Username\"",
+  "admin.saml.removing.certificate": "Retrait du certificat...",
+  "admin.saml.removing.privKey": "Retrait de la clé privée...",
+  "admin.saml.uploading.certificate": "Téléchargement du certificat...",
+  "admin.saml.uploading.privateKey": "Téléchargement de la clé privée...",
+  "admin.saml.usernameAttrDesc": "Attribut du SAML utilisé pour le champ \"nom d'utilisateur\" des utilisateurs dans Mattermost.",
+  "admin.saml.usernameAttrEx": "Ex : \"Username\"",
   "admin.saml.usernameAttrTitle": "Attribut \"nom d'utilisateur\" :",
-  "admin.saml.verifyDescription": "When true, Mattermost verifies that the signature sent from the SAML Response matches the Service Provider Login URL",
-  "admin.saml.verifyTitle": "Verify Signature:",
+  "admin.saml.verifyDescription": "Si vrai, Mattermost vérifie la signature du SAML.",
+  "admin.saml.verifyTitle": "Vérifier la signature :",
   "admin.save": "Enregistrer",
   "admin.saving": "Enregistrement des paramètres...",
   "admin.security.connection": "Connexions",
+  "admin.security.inviteSalt.disabled": "La clé de salage d'invitation ne peut être modifiée si les courriels ne sont pas activés.",
   "admin.security.login": "S’identifier",
+  "admin.security.password": "Mot de passe",
+  "admin.security.passwordResetSalt.disabled": "La clé de salage de réinitialisation du mot de passe ne peut être modifiée si les courriels ne sont pas activés.",
   "admin.security.public_links": "Liens publics",
+  "admin.security.requireEmailVerification.disabled": "La vérification par courrier électronique ne peut être activée sans activer l'envoi des courriels.",
   "admin.security.session": "Sessions",
   "admin.security.signup": "S'inscrire",
   "admin.select_team.close": "Quitter",
@@ -505,28 +526,28 @@
   "admin.service.corsDescription": "Autoriser les requête HTTP cross-origin depuis des domaines spécifiques (séparés par des espaces). Utilisez \"*\" pour autoriser les CORS pour n'importe quel domaine (pas recommandé) ou laissez vide pour les désactiver.",
   "admin.service.corsEx": "http://exemple.com ou https://exemple.com",
   "admin.service.corsTitle": "Autoriser les requêtes cross-origin depuis :",
-  "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
+  "admin.service.developerDesc": "Si activé, les erreurs Javascript sont affichées dans une barre en haut de l'interface. Ceci n'est pas recommandé sur un serveur de production. ",
   "admin.service.developerTitle": "Activer le mode développeur : ",
   "admin.service.googleDescription": "Saisissez cette clé pour permettre l'intégration de vidéos YouTube et d'aperçus basés sur les liens postés dans les messages ou commentaires. Pour obtenir cette clé, rendez-vous sur <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">https://www.youtube.com/watch?v=Im69kzhpR3I</a>. Laissez le champ vide pour désactiver la génération automatique des vignettes YouTube.",
   "admin.service.googleExample": "Exemple : \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
-  "admin.service.googleTitle": "Google API Key:",
+  "admin.service.googleTitle": "Clé API Google :",
   "admin.service.iconDescription": "Si activé, les webhooks et commandes slash pourront changer l'icône avec lequel ils postent. Attention, si vous autorisez également le changer du nom d'utilisateur, cela augmente le risque d'une attaque par hameçonnage.",
-  "admin.service.iconTitle": "Enable webhooks and slash commands to override profile picture icons:",
+  "admin.service.iconTitle": "Permettre aux webhooks et commandes slash de modifier l'image de profile :",
   "admin.service.insecureTlsDesc": "Si activé, toute requête sortante HTTPS acceptera les certificats non-vérifiés et auto-signés. Par exemple, les requêtes webhook sortantes avec un certificat TLS auto-signé, vers n'importe quel domaine, seront autorisées. Attention, cela rend votre serveur vulnérable aux attaques de type \"man in the middle\".",
   "admin.service.insecureTlsTitle": "Autoriser les connexions sortantes non-sécurisées : ",
-  "admin.service.integrationAdmin": "Restrict creating integrations to Team and System Admins: ",
+  "admin.service.integrationAdmin": "Restreindre les intégrations aux administrateurs : ",
   "admin.service.integrationAdminDesc": "Si activé, les intégrations ne peuvent être configurées que par les administrateurs.",
   "admin.service.listenAddress": "Adresse IP du serveur :",
   "admin.service.listenDescription": "Adresse IP à laquelle le serveur écoute. Saisir \":8065\" connectera le serveur depuis toutes les interfaces réseau de la machine. Vous pouvez également choisir une adresse, par exemple \"127.0.0.1:8065\". Ce paramètre nécessite un redémarrage du serveur.",
   "admin.service.listenExample": "Exemple : \":8065\"",
   "admin.service.mfaDesc": "Si activé, Les utilisateurs auront la possibilité d'ajouter l'authentification multi- facteur à leur compte . Ils auront besoin d'un smartphone et une application d'authentification tels que Google Authenticator .",
   "admin.service.mfaTitle": "Activité l’authentification multi-facteurs:",
-  "admin.service.mobileSessionDays": "Session length for mobile apps (days):",
+  "admin.service.mobileSessionDays": "Durée de la session sur les applis mobiles (en jours) :",
   "admin.service.mobileSessionDaysDesc": "Les sessions web expireront après le nombre de jours indiqué et nécessiteront une reconnexion de l'utilisateur.",
   "admin.service.outWebhooksDesc": "Si activé, les webhooks sortants sont autorisés.",
   "admin.service.outWebhooksTitle": "Activer les webhooks sortants : ",
   "admin.service.overrideDescription": "Si activé, les webhooks et commandes slash peuvent changer le nom d'utilisateur avec lequel ils postent. Attention, si le changement d'icône est également autorisé, cela peut conduire à des attaques de type hameçonnage !",
-  "admin.service.overrideTitle": "Enable webhooks and slash commands to override usernames:",
+  "admin.service.overrideTitle": "Permettre aux webhooks et commandes slash de changer leur nom d'utilisateur :",
   "admin.service.securityDesc": "Si activé, les administrateurs système sont notifiés par courriel si une alerte de sécurité a été annoncée ces 12 dernières heures. La messagerie doit être activée.",
   "admin.service.securityTitle": "Activer les alertes de sécurité : ",
   "admin.service.segmentDescription": "Segment.com est un service en ligne qui peut éventuellement être utilisé pour le suivi des statistiques détaillées du système. Vous pouvez obtenir une clé de signature -up pour un compte gratuit à Segment.com.",
@@ -535,12 +556,12 @@
   "admin.service.sessionCache": "Cache de session en minutes :",
   "admin.service.sessionCacheDesc": "Durée pendant laquelle une session est gardée en mémoire.",
   "admin.service.sessionDaysEx": "Exemple : \"30\"",
-  "admin.service.ssoSessionDays": "Session length for GitLab SSO authentication (days):",
+  "admin.service.ssoSessionDays": "Durée de session pour l'authentification SSO GitLab (en jours) :",
   "admin.service.ssoSessionDaysDesc": "Les sessions web expireront après le nombre de jours indiqué et nécessiteront une reconnexion de l'utilisateur.",
   "admin.service.testingDescription": "(Option de développement) Si activé, la commande \"/loadtest\" est active et charge des données de test. Changer ce paramètre nécessite de redémarrer le serveur.",
-  "admin.service.testingTitle": "Enable Testing Commands: ",
-  "admin.service.webSessionDays": "Session length for email and LDAP authentication (days):",
-  "admin.service.webSessionDaysDesc": "Les sessions SSO expireront après le nombre de jours indiqué et nécessiteront une reconnexion de l'utilisateur.",
+  "admin.service.testingTitle": "Activer les commandes de test : ",
+  "admin.service.webSessionDays": "Durée de session pour l'authentification SSO GitLab (en jours) :",
+  "admin.service.webSessionDaysDesc": "Les sessions LDAP expireront après le nombre de jours indiqué et nécessiteront une reconnexion de l'utilisateur.",
   "admin.service.webhooksDescription": "Si activé, les webhooks entrants ont autorisés. Pour éviter le hameçonnage, tous les messages provenant de webhooks sont marqués avec l'étiquette \"BOT\".",
   "admin.service.webhooksTitle": "Activer les webhooks entrants : ",
   "admin.sidebar.addTeamSidebar": "Afficher l'équipe dans le menu",
@@ -571,12 +592,13 @@
   "admin.sidebar.logs": "Journaux",
   "admin.sidebar.notifications": "Notifications",
   "admin.sidebar.other": "AUTRES",
+  "admin.sidebar.password": "Mot de passe",
   "admin.sidebar.policy": "Règles",
   "admin.sidebar.privacy": "Confidentialité",
   "admin.sidebar.publicLinks": "Liens publics",
   "admin.sidebar.push": "notifications Push",
   "admin.sidebar.rateLimiting": "Limitation de débit",
-  "admin.sidebar.reports": "REPORTING",
+  "admin.sidebar.reports": "RAPPORTS",
   "admin.sidebar.rmTeamSidebar": "Ne plus afficher l'équipe dans le menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Sécurité",
@@ -584,7 +606,7 @@
   "admin.sidebar.settings": "REGLAGES",
   "admin.sidebar.signUp": "S’inscrire",
   "admin.sidebar.sign_up": "S’inscrire",
-  "admin.sidebar.statistics": "Team Statistics",
+  "admin.sidebar.statistics": "Statistiques de l'équipe",
   "admin.sidebar.storage": "Stockage",
   "admin.sidebar.support": "Juridique et de soutien",
   "admin.sidebar.teams": "Equipes ({count, number})",
@@ -687,6 +709,14 @@
   "admin.user_item.switchToEmail": "Basculer vers votre adresse électronique / mot de passe",
   "admin.user_item.sysAdmin": "Administrateur système",
   "admin.user_item.teamAdmin": "Administrateur d'équipe",
+  "admin.webserverModeDisabled": "Disabled",
+  "admin.webserverModeDisabledDescription": "The Mattermost server will not serve static files.",
+  "admin.webserverModeGzip": "gzip",
+  "admin.webserverModeGzipDescription": "The Mattermost server will serve static files compressed with gzip.",
+  "admin.webserverModeHelpText": "gzip compression applies to static content files. It is recommended to enable gzip to improve performance unless your environment has specific restrictions, such as a web proxy that distributes gzip files poorly. This setting requires a server restart to take effect.",
+  "admin.webserverModeTitle": "Webserver Mode:",
+  "admin.webserverModeUncompressed": "Uncompressed",
+  "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
   "analytics.chart.loading": "Chargement…",
   "analytics.chart.meaningful": "Pas assez de données pour afficher quelque chose de pertinent.",
   "analytics.system.activeUsers": "Utilisateurs actifs avec messages",
@@ -985,6 +1015,7 @@
   "emoji_list.creator": "Creator",
   "emoji_list.delete": "Supprimer",
   "emoji_list.empty": "No Custom Emoji Found",
+  "emoji_list.help": "Custom emoji are available to everyone on your server and will appear in the emoji autocomplete menu. Other users may need to refresh the page before new emojis appear.",
   "emoji_list.image": "Images",
   "emoji_list.name": "Nom",
   "emoji_list.search": "Search Custom Emoji",
@@ -1048,11 +1079,15 @@
   "installed_commands.add": "Ajout de la commande Slash",
   "installed_commands.empty": "Pas de commande trouvée",
   "installed_commands.header": "Commande Slash",
+  "installed_commands.help": "Create slash commands for use in external integrations. Please see the {link} to learn more.",
+  "installed_commands.helpLink": "documentation",
   "installed_commands.search": "Search Slash Commands",
   "installed_commands.unnamed_command": "Commande slash sans nom",
   "installed_incoming_webhooks.add": "Ajouter des Webhooks entrants",
   "installed_incoming_webhooks.empty": "Aucun webhooks entrants trouvés",
   "installed_incoming_webhooks.header": "Webhooks entrants",
+  "installed_incoming_webhooks.help": "Create incoming webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_incoming_webhooks.helpLink": "documentation",
   "installed_incoming_webhooks.search": "Search Incoming Webhooks",
   "installed_incoming_webhooks.unknown_channel": "Webhook privé",
   "installed_integrations.callback_urls": "URLs de callback : {urls}",
@@ -1066,6 +1101,8 @@
   "installed_outgoing_webhooks.add": "Ajouter des Webhooks sortants",
   "installed_outgoing_webhooks.empty": "Aucun webhooks sortants trouvés",
   "installed_outgoing_webhooks.header": "Webhooks sortants",
+  "installed_outgoing_webhooks.help": "Create outgoing webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_outgoing_webhooks.helpLink": "documentation",
   "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
   "installed_outgoing_webhooks.unknown_channel": "Un webhook privé",
   "integrations.command.description": "Les commandes Slash envoient des évènements à des intégrations extérieures",
@@ -1185,6 +1222,7 @@
   "navbar_dropdown.help": "Aide",
   "navbar_dropdown.integrations": "Intégrations",
   "navbar_dropdown.inviteMember": "Inviter un nouveau membre",
+  "navbar_dropdown.leave": "Leave Team",
   "navbar_dropdown.logout": "Se déconnecter",
   "navbar_dropdown.manageMembers": "Gérer les membres",
   "navbar_dropdown.report": "Signaler un problème",
@@ -1320,19 +1358,20 @@
   "sidebar_right_menu.switch_team": "Sélection de l'équipe",
   "sidebar_right_menu.teamLink": "Obtenir un lien d'invitation d'équipe",
   "sidebar_right_menu.teamSettings": "Configuration de l'équipe",
-  "signup_team.choose": "Les équipes dont vous êtes membre sont: ",
+  "signup_team.choose": "Your teams: ",
   "signup_team.createTeam": "Ou créez une équipe",
   "signup_team.disabled": "Aucune méthode de création d'utilisateur n'est disponible. Veuillez contacter votre administrateur système pour obtenir un accès.",
   "signup_team.join_open": "Vous montre les équipes que vous pouvez rejoindre: ",
   "signup_team.noTeams": "Il n'y a aucune équipe dans l'annuaire, et la création d'équipe n'est pas autorisée.",
-  "signup_team.no_open_teams": "Aucune équipe ouverte n'a été créée. Veuillez demander une invitation à votre administrateur.",
-  "signup_team.no_open_teams_canCreate": "Aucune équipe ouverte n'a été créée. Veuillez demander une invitation à votre administrateur ou créer une nouvelle équipe.",
+  "signup_team.no_open_teams": "No teams are available to join. Please ask your administrator for an invite.",
+  "signup_team.no_open_teams_canCreate": "No teams are available to join. Please create a new team or ask your administrator for an invite.",
   "signup_team.no_teams": "Aucune équipe n'est créée. Veuillez contacter votre administrateur.",
   "signup_team.no_teams_canCreate": "Aucune équipe n'a été créée. Vous pouvez en créer une en cliquant sur \"Créer une équipe\".",
   "signup_team.none": "Aucune méthode de création d'utilisateur n'est disponible. Veuillez contacter votre administrateur système pour obtenir un accès.",
   "signup_team_complete.completed": "Vous avez déjà utilisé cette invitation pour vous inscrire, ou bien l'invitation a expiré.",
   "signup_team_confirm.checkEmail": "Veuillez vérifier votre messagerie : <strong>{email}</strong><br />Votre courriel contient un lien pour configurer votre équipe",
   "signup_team_confirm.title": "Inscription terminée",
+  "signup_team_system_console": "Go to System Console",
   "signup_user_completed.choosePwd": "Choisissez votre mot de passe",
   "signup_user_completed.chooseUser": "Choisissez votre nom d'utilisateur",
   "signup_user_completed.create": "Créer un compte",
@@ -1388,6 +1427,7 @@
   "team_members_dropdown.confirmDemotion": "Confirmer le retrait",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "Inactif",
+  "team_members_dropdown.leave_team": "Remove From Team",
   "team_members_dropdown.makeActive": "Activer",
   "team_members_dropdown.makeAdmin": "Rendre administrateur de l'équipe",
   "team_members_dropdown.makeInactive": "Désactiver",
@@ -1606,10 +1646,26 @@
   "user.settings.security.newPassword": "Nouveau mot de passe",
   "user.settings.security.oneSignin": "Vous ne pouvez avoir qu'une seule méthode de connexion à la fois. Changer la méthode de connexion provoquera l'envoi d'un courriel si le changement est réussi.",
   "user.settings.security.password": "Mot de passe",
+  "user.settings.security.passwordError": "Your password must contain at least {min} characters.",
+  "user.settings.security.passwordErrorLowercase": "Your password must contain at least {min} characters made up of at least one lowercase letter.",
+  "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one number.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one uppercase letter.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorNumber": "Your password must contain at least {min} characters made up of at least one number.",
+  "user.settings.security.passwordErrorNumberSymbol": "Your password must contain at least {min} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorSymbol": "Your password must contain at least {min} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercase": "Your password must contain at least {min} characters made up of at least one uppercase letter.",
+  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one number.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "La connexion se produit à travers GitLab. Le mot de passe ne peut pas être mis à jour.",
   "user.settings.security.passwordLdapCantUpdate": "La connexion se produit via LDAP . Le mot de passe ne peut pas être mis à jour.",
-  "user.settings.security.passwordLengthError": "Les nouveaux mots de passe doivent faire au moins {chars} caractères",
   "user.settings.security.passwordMatchError": "Les adresses électroniques que vous avez saisies ne correspondent pas.",
+  "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
   "user.settings.security.retypePassword": "Saisissez le nouveau mot de passe",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Utilisation de l'adresse électronique et du mot de passe",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 3f76d63b1..3e4d41a3c 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -65,19 +65,19 @@
   "add_command.username.help": "このスラッシュコマンドに返信する投稿のユーザー名を上書きするユーザー名を選択します。22文字以下の小文字の英数字と記号(\"-\"、\"_\"、\".\"のみ使用可能)で指定してください。",
   "add_command.username.placeholder": "ユーザー名",
   "add_emoji.cancel": "キャンセル",
-  "add_emoji.header": "追加する",
+  "add_emoji.header": "追加",
   "add_emoji.image": "画像",
-  "add_emoji.image.button": "選択する",
-  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 64 KB and dimensions up to 128 by 128 pixels.",
-  "add_emoji.imageRequired": "An image is required for the emoji",
+  "add_emoji.image.button": "選択",
+  "add_emoji.image.help": "絵文字の画像を選択してください。画像ファイルはgif, png, jpegのいずれかの形式で64KB以下、128x128ピクセル以内としてください。",
+  "add_emoji.imageRequired": "絵文字の画像は必須です。",
   "add_emoji.name": "名前",
   "add_emoji.name.help": "Choose a name for your emoji made of up to 64 characters consisting of lowercase letters, numbers, and the symbols '-' and '_'.",
   "add_emoji.nameInvalid": "An emoji's name can only contain numbers, letters, and the symbols '-' and '_'.",
-  "add_emoji.nameRequired": "A name is required for the emoji",
+  "add_emoji.nameRequired": "絵文字の名前は必須です。",
   "add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
   "add_emoji.preview": "プレビュー",
   "add_emoji.preview.sentence": "This is a sentence with {image} in it.",
-  "add_emoji.save": "保存する",
+  "add_emoji.save": "保存",
   "add_incoming_webhook.cancel": "キャンセル",
   "add_incoming_webhook.channel": "チャンネル",
   "add_incoming_webhook.channelRequired": "有効なチャンネルが必要です",
@@ -160,11 +160,11 @@
   "admin.developer.title": "開発者の設定",
   "admin.email.agreeHPNS": "私はMattermostのホストするプッシュ通知サービスの<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">使用条件</a>と<a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">プライバシーポリシー</a>を理解し、承諾します。",
   "admin.email.allowEmailSignInDescription": "有効な場合、Mattermostはユーザーが電子メールアドレスとパスワードを使ってサインインをできるようにします。",
-  "admin.email.allowEmailSignInTitle": "LDAPでのログインを有効化する:",
+  "admin.email.allowEmailSignInTitle": "電子メールアドレスでのログインを有効化する:",
   "admin.email.allowSignupDescription": "有効な場合、Mattermostはチームの作成と電子メールアドレスとパスワードによる利用登録を許可します。この値は利用登録をOAuthまたはLDAPによるシングルサインオンに制限したい時のみ無効にしてください。",
   "admin.email.allowSignupTitle": "Enable account creation with email: ",
   "admin.email.allowUsernameSignInDescription": "有効な場合、Mattermostはユーザーがユーザー名とパスワードでサインインすることを許可します。この設定は電子メール確認が無効にされている場合にのみ使われます。",
-  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
+  "admin.email.allowUsernameSignInTitle": "電子メールアドレスでのログインを有効化する:",
   "admin.email.connectionSecurityTest": "接続をテストする",
   "admin.email.easHelp": "あなた自身のためのモバイルアプリをコンパイルし展開する方法を<a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">エンタープライズアプリストア</a>から学びます。",
   "admin.email.emailFail": "接続できません: {error}",
@@ -206,21 +206,21 @@
   "admin.email.selfPush": "プッシュ通知サービスの場所を手入力する",
   "admin.email.smtpPasswordDescription": "電子メールサーバーを設定するために管理者から認証情報を入手してください。",
   "admin.email.smtpPasswordExample": "例: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "SMTP Server Password:",
+  "admin.email.smtpPasswordTitle": "SMTPサーバーパスワード: ",
   "admin.email.smtpPortDescription": "SMTP電子メールサーバーのポート番号です。",
   "admin.email.smtpPortExample": "例: \"25\", \"465\"",
-  "admin.email.smtpPortTitle": "SMTP Server Port:",
+  "admin.email.smtpPortTitle": "SMTPサーバーポート:",
   "admin.email.smtpServerDescription": "SMTP電子メールサーバーの場所です。",
   "admin.email.smtpServerExample": "例: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "SMTPサーバー:",
   "admin.email.smtpUsernameDescription": "電子メールサーバーを設定するために管理者から認証情報を入手してください。",
   "admin.email.smtpUsernameExample": "例: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
-  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
+  "admin.email.smtpUsernameTitle": "SMTPサーバーのユーザー名:",
   "admin.email.testing": "テストしています…",
   "admin.false": "無効",
   "admin.file_upload.chooseFile": "ファイルを選択する",
   "admin.file_upload.noFile": "ファイルがアップロードされていません",
-  "admin.file_upload.uploadFile": "アップロードする",
+  "admin.file_upload.uploadFile": "アップロード",
   "admin.files.images": "画像",
   "admin.files.storage": "ストレージ",
   "admin.general.configuration": "設定",
@@ -233,10 +233,14 @@
   "admin.general.localization.serverLocaleTitle": "デフォルトのサーバーの言語:",
   "admin.general.log": "ログ",
   "admin.general.policy": "ポリシー",
-  "admin.general.policy.teamInviteAdmin": "チーム管理者とシステム管理者",
-  "admin.general.policy.teamInviteAll": "全てのチームメンバー",
+  "admin.general.policy.permissionsAdmin": "チーム管理者とシステム管理者",
+  "admin.general.policy.permissionsAll": "全てのチームメンバー",
+  "admin.general.policy.permissionsSystemAdmin": "システム管理者",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for private groups.<br/><br/>Selecting \"Team and System Admins\" restricts group management permissions for private groups to Team and System Admins, including creating, deleting, renaming, and setting the group header or purpose.<br/><br/>Selecting \"System Admins\" restricts group management permissions for private groups to System Admins, including creating, deleting, renaming, and setting the group header or purpose.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group management permissions for:",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for public channels.<br/><br/>Selecting \"Team and System Admins\" restricts channel management permissions for public channels to Team and System Admins, including creating, deleting, renaming, and setting the channel header or purpose.<br/><br/>Selecting \"System Admins\" restricts channel management permissions for public channels to System Admins, including creating, deleting, renaming, and setting the channel header or purpose.",
+  "admin.general.policy.restrictPublicChannelManagementTitle": "Enable public channel management permissions for:",
   "admin.general.policy.teamInviteDescription": "\"全てのチームメンバー\"を選択すると、全てのチームメンバーが招待電子メールまたはチーム招待リンクを使って他の人を招待できるようにします。<br/><br/>\"チーム管理者とシステム管理者\"を選択すると、招待電子メールとチーム招待リンクがチーム管理者またはシステム管理者ではないユーザーのメインメニューには表示されなくなります。注意: \"チーム招待リンクを入手する\"をリンクを共有するのに使用する場合、望みのユーザーが参加した後に再生成をする必要があります。<br/><br/>\"システム管理者\"を選択すると、招待電子メールとチーム招待リンクがシステム管理者ではないユーザーのメインメニューには表示されなくなります。注意: \"チーム招待リンクを入手する\"をリンクを共有するのに使用する場合、望みのユーザーが参加した後に再生成をする必要があります。",
-  "admin.general.policy.teamInviteSystemAdmin": "システム管理者",
   "admin.general.policy.teamInviteTitle": "チームへの招待ができるユーザー:",
   "admin.general.privacy": "プライバシー",
   "admin.general.usersAndTeams": "ユーザーとチーム",
@@ -247,7 +251,7 @@
   "admin.gitlab.authTitle": "認証エンドポイント:",
   "admin.gitlab.clientIdDescription": "この値はGitLabにログインする際の説明で提供されています。",
   "admin.gitlab.clientIdExample": "例: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientIdTitle": "アプリケーション名",
+  "admin.gitlab.clientIdTitle": "アプリケーション ID:",
   "admin.gitlab.clientSecretExample": "例: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.gitlab.clientSecretTitle": "Application Secret Key:",
   "admin.gitlab.enableDescription": "有効な場合、Mattermostのチームの作成と利用登録をGitLabのOAuthを使って実行できます。",
@@ -276,7 +280,7 @@
   "admin.image.localTitle": "Local Storage Directory:",
   "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
-  "admin.image.maxFileSizeTitle": "Maximum File Size:",
+  "admin.image.maxFileSizeTitle": "最大ファイルサイズ:",
   "admin.image.previewHeightDescription": "プレビューイメージの最大高さ(\"0\"を設定すると自動でサイズが決められます)を指定します。この値を変更することで、設定以降の画像サイズが変更されます。しかし設定以前の画像サイズは変更されません。",
   "admin.image.previewHeightExample": "例: \"0\"",
   "admin.image.previewHeightTitle": "Image Preview Height:",
@@ -321,7 +325,7 @@
   "admin.ldap.firstnameAttrDesc": "Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
   "admin.ldap.firstnameAttrEx": "例: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "名前(ファーストネーム)の属性値",
-  "admin.ldap.idAttrDesc": "Mattermostで重複なくユーザーを認識するために使用されるLDAPの属性値です。LDAPのこの属性値は変更されないものあるべきであり、ユーザー名やユーザーIDを使用します。この項目が変更されると、新しいMattermostアカウントが古いアカウントとは独立して作成されます。この値は、Mattermostのログイン画面の「LDAPユーザー名」欄に入力します。通常、この属性値は、上の「ユーザー名属性値」欄と同じです。あなたのチームがdomain\\\\usernameの形式を他のサービスにLDAPを使ってログインするのに使用している場合には、サイト間の一貫性を維持するためこの項目にはdomain\\\\username形式を使ってください。",
+  "admin.ldap.idAttrDesc": "Mattermostで重複なくユーザーを認識するために使用されるLDAPの属性値です。LDAPのこの属性値は変更されないものあるべきであり、ユーザー名やユーザーIDを使用します。この項目が変更されると、新しいMattermostアカウントが古いアカウントとは独立して作成されます。この値は、Mattermostのログイン画面の「LDAPユーザー名」欄に入力します。通常、この属性値は、上の「ユーザー名属性値」欄と同じです。あなたのチームがdomain\\usernameの形式を他のサービスにLDAPを使ってログインするのに使用している場合には、サイト間の一貫性を維持するためこの項目にはdomain\\username形式を使ってください。",
   "admin.ldap.idAttrEx": "例: \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID属性値:",
   "admin.ldap.lastnameAttrDesc": "Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
@@ -330,9 +334,9 @@
   "admin.ldap.loginNameDesc": "ログインページのログイン欄に表示されるプレイスホルダーテキストを設定します。\"LDAP Username\"がデフォルトです。",
   "admin.ldap.loginNameEx": "例: \"LDAP Username\"",
   "admin.ldap.loginNameTitle": "ログインフィールド名:",
-  "admin.ldap.maxPageSizeEx": "例: \"10000\"",
+  "admin.ldap.maxPageSizeEx": "例: \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.",
-  "admin.ldap.maxPageSizeTitle": "Maximum Page Size",
+  "admin.ldap.maxPageSizeTitle": "最大ファイルサイズ:",
   "admin.ldap.nicknameAttrDesc": "(オプション)Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
   "admin.ldap.nicknameAttrEx": "例: \"nickname'",
   "admin.ldap.nicknameAttrTitle": "ニックネームの属性値:",
@@ -348,8 +352,11 @@
   "admin.ldap.serverTitle": "LDAPサーバー:",
   "admin.ldap.skipCertificateVerification": "証明書の検証をしない",
   "admin.ldap.skipCertificateVerificationDesc": "TLSまたはSTARTTLSの証明書の検証ステップをスキップします。TLSが必要な本番環境では設定することは推奨されません。テスト用の設定です。",
+  "admin.ldap.syncFailure": "Sync Failure: {error}",
   "admin.ldap.syncIntervalHelpText": "LDAPの同期は、MattermostがLDAPサーバーのデータの更新を取り込む処理です。例えば、LDAPサーバーでユーザーの名前が更新された場合、同期処理が実行された際にMattermostに反映されます。LDAPサーバーでユーザーが削除された場合、そのユーザーのアクティブなセッションは削除されますし、Mattermostにログインできなくなります。Mattermostは同期処理をここで指定した時間間隔で実施します。例えば60を指定した場合、1時間ごとに同期します。設定を反映させるためには、サーバーを再起動させる必要があります。",
   "admin.ldap.syncIntervalTitle": "同期間隔(分)",
+  "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
+  "admin.ldap.sync_button": "LDAP Synchronize Now",
   "admin.ldap.uernameAttrDesc": "Mattermostのユーザー名を設定するために使用されるLDAPサーバーの属性値です。ID属性値と同じである場合があります。",
   "admin.ldap.userFilterDisc": "ユーザーオブジェクトを検索する再のLDAPフィルターを入力できます。任意項目です。これを適用したクエリーで選ばれるユーザーのみがMattermostにアクセスできます。Active Directoryでは、無効化されているユーザーを排除するには、(&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))を設定してください。",
   "admin.ldap.userFilterEx": "例: \"(objectClass=user)\"",
@@ -400,6 +407,16 @@
   "admin.notifications.email": "電子メールアドレス",
   "admin.notifications.push": "モバイルプッシュ",
   "admin.notifications.title": "通知の設定",
+  "admin.password.lowercase": "At least one lowercase letter",
+  "admin.password.minimumLength": "Minimum Password Length:",
+  "admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.",
+  "admin.password.minimumLengthExample": "例: \"25\"",
+  "admin.password.number": "At least one number",
+  "admin.password.preview": "Error message preview",
+  "admin.password.requirements": "Password Requirements:",
+  "admin.password.requirementsDescription": "Character types required in a valid password.",
+  "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
+  "admin.password.uppercase": "At least one uppercase letter",
   "admin.privacy.showEmailDescription": "無効に設定した場合には、チームオーナーやチーム管理者を含んだユーザーは、他のユーザーの電子メールアドレスをユーザーインターフェイス上で参照できません。ユーザーの連絡先を秘密にした上でチームを管理するようにセットアップしたい場合に有効にしてください。",
   "admin.privacy.showEmailTitle": "電子メールアドレスを表示する: ",
   "admin.privacy.showFullNameDescription": "無効に設定した場合には、チームオーナーやチーム管理者を含んだユーザーは、他のユーザーのフルネームをユーザーインターフェイス上で参照できません。ユーザー名がフルネームが使用される場所で使用されます。",
@@ -442,7 +459,7 @@
   "admin.saml.emailAttrEx": "Ex \"Email\" or \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "電子メール属性値:",
   "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.",
-  "admin.saml.enableTitle": "LDAPでのログインを有効化する:",
+  "admin.saml.enableTitle": "SAMLでのログインを有効化する:",
   "admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.",
   "admin.saml.encryptTitle": "Enable Encryption:",
   "admin.saml.firstnameAttrDesc": "Mattermostのユーザーの名前(ファーストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
@@ -467,7 +484,7 @@
   "admin.saml.loginButtonTextEx": "Ex \"With OKTA\"",
   "admin.saml.loginButtonTextTitle": "Login Button Text:",
   "admin.saml.nicknameAttrDesc": "(オプション)Mattermostのユーザーの苗字(ラストネーム)を設定するために使用されるLDAPサーバーの属性値です。",
-  "admin.saml.nicknameAttrEx": "例: \"nickname'",
+  "admin.saml.nicknameAttrEx": "例: \"Nickname\"",
   "admin.saml.nicknameAttrTitle": "ニックネームの属性値:",
   "admin.saml.privateKeyFileFileDesc": "The private key used to decrypt SAML Assertions from the Identity Provider.",
   "admin.saml.privateKeyFileFileRemoveDesc": "Remove the private key used to decrypt SAML Assertions from the Identity Provider.",
@@ -490,8 +507,12 @@
   "admin.save": "保存する",
   "admin.saving": "設定を保存しています…",
   "admin.security.connection": "接続",
+  "admin.security.inviteSalt.disabled": "Invite salt cannot be changed while sending emails is disabled.",
   "admin.security.login": "ログイン",
+  "admin.security.password": "パスワード",
+  "admin.security.passwordResetSalt.disabled": "Password reset salt cannot be changed while sending emails is disabled.",
   "admin.security.public_links": "公開リンク",
+  "admin.security.requireEmailVerification.disabled": "Email verification cannot be changed while sending emails is disabled.",
   "admin.security.session": "セッション",
   "admin.security.signup": "利用登録",
   "admin.select_team.close": "閉じる",
@@ -536,8 +557,8 @@
   "admin.service.sessionCacheDesc": "セッションをメモリーにキャッシュしておく期間(分)です。",
   "admin.service.sessionDaysEx": "例: \"30\"",
   "admin.service.ssoSessionDays": "Session length for GitLab SSO authentication (days):",
-  "admin.service.ssoSessionDaysDesc": "ウェブのセッションは、ここで設定された日数で失効し、ユーザーはログインし直すことになります。",
-  "admin.service.testingDescription": "[開発者用オプション] 有効な場合、テストアカウントとテストデータによる /loadtest スラッシュコマンドが使用可能になります。この設定を変更した場合、サーバーを再起動するまで設定は反映されません。",
+  "admin.service.ssoSessionDaysDesc": "GitLab SSOのセッションは、ここで設定された日数で失効し、ユーザーはログインし直すことになります。",
+  "admin.service.testingDescription": "有効な場合、テストアカウントとテストデータによる /loadtest スラッシュコマンドが使用可能になります。この設定を変更した場合、サーバーを再起動するまで設定は反映されません。",
   "admin.service.testingTitle": "Enable Testing Commands: ",
   "admin.service.webSessionDays": "Session length for email and LDAP authentication (days):",
   "admin.service.webSessionDaysDesc": "シングルサインオンのセッションは、ここで設定された日数で失効し、ユーザーはログインし直すことになります。",
@@ -571,6 +592,7 @@
   "admin.sidebar.logs": "ログ",
   "admin.sidebar.notifications": "通知",
   "admin.sidebar.other": "その他",
+  "admin.sidebar.password": "パスワード",
   "admin.sidebar.policy": "ポリシー",
   "admin.sidebar.privacy": "プライバシー",
   "admin.sidebar.publicLinks": "公開リンク",
@@ -687,6 +709,14 @@
   "admin.user_item.switchToEmail": "電子メールアドレス/パスワードに切り替える",
   "admin.user_item.sysAdmin": "システム管理者",
   "admin.user_item.teamAdmin": "チーム管理者",
+  "admin.webserverModeDisabled": "Disabled",
+  "admin.webserverModeDisabledDescription": "The Mattermost server will not serve static files.",
+  "admin.webserverModeGzip": "gzip",
+  "admin.webserverModeGzipDescription": "The Mattermost server will serve static files compressed with gzip.",
+  "admin.webserverModeHelpText": "gzip compression applies to static content files. It is recommended to enable gzip to improve performance unless your environment has specific restrictions, such as a web proxy that distributes gzip files poorly. This setting requires a server restart to take effect.",
+  "admin.webserverModeTitle": "Webserver Mode:",
+  "admin.webserverModeUncompressed": "Uncompressed",
+  "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
   "analytics.chart.loading": "読み込み中です…",
   "analytics.chart.meaningful": "意味のある表示のための十分なデータがありません。",
   "analytics.system.activeUsers": "投稿実績のあるアクティブユーザー",
@@ -776,7 +806,7 @@
   "authorize.app": "<strong>{appName}</strong>アプリケーションは、あなたの基本情報にアクセスしたり、変更したりすることができるようになります。",
   "authorize.deny": "拒否する",
   "authorize.title": "あなたの{teamName}のアカウントへアプリケーションを接続する",
-  "backstage_list.search": "検索する",
+  "backstage_list.search": "検索",
   "backstage_navbar.backToMattermost": "{siteName}に戻る",
   "backstage_sidebar.integrations": "統合機能",
   "backstage_sidebar.integrations.commands": "スラッシュコマンド",
@@ -934,9 +964,9 @@
   "create_team.team_url.teamUrl": "チームURL",
   "create_team.team_url.unavailable": "このURLは使用できません。他のものを試してください。",
   "create_team.team_url.webAddress": "あなたの新しいチームのウェブアドレスを選択してください:",
-  "custom_emoji.empty": "No custom emoji found",
+  "custom_emoji.empty": "カスタム絵文字がありません",
   "custom_emoji.header": "カスタム絵文字",
-  "custom_emoji.search": "Search Custom Emoji",
+  "custom_emoji.search": "カスタム絵文字を検索",
   "delete_channel.cancel": "キャンセル",
   "delete_channel.channel": "チャンネル",
   "delete_channel.confirm": "チャンネルの削除を確認する",
@@ -981,13 +1011,14 @@
   "email_verify.verifiedBody": "<p>あなたの電子メールアドレスは確認されました! <a href={url}>here</a>をクロックしてログインしてください。</p>",
   "email_verify.verifyFailed": "電子メールアドレスが確認できませんでした。",
   "emoji_list.actions": "アクション",
-  "emoji_list.add": "カスタム絵文字",
-  "emoji_list.creator": "Creator",
+  "emoji_list.add": "カスタム絵文字を追加",
+  "emoji_list.creator": "作成者",
   "emoji_list.delete": "削除",
-  "emoji_list.empty": "No Custom Emoji Found",
+  "emoji_list.empty": "カスタム絵文字がありません。",
+  "emoji_list.help": "Custom emoji are available to everyone on your server and will appear in the emoji autocomplete menu. Other users may need to refresh the page before new emojis appear.",
   "emoji_list.image": "画像",
   "emoji_list.name": "名前",
-  "emoji_list.search": "Search Custom Emoji",
+  "emoji_list.search": "カスタム絵文字を検索",
   "emoji_list.somebody": "Somebody on another team",
   "error.not_found.link_message": "Mattermostに戻る",
   "error.not_found.message": "あなたがアクセスしようしたページは存在しません",
@@ -1048,12 +1079,16 @@
   "installed_commands.add": "スラッシュコマンドを追加する",
   "installed_commands.empty": "スラッシュコマンドは作成されていません",
   "installed_commands.header": "スラッシュコマンド",
-  "installed_commands.search": "Search Slash Commands",
-  "installed_commands.unnamed_command": "名前の付けられていないスラッシュコマンド",
+  "installed_commands.help": "Create slash commands for use in external integrations. Please see the {link} to learn more.",
+  "installed_commands.helpLink": "documentation",
+  "installed_commands.search": "スラッシュコマンドを検索",
+  "installed_commands.unnamed_command": "名前のないスラッシュコマンド",
   "installed_incoming_webhooks.add": "内向きのウェブフックを追加する",
   "installed_incoming_webhooks.empty": "内向きのウェブフックは作成されていません",
   "installed_incoming_webhooks.header": "内向きのウェブフック",
-  "installed_incoming_webhooks.search": "Search Incoming Webhooks",
+  "installed_incoming_webhooks.help": "Create incoming webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_incoming_webhooks.helpLink": "documentation",
+  "installed_incoming_webhooks.search": "内向きのウェブフックを検索",
   "installed_incoming_webhooks.unknown_channel": "プライベートなウェブフック",
   "installed_integrations.callback_urls": "コールバックURL: {urls}",
   "installed_integrations.content_type": "Content-Type: {contentType}",
@@ -1066,7 +1101,9 @@
   "installed_outgoing_webhooks.add": "外向きのウェブフックを追加する",
   "installed_outgoing_webhooks.empty": "外向きのウェブフックは作成されていません",
   "installed_outgoing_webhooks.header": "外向きのウェブフック",
-  "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
+  "installed_outgoing_webhooks.help": "Create outgoing webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_outgoing_webhooks.helpLink": "documentation",
+  "installed_outgoing_webhooks.search": "外向きのウェブフックを検索",
   "installed_outgoing_webhooks.unknown_channel": "プライベートなウェブフック",
   "integrations.command.description": "スラッシュコマンドは外部の統合機能にイベントを送信します",
   "integrations.command.title": "スラッシュコマンド",
@@ -1185,6 +1222,7 @@
   "navbar_dropdown.help": "ヘルプ",
   "navbar_dropdown.integrations": "統合機能",
   "navbar_dropdown.inviteMember": "新しいメンバーを招待する",
+  "navbar_dropdown.leave": "Leave Team",
   "navbar_dropdown.logout": "ログアウト",
   "navbar_dropdown.manageMembers": "メンバーを管理する",
   "navbar_dropdown.report": "問題を報告する",
@@ -1320,19 +1358,20 @@
   "sidebar_right_menu.switch_team": "チームを切り替える",
   "sidebar_right_menu.teamLink": "チーム招待リンクを入手する",
   "sidebar_right_menu.teamSettings": "チームの設定",
-  "signup_team.choose": "あなたがメンバーになっているチーム: ",
+  "signup_team.choose": "Your teams: ",
   "signup_team.createTeam": "またはチームを作成する",
   "signup_team.disabled": "チーム作成機能は無効化されています。使用するにはシステム管理者に連絡してください。",
   "signup_team.join_open": "参加可能なオープンチーム: ",
   "signup_team.noTeams": "チーム一覧に含まれるチームはありません。また、チーム作成機能は無効化されています。",
-  "signup_team.no_open_teams": "No open teams have been created. Please ask your administrator for an invite.",
-  "signup_team.no_open_teams_canCreate": "No open teams have been created. Please ask your administrator for an invite or create a new team.",
+  "signup_team.no_open_teams": "No teams are available to join. Please ask your administrator for an invite.",
+  "signup_team.no_open_teams_canCreate": "No teams are available to join. Please create a new team or ask your administrator for an invite.",
   "signup_team.no_teams": "No teams have been created. Please contact your administrator.",
   "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".",
   "signup_team.none": "チーム作成方法が有効になっていません。使用するにはシステム管理者に連絡してください。",
   "signup_team_complete.completed": "この招待について、既に手続きを完了しているか、有効期限が切れています。",
   "signup_team_confirm.checkEmail": "あなたの電子メールアドレス<strong>{email}</strong>を確認してください。<br />電子メールにチームを設置するためのリンクがあります。",
   "signup_team_confirm.title": "利用登録が完了しました",
+  "signup_team_system_console": "Go to System Console",
   "signup_user_completed.choosePwd": "パスワードを入力してください",
   "signup_user_completed.chooseUser": "ユーザー名を入力してください",
   "signup_user_completed.create": "アカウントを作成する",
@@ -1388,6 +1427,7 @@
   "team_members_dropdown.confirmDemotion": "辞任することを再確認します",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"あなたのチーム\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "無効",
+  "team_members_dropdown.leave_team": "Remove From Team",
   "team_members_dropdown.makeActive": "有効にする",
   "team_members_dropdown.makeAdmin": "チーム管理者にする",
   "team_members_dropdown.makeInactive": "無効にする",
@@ -1470,7 +1510,7 @@
   "user.settings.display.channeldisplaymode": "中央のチャンネルの幅を選択してください。",
   "user.settings.display.clockDisplay": "時計表示",
   "user.settings.display.collapseDesc": "Expand links to show a preview of content, when available.",
-  "user.settings.display.collapseDisplay": "Link previews",
+  "user.settings.display.collapseDisplay": "リンクのプレビュー",
   "user.settings.display.collapseOff": "オフ",
   "user.settings.display.collapseOn": "オン",
   "user.settings.display.fixedWidthCentered": "固定幅、中央寄せ",
@@ -1511,7 +1551,7 @@
   "user.settings.general.emailHelp4": "{email}に電子メールアドレスの確認用電子メールが送信されました。",
   "user.settings.general.emailLdapCantUpdate": "LDAPでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailMatch": "あなたの入力した新しい電子メールアドレスが一致しません。",
-  "user.settings.general.emailSamlCantUpdate": "LDAPでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
+  "user.settings.general.emailSamlCantUpdate": "SAMLでログインしました。電子メールアドレスは更新できません。通知に使われる電子メールアドレスは{email}です。",
   "user.settings.general.emailUnchanged": "あなたの新しい電子メールアドレスは、古いものと変わっていません。",
   "user.settings.general.emptyName": "フルネームを追加するには「編集する」をクリックしてください",
   "user.settings.general.emptyNickname": "ニックネームを追加するには「編集する」をクリックしてください",
@@ -1523,7 +1563,7 @@
   "user.settings.general.lastName": "苗字(ラストネーム)",
   "user.settings.general.loginGitlab": "GitLabでログインしました({email})",
   "user.settings.general.loginLdap": "LDAPでログインしました({email})",
-  "user.settings.general.loginSaml": "LDAPでログインしました({email})",
+  "user.settings.general.loginSaml": "SAMLでログインしました({email})",
   "user.settings.general.newAddress": "新しい電子メールアドレス: {email}<br />この電子メールアドレスを確認するために電子メールを確認してください。",
   "user.settings.general.nickname": "ニックネーム",
   "user.settings.general.nicknameExtra": "ニックネームを使用する(氏名とは異なります)。これにより、同じような氏名とユーザー名を持つ人たちを区別しやすくなります。",
@@ -1606,17 +1646,33 @@
   "user.settings.security.newPassword": "新しいパスワード",
   "user.settings.security.oneSignin": "一度に一つのサインイン方法のみが選択可能です。サインイン方法を変更すると、変更完了時に電子メールで通知が送られます。",
   "user.settings.security.password": "パスワード",
+  "user.settings.security.passwordError": "Your password must contain at least {min} characters.",
+  "user.settings.security.passwordErrorLowercase": "Your password must contain at least {min} characters made up of at least one lowercase letter.",
+  "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one number.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one uppercase letter.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorNumber": "Your password must contain at least {min} characters made up of at least one number.",
+  "user.settings.security.passwordErrorNumberSymbol": "Your password must contain at least {min} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorSymbol": "Your password must contain at least {min} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercase": "Your password must contain at least {min} characters made up of at least one uppercase letter.",
+  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one number.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "GitLabでログインしています。パスワードは更新できません。",
   "user.settings.security.passwordLdapCantUpdate": "LDAPでログインしています。パスワードは更新できません。",
-  "user.settings.security.passwordLengthError": "新しいパスワードは、少なくとも{chars}文字にしてください",
   "user.settings.security.passwordMatchError": "あなたの入力した新しい電子メールアドレスが一致しません。",
+  "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
   "user.settings.security.retypePassword": "新しいパスワードをもう一度入力してください",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "電子メールアドレスとパスワードでのログインに切り替える",
   "user.settings.security.switchGitlab": "GitLabシングルサインオンに切り替える",
   "user.settings.security.switchGoogle": "Googleシングルサインオンに切り替える",
   "user.settings.security.switchLdap": "LDAPシングルサインオンに切り替える",
-  "user.settings.security.switchSaml": "GitLabシングルサインオンに切り替える",
+  "user.settings.security.switchSaml": "SAMLシングルサインオンに切り替える",
   "user.settings.security.title": "セキュリティーの設定",
   "user.settings.security.viewHistory": "アクセス履歴を見る",
   "user_list.notFound": "ユーザーが見付かりません",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 88c43c724..a10e3bd10 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -66,17 +66,17 @@
   "add_command.username.placeholder": "Usuário",
   "add_emoji.cancel": "Cancelar",
   "add_emoji.header": "Adicionar",
-  "add_emoji.image": "Imagens",
+  "add_emoji.image": "Imagem",
   "add_emoji.image.button": "Selecionar",
-  "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 64 KB and dimensions up to 128 by 128 pixels.",
-  "add_emoji.imageRequired": "An image is required for the emoji",
+  "add_emoji.image.help": "Escolha a imagem para o seu emoji. A imagem pode ser em um arquivo gif, png or jpeg com tamanho máximo de 64 KB and dimensões de até 128 por 128 pixels.",
+  "add_emoji.imageRequired": "Uma imagem é necessária para o emoji",
   "add_emoji.name": "Nome",
-  "add_emoji.name.help": "Choose a name for your emoji made of up to 64 characters consisting of lowercase letters, numbers, and the symbols '-' and '_'.",
-  "add_emoji.nameInvalid": "An emoji's name can only contain numbers, letters, and the symbols '-' and '_'.",
-  "add_emoji.nameRequired": "A name is required for the emoji",
-  "add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
+  "add_emoji.name.help": "Escolha um nome para o seu emoji que pode ter até 64 letras minúsculas, números, e símbolos '-' e '_'.",
+  "add_emoji.nameInvalid": "Os nomes dos emojis apenas podem conter números, letras e os símbolos '-' e '_'.",
+  "add_emoji.nameRequired": "Um nome é necessário para o emoji",
+  "add_emoji.nameTaken": "Este nome já está sendo usado por um emoji do sistema. Por Favor escolha outro nome.",
   "add_emoji.preview": "Pré-visualização",
-  "add_emoji.preview.sentence": "This is a sentence with {image} in it.",
+  "add_emoji.preview.sentence": "Esta é uma frase com a {image} nela.",
   "add_emoji.save": "Salvar",
   "add_incoming_webhook.cancel": "Cancelar",
   "add_incoming_webhook.channel": "Canal",
@@ -106,11 +106,11 @@
   "admin.banner.heading": "Nota:",
   "admin.compliance.directoryDescription": "Diretório o qual os relatórios compliance são gravados. Se estiver em branco, será usado ./data/.",
   "admin.compliance.directoryExample": "Ex \"./data/\"",
-  "admin.compliance.directoryTitle": "Compliance Report Directory:",
+  "admin.compliance.directoryTitle": "Diretório de Relatórios de conformidade:",
   "admin.compliance.enableDailyDesc": "Quando verdadeiro, Mattermost irá gerar um relatório diário de compliance.",
   "admin.compliance.enableDailyTitle": "Ativar Relatório Diário:",
   "admin.compliance.enableDesc": "Quando verdadeiro, Mattermost permite relatório compliance",
-  "admin.compliance.enableTitle": "Enable Compliance Reporting:",
+  "admin.compliance.enableTitle": "Habilitar Relatórios de Conformidade:",
   "admin.compliance.false": "falso",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>Compliance é um recurso enterprise. Sua licença atual não suporta Compliance. Clique <a href=\"http://mattermost.com\" target=\"_blank\">aqui</a> para informações e preços da licença enterprise.</p>",
   "admin.compliance.save": "Salvar",
@@ -148,9 +148,9 @@
   "admin.connectionSecurityTlsDescription": "Encriptar a comunicação entre Mattermost e o seu servidor.",
   "admin.customization.customBrand": "Marca Personalizada",
   "admin.customization.customEmoji": "Emoji Personalizado",
-  "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting \"Custom Emoji\".",
+  "admin.customization.enableCustomEmojiDesc": "Habilitar para os usuários a criação de emoji personalizados para usar nas mensagens. Quando habilitado, as configurações dos Emoji personalizados podem ser acessadas trocando para Time e clicando nos três pontos encima do canal, e selecionando \"Emoji Personalizados\".",
   "admin.customization.enableCustomEmojiTitle": "Ativar Emoji Personalizado:",
-  "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji",
+  "admin.customization.restrictCustomEmojiCreationAdmin": "Habilitar criação de emoji personalizados para Administradores de Sistemas e de Times ",
   "admin.customization.restrictCustomEmojiCreationAll": "Permitir que todos possam criar emoji personalizados",
   "admin.customization.restrictCustomEmojiCreationDesc": "Restringir a criação de emoji personalizado para determinados usuários.",
   "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Permitir que apenas administradores de sistema possam criar emoji personalizados",
@@ -160,11 +160,11 @@
   "admin.developer.title": "Configurações de Desenvolvedor",
   "admin.email.agreeHPNS": " Eu entendo e aceito o serviço de notificação push Mattermost Hosted<a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Termos do Serviço</a> e <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Politica de Privacidade</a>.",
   "admin.email.allowEmailSignInDescription": "Quando verdadeiro, Mattermost permite aos usuários fazer login usando o e-mail e senha.",
-  "admin.email.allowEmailSignInTitle": "Ativar Login With LDAP:",
+  "admin.email.allowEmailSignInTitle": "Habilitar Login por email:",
   "admin.email.allowSignupDescription": "Quando verdadeiro, Mattermost permite a criação de equipe e conta de inscrição através de e-mail e senha.  Este valor deve ser falso somente quando você deseja limitar a entrada para o single-sign-on service como OAuth ou LDAP.",
-  "admin.email.allowSignupTitle": "Enable account creation with email: ",
+  "admin.email.allowSignupTitle": "Habilitar criação de contas com email: ",
   "admin.email.allowUsernameSignInDescription": "Quando verdadeiro, Mattermost permite os usuários fazer login usando seu nome de usuário e senha.  Esta configuração é normalmente utilizado apenas quando a verificação de e-mail está desativada.",
-  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
+  "admin.email.allowUsernameSignInTitle": "Habilitar Login com nome de usuário:",
   "admin.email.connectionSecurityTest": "Testar Conexão",
   "admin.email.easHelp": "Leia mais sobre compilar e publicar seu próprio aplicativo móvel em <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
   "admin.email.emailFail": "Conexão falhou: {error}",
@@ -188,7 +188,7 @@
   "admin.email.notificationOrganization": "Notificação Endereço Rodapé",
   "admin.email.notificationOrganizationDescription": "Nome da empresa e endereço de email mostrado nas notificações do Mattermost, como \"® Empresa ABC, Av. Paulista, 1000, São Paulo, SP, 12345-150, BRA\". Se este campo for deixado em branco, o nome da organização e endereço não será mostrado.",
   "admin.email.notificationsDescription": "Normalmente definido como verdadeiro em produção. Quando verdadeiro, Mattermost tenta enviar notificações por e-mail. Os desenvolvedores podem definir este campo como falso para ignorar configuração de e-mail para o desenvolvimento mais rápido.<br /> A definição deste como verdadeiro remove a bandeira modo de visualização (requer sair e entrar novamente após a alteração).",
-  "admin.email.notificationsTitle": "Enviar Notificações por E-mail: ",
+  "admin.email.notificationsTitle": "Habilitar Notificações por E-mail: ",
   "admin.email.passwordSaltDescription": "Salt de 32-caracteres adicionado para assinar o redefinição de senha por e-mail. Gerada aleatoriamente na instalação. Clique em \"Re-Gerar\" para criar um novo salt.",
   "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Salt Reset Senha:",
@@ -200,25 +200,25 @@
   "admin.email.pushServerDesc": "Localização do serviço de notificação push Mattermost você pode configurar por trás do firewall usando https://github.com/mattermost/push-proxy. Para testar, você pode usar http://push-test.mattermost.com, que liga à amostra do app Mattermost iOS na Apple AppStore pública. Por favor, não use o serviço de teste para implantações de produção.",
   "admin.email.pushServerEx": "Ex: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "Servidor de Notificação Push:",
-  "admin.email.pushTitle": "Enviar Notificações Push: ",
+  "admin.email.pushTitle": "Habilitar Notificações por Push: ",
   "admin.email.requireVerificationDescription": "Normalmente definido como verdadeiro em produção. Quando verdadeiro, Mattermost requer a verificação de e-mail após a criação da conta antes de permitir login. Os desenvolvedores podem definir este campo como falso para ignorar o envio de e-mails de verificação para o desenvolvimento mais rápido.",
   "admin.email.requireVerificationTitle": "Requer Verificação de E-mail: ",
   "admin.email.selfPush": "Manualmente entre a localização do Serviço de Notificação Push",
   "admin.email.smtpPasswordDescription": " Obter essa credencial do administrador das configurações do servidor de email.",
   "admin.email.smtpPasswordExample": "Ex: \"suasenha\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.email.smtpPasswordTitle": "SMTP Server Password:",
+  "admin.email.smtpPasswordTitle": "Senha do Servidor de SMTP:",
   "admin.email.smtpPortDescription": "Porta do servidor de e-mail SMTP.",
   "admin.email.smtpPortExample": "Ex: \"25\", \"465\"",
-  "admin.email.smtpPortTitle": "SMTP Server Port:",
+  "admin.email.smtpPortTitle": "Porta do Servidor de SMTP:",
   "admin.email.smtpServerDescription": "Localização do servidor de e-mail SMTP.",
   "admin.email.smtpServerExample": "Ex: \"smtp.suaempresa.com\", \"email-smtp.us-east-1.amazonaws.com\"",
   "admin.email.smtpServerTitle": "Servidor SMTP:",
   "admin.email.smtpUsernameDescription": " Obter essa credencial do administrador das configurações do servidor de email.",
   "admin.email.smtpUsernameExample": "Ex: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
-  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
+  "admin.email.smtpUsernameTitle": "Nome do Usuário do Servidor de SMTP:",
   "admin.email.testing": "Testando...",
   "admin.false": "falso",
-  "admin.file_upload.chooseFile": "Escolha o Arquivo",
+  "admin.file_upload.chooseFile": "Escolher Arquivo",
   "admin.file_upload.noFile": "Nenhum arquivo enviado",
   "admin.file_upload.uploadFile": "Enviar",
   "admin.files.images": "Imagens",
@@ -233,10 +233,14 @@
   "admin.general.localization.serverLocaleTitle": "Idioma Padrão do Servidor:",
   "admin.general.log": "Carregando",
   "admin.general.policy": "Política",
-  "admin.general.policy.teamInviteAdmin": "Administradores de Equipe e Sistema",
-  "admin.general.policy.teamInviteAll": "Todos os membros da equipe",
+  "admin.general.policy.permissionsAdmin": "Administradores de Time e Sistema",
+  "admin.general.policy.permissionsAll": "Todos os membros da equipe",
+  "admin.general.policy.permissionsSystemAdmin": "Administrador de Sistema",
+  "admin.general.policy.restrictPrivateChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for private groups.<br/><br/>Selecting \"Team and System Admins\" restricts group management permissions for private groups to Team and System Admins, including creating, deleting, renaming, and setting the group header or purpose.<br/><br/>Selecting \"System Admins\" restricts group management permissions for private groups to System Admins, including creating, deleting, renaming, and setting the group header or purpose.",
+  "admin.general.policy.restrictPrivateChannelManagementTitle": "Habilitar permissões de administração do canal privado para:",
+  "admin.general.policy.restrictPublicChannelManagementDescription": "Selecting \"All team members\" allows any team members to create, delete, rename, and set the header or purpose for public channels.<br/><br/>Selecting \"Team and System Admins\" restricts channel management permissions for public channels to Team and System Admins, including creating, deleting, renaming, and setting the channel header or purpose.<br/><br/>Selecting \"System Admins\" restricts channel management permissions for public channels to System Admins, including creating, deleting, renaming, and setting the channel header or purpose.",
+  "admin.general.policy.restrictPublicChannelManagementTitle": "Habilitar permissões de administração do canal público para:",
   "admin.general.policy.teamInviteDescription": "Selecionando \"Todos os membros da equipe\" permite que qualquer membro da equipe convide outras pessoas usando um convite por email ou link para convite de equipe.<br/><br/>Selecionando \"Administradores de Sistema e Equipe\" esconde o convite por e-mail e o link para convite de equipe do menu principal dos usuários que não são administradores  de sistema ou equipe. Nota: Se \"Obter Link para Convite de Equipe\" for usado para compartilhar um link, ele terá de ser gerado novamente depois que os usuários desejados se juntaram-se a equipe.<br/><br/>Selecionando \"Administradores do Sistema\" esconde o convite por e-mail e link para convite de equipe do menu principal para os usuários que não são Administradores de Sistema. Nota: Se \"Obter Link para Convite de Equipe\" for usado para compartilhar um link, ele terá de ser gerado novamente depois que os usuários desejados juntaram-se a equipe.",
-  "admin.general.policy.teamInviteSystemAdmin": "Administrador do Sistema",
   "admin.general.policy.teamInviteTitle": "Permitir o envio de convites de equipe para:",
   "admin.general.privacy": "Privacidade",
   "admin.general.usersAndTeams": "Usuários e Equipes",
@@ -247,11 +251,11 @@
   "admin.gitlab.authTitle": "Autenticação Endpoint:",
   "admin.gitlab.clientIdDescription": "Obter este valor de acordo com as instruções acima para logar no GitLab",
   "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientIdTitle": "Nome do Aplicativo",
+  "admin.gitlab.clientIdTitle": "ID do aplicativo:",
   "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "Application Secret Key:",
+  "admin.gitlab.clientSecretTitle": "Chave secreta do aplicativo:",
   "admin.gitlab.enableDescription": "Quando verdadeiro, Mattermost permite a criação de equipes e inscrições de conta usando GitLab OAuth.",
-  "admin.gitlab.enableTitle": "Enable authentication with GitLab: ",
+  "admin.gitlab.enableTitle": "Habilitar autenticação com o GitLab: ",
   "admin.gitlab.settingsTitle": "Configurações GitLab",
   "admin.gitlab.tokenDescription": "Digite https://<your-gitlab-url>/oauth/token.  Certifique-se de usar HTTP ou HTTPS na sua URL dependendo da configuração de seu servidor.",
   "admin.gitlab.tokenExample": "Ex \"https://<your-gitlab-url>/oauth/token\"",
@@ -264,7 +268,7 @@
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
   "admin.image.amazonS3IdDescription": "Obter essa credencial do seu administrador Amazon EC2.",
   "admin.image.amazonS3IdExample": "Ex \"AKIADTOVBGERKLCBV\"",
-  "admin.image.amazonS3IdTitle": "Amazon S3 Access Key Id:",
+  "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
   "admin.image.amazonS3RegionDescription": "Região AWS selecionada para a criação do seu S3 bucket.",
   "admin.image.amazonS3RegionExample": "Ex \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
@@ -273,31 +277,31 @@
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
   "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
   "admin.image.localExample": "Ex \"./data/\"",
-  "admin.image.localTitle": "Local Storage Directory:",
+  "admin.image.localTitle": "Pasta de Armazenamento Local:",
   "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
   "admin.image.maxFileSizeExample": "50",
-  "admin.image.maxFileSizeTitle": "Maximum File Size:",
+  "admin.image.maxFileSizeTitle": "Tamanho Máximo do Arquivo:",
   "admin.image.previewHeightDescription": "Altura máxima da imagem de pré-visualização (\"0\": Define como tamanho automático). Atualizando este valor muda como as imagens de pré-visualização serão exibidas no futuro, mas não altera as imagens já criadas.",
   "admin.image.previewHeightExample": "Ex \"0\"",
-  "admin.image.previewHeightTitle": "Image Preview Height:",
+  "admin.image.previewHeightTitle": "Altura da Visualização da Imagem:",
   "admin.image.previewWidthDescription": "Largura máxima da imagem de pré-visualização. Atualizando este valor muda como as imagens de pré-visualização serão mostradas no futuro, mas não altera as imagens já criadas.",
   "admin.image.previewWidthExample": "Ex \"1024\"",
-  "admin.image.previewWidthTitle": "Profile Picture Width:",
+  "admin.image.previewWidthTitle": "Largura da Imagem do Perfil:",
   "admin.image.profileHeightDescription": "Altura da imagem do perfil.",
   "admin.image.profileHeightExample": "Ex \"0\"",
-  "admin.image.profileHeightTitle": "Profile Picture Height:",
+  "admin.image.profileHeightTitle": "Altura da Imagem do Perfil:",
   "admin.image.profileWidthDescription": "Largura do imagem do perfil.",
   "admin.image.profileWidthExample": "Ex \"1024\"",
-  "admin.image.profileWidthTitle": "Image Preview Width:",
+  "admin.image.profileWidthTitle": "Largura da Visualização da Imagem:",
   "admin.image.publicLinkDescription": "Salt de 32-caracteres adicionados a assinatura de links de imagens públicas. Aleatoriamente gerados na instalação. Click \"Re-Gerar\" para criar um novo salt.",
   "admin.image.publicLinkExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Link Público Salt:",
   "admin.image.shareDescription": "Permitir aos usuários compartilhar links públicos para arquivos e imagens.",
-  "admin.image.shareTitle": "Compartilhar Link Arquivo: ",
+  "admin.image.shareTitle": "Ativar Links para Arquivos Públicos: ",
   "admin.image.storeAmazonS3": "Amazon S3",
   "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
   "admin.image.storeLocal": "Sistema de Arquivos Local",
-  "admin.image.storeTitle": "File Storage System:",
+  "admin.image.storeTitle": "Sistema de Armazenamento de Arquivo:",
   "admin.image.thumbHeightDescription": "Altura dos thumbnails gerados das imagens enviadas. Atualizando este valor muda como o thumbnail das imagens serão geradas no futuro, mas não muda as imagens já criadas no passado.",
   "admin.image.thumbHeightExample": "Ex \"100\"",
   "admin.image.thumbHeightTitle": "Attachment Thumbnail Height:",
@@ -317,22 +321,22 @@
   "admin.ldap.emailAttrEx": "Ex \"mail\" ou \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "Atributo de E-mail:",
   "admin.ldap.enableDesc": "Quando verdadeiro, Mattermost permite login utilizando LDAP",
-  "admin.ldap.enableTitle": "Ativar Login With LDAP:",
+  "admin.ldap.enableTitle": "Ativar login with LDAP:",
   "admin.ldap.firstnameAttrDesc": "O atributo no servidor LDAP será usado para preencher o primeiro nome dos usuários no Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "Primeiro Nome do Atributo",
-  "admin.ldap.idAttrDesc": "O atributo no servidor LDAP que vai ser utilizado como um identificador único no Mattermost. Ele deve ser um atributo LDAP com um valor que não muda, como nome de usuário ou uid. Se atributo Id do usuário mudar, isto irá criar uma nova conta Mattermost não associada com a sua antiga. Este é o valor utilizado para efetuar login no Mattermost no campo \"Nome de usuário LDAP\" na página de login. Normalmente, este atributo é o mesmo que o campo “Atributo Nome de Usuário” acima. Se sua equipe usa tipicamente de domínio\\\\nome de usuário para fazer login em outros serviços com LDAP, você pode optar por colocar domínio\\\\nome de usuário neste campo para manter a consistência entre sites.",
+  "admin.ldap.idAttrDesc": "O atributo no servidor LDAP que vai ser utilizado como um identificador único no Mattermost. Ele deve ser um atributo LDAP com um valor que não muda, como nome de usuário ou uid. Se atributo Id do usuário mudar, isto irá criar uma nova conta Mattermost não associada com a sua antiga. Este é o valor utilizado para efetuar login no Mattermost no campo \"Nome de usuário LDAP\" na página de login. Normalmente, este atributo é o mesmo que o campo “Atributo Nome de Usuário” acima. Se sua equipe usa tipicamente de domínio\\nome de usuário para fazer login em outros serviços com LDAP, você pode optar por colocar domínio\\nome de usuário neste campo para manter a consistência entre os sites.",
   "admin.ldap.idAttrEx": "Ex \"sAMAccountName\"",
-  "admin.ldap.idAttrTitle": "Atributo Id: ",
+  "admin.ldap.idAttrTitle": "Atributo ID: ",
   "admin.ldap.lastnameAttrDesc": "O atributo no servidor LDAP será usado para preencher o último nome dos usuários no Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ex \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Atributo Último Nome:",
   "admin.ldap.loginNameDesc": "O texto placeholder que aparece no campo de login na página de login. O padrão é \"Usuário LDAP\".",
   "admin.ldap.loginNameEx": "Ex \"Usuário LDAP\"",
   "admin.ldap.loginNameTitle": "Nome do Campo Login:",
-  "admin.ldap.maxPageSizeEx": "Ex \"10000\"",
+  "admin.ldap.maxPageSizeEx": "Ex \"2000\"",
   "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.",
-  "admin.ldap.maxPageSizeTitle": "Maximum Page Size",
+  "admin.ldap.maxPageSizeTitle": "Tamanho Máximo do Arquivo:",
   "admin.ldap.nicknameAttrDesc": "(Opcional) O atributo no servidor LDAP que será usado para preencher o apelido dos usuários no Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
   "admin.ldap.nicknameAttrTitle": "Atributo Apelido:",
@@ -348,8 +352,11 @@
   "admin.ldap.serverTitle": "Servidor LDAP:",
   "admin.ldap.skipCertificateVerification": "Pular a Verificação do Certificado",
   "admin.ldap.skipCertificateVerificationDesc": "Pula a etapa de verificação do certificado para conexões TLS ou STARTTLS. Não recomentado para ambientes de produção onde TLS é necessário. Apenas para teste.",
+  "admin.ldap.syncFailure": "Sync Failure: {error}",
   "admin.ldap.syncIntervalHelpText": "Sincronização LDAP é o processo pelo qual Mattermost atualiza seus usuários para refletir quaisquer dados atualizados no servidor LDAP. Por exemplo, se um nome de um usuário é atualizado no servidor LDAP, a alteração será refletida no Mattermost quando a sincronização é executada. As contas que tenham sido removidas do servidor LDAP terão suas sessões ativas apagada e não será mais capaz para acessar Mattermost. Mattermost irá realizar a sincronização regularmente, de acordo com o intervalo fornecido aqui. Por exemplo, se 60 é fornecido, Mattermost irá atualizar os usuários cada hora. Alterar isso exigirá um reinício do servidor para que tenha efeito.",
   "admin.ldap.syncIntervalTitle": "Intervalo de Sincronização (em Minutos)",
+  "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
+  "admin.ldap.sync_button": "LDAP Synchronize Now",
   "admin.ldap.uernameAttrDesc": "O atributo no servidor LDAP que será usado para preencher o campo nome de usuário no Mattermost. Este pode ser o mesmo que o Atributo ID.",
   "admin.ldap.userFilterDisc": "Opcionalmente, insira um filtro LDAP para usar ao procurar por objetos de usuário. Somente os usuários selecionados pela consulta serão capazes de acessar o Mattermost. Para o Active Directory, a consulta para filtrar os usuários desativados é (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
@@ -400,6 +407,16 @@
   "admin.notifications.email": "E-mail",
   "admin.notifications.push": "Notificação Móvel",
   "admin.notifications.title": "Configurações de Notificação",
+  "admin.password.lowercase": "At least one lowercase letter",
+  "admin.password.minimumLength": "Minimum Password Length:",
+  "admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.",
+  "admin.password.minimumLengthExample": "Ex \"25\"",
+  "admin.password.number": "At least one number",
+  "admin.password.preview": "Error message preview",
+  "admin.password.requirements": "Password Requirements:",
+  "admin.password.requirementsDescription": "Character types required in a valid password.",
+  "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
+  "admin.password.uppercase": "At least one uppercase letter",
   "admin.privacy.showEmailDescription": "Quando falso, esconde endereço de e-mail dos outros usuários na interface do usuário, incluindo donos da equipe e administradores da equipe. Usado quando o sistema está configurado para gerenciar equipes onde alguns usuários optam por manter suas informações de contato privado.",
   "admin.privacy.showEmailTitle": "Mostrar Endereços de Email: ",
   "admin.privacy.showFullNameDescription": "Quando falso, oculta o nome completo dos usuários dos outros usuários, incluindo donos de equipe e administradores de equipe. Nome de usuário é mostrado no lugar do nome completo.",
@@ -490,8 +507,12 @@
   "admin.save": "Salvar",
   "admin.saving": "Salvando Config...",
   "admin.security.connection": "Conexões",
+  "admin.security.inviteSalt.disabled": "Invite salt cannot be changed while sending emails is disabled.",
   "admin.security.login": "Login",
+  "admin.security.password": "Senha",
+  "admin.security.passwordResetSalt.disabled": "Password reset salt cannot be changed while sending emails is disabled.",
   "admin.security.public_links": "Links Públicos",
+  "admin.security.requireEmailVerification.disabled": "Email verification cannot be changed while sending emails is disabled.",
   "admin.security.session": "Sessões",
   "admin.security.signup": "Inscrever-se",
   "admin.select_team.close": "Fechar",
@@ -571,6 +592,7 @@
   "admin.sidebar.logs": "Logs",
   "admin.sidebar.notifications": "Notificações",
   "admin.sidebar.other": "OUTROS",
+  "admin.sidebar.password": "Senha",
   "admin.sidebar.policy": "Política",
   "admin.sidebar.privacy": "Privacidade",
   "admin.sidebar.publicLinks": "Links Públicos",
@@ -687,6 +709,14 @@
   "admin.user_item.switchToEmail": "Trocar para Email/Senha",
   "admin.user_item.sysAdmin": "Admin do Sistema",
   "admin.user_item.teamAdmin": "Admin Equipe",
+  "admin.webserverModeDisabled": "Disabled",
+  "admin.webserverModeDisabledDescription": "The Mattermost server will not serve static files.",
+  "admin.webserverModeGzip": "gzip",
+  "admin.webserverModeGzipDescription": "The Mattermost server will serve static files compressed with gzip.",
+  "admin.webserverModeHelpText": "gzip compression applies to static content files. It is recommended to enable gzip to improve performance unless your environment has specific restrictions, such as a web proxy that distributes gzip files poorly. This setting requires a server restart to take effect.",
+  "admin.webserverModeTitle": "Webserver Mode:",
+  "admin.webserverModeUncompressed": "Uncompressed",
+  "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
   "analytics.chart.loading": "Carregando...",
   "analytics.chart.meaningful": "Não há dados suficientes para uma representação significativa.",
   "analytics.system.activeUsers": "Usuários Ativos Com Posts",
@@ -985,6 +1015,7 @@
   "emoji_list.creator": "Creator",
   "emoji_list.delete": "Deletar",
   "emoji_list.empty": "No Custom Emoji Found",
+  "emoji_list.help": "Custom emoji are available to everyone on your server and will appear in the emoji autocomplete menu. Other users may need to refresh the page before new emojis appear.",
   "emoji_list.image": "Imagens",
   "emoji_list.name": "Nome",
   "emoji_list.search": "Search Custom Emoji",
@@ -1048,11 +1079,15 @@
   "installed_commands.add": "Adicionar Comando Slash",
   "installed_commands.empty": "Nenhum comando encotrado",
   "installed_commands.header": "Comandos Slash",
+  "installed_commands.help": "Create slash commands for use in external integrations. Please see the {link} to learn more.",
+  "installed_commands.helpLink": "documentation",
   "installed_commands.search": "Search Slash Commands",
   "installed_commands.unnamed_command": "Comando Slash sem Nome",
   "installed_incoming_webhooks.add": "Adicionar Webhooks Entrada",
   "installed_incoming_webhooks.empty": "Nenhum webhook de entrada encontrado",
   "installed_incoming_webhooks.header": "Webhooks Entrada",
+  "installed_incoming_webhooks.help": "Create incoming webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_incoming_webhooks.helpLink": "documentation",
   "installed_incoming_webhooks.search": "Search Incoming Webhooks",
   "installed_incoming_webhooks.unknown_channel": "Webhook Privado",
   "installed_integrations.callback_urls": "Callback URLs: {urls}",
@@ -1066,6 +1101,8 @@
   "installed_outgoing_webhooks.add": "Adicionar Webhooks Saída",
   "installed_outgoing_webhooks.empty": "Nenhum webhook de saída encontrado",
   "installed_outgoing_webhooks.header": "Webhooks Saída",
+  "installed_outgoing_webhooks.help": "Create outgoing webhook URLs for use in external integrations. Please see the {link} to learn more.",
+  "installed_outgoing_webhooks.helpLink": "documentation",
   "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
   "installed_outgoing_webhooks.unknown_channel": "Webhook Privado",
   "integrations.command.description": "Comandos slash envia evento para integrações externas",
@@ -1185,6 +1222,7 @@
   "navbar_dropdown.help": "Ajuda",
   "navbar_dropdown.integrations": "Integrações",
   "navbar_dropdown.inviteMember": "Convidar Membros da Equipe",
+  "navbar_dropdown.leave": "Leave Team",
   "navbar_dropdown.logout": "Logout",
   "navbar_dropdown.manageMembers": "Gerenciar Membros",
   "navbar_dropdown.report": "Relatar um Problema",
@@ -1320,19 +1358,20 @@
   "sidebar_right_menu.switch_team": "Selecionar Equipe",
   "sidebar_right_menu.teamLink": "Obter Link para Convite de Equipe",
   "sidebar_right_menu.teamSettings": "Configurações da Equipe",
-  "signup_team.choose": "Equipes que você é um membro: ",
+  "signup_team.choose": "Your teams: ",
   "signup_team.createTeam": "Ou Criar uma Equipe",
   "signup_team.disabled": "A criação de equipe foi desativada.  Por favor, entre em contato com um administrador para o acesso.",
   "signup_team.join_open": "Equipes abertas que você pode se juntar: ",
   "signup_team.noTeams": "Não existe equipes incluídas no Diretório de Equipe e a criação de equipes foi desativada.",
-  "signup_team.no_open_teams": "No open teams have been created. Please ask your administrator for an invite.",
-  "signup_team.no_open_teams_canCreate": "No open teams have been created. Please ask your administrator for an invite or create a new team.",
+  "signup_team.no_open_teams": "No teams are available to join. Please ask your administrator for an invite.",
+  "signup_team.no_open_teams_canCreate": "No teams are available to join. Please create a new team or ask your administrator for an invite.",
   "signup_team.no_teams": "No teams have been created. Please contact your administrator.",
   "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".",
   "signup_team.none": "Nenhum método de criação da equipe foi habilitado.  Por favor, entre em contato com um administrador para o acesso.",
   "signup_team_complete.completed": "Você já concluiu o processo de inscrição para este convite ou este convite expirou.",
   "signup_team_confirm.checkEmail": "Por favor, verifique seu e-mail: <strong>{email}</strong><br />Seu e-mail contém um link para configurar a sua equipe",
   "signup_team_confirm.title": "Inscrição Completa",
+  "signup_team_system_console": "Go to System Console",
   "signup_user_completed.choosePwd": "Escolha sua senha",
   "signup_user_completed.chooseUser": "Escolha o seu nome de usuário",
   "signup_user_completed.create": "Criar Conta",
@@ -1388,6 +1427,7 @@
   "team_members_dropdown.confirmDemotion": "Confirmar Rebaixamento",
   "team_members_dropdown.confirmDemotionCmd": "platform -assign_role -team_name=\"yourteam\" -email=\"name@yourcompany.com\" -role=\"system_admin\"",
   "team_members_dropdown.inactive": "Inativo",
+  "team_members_dropdown.leave_team": "Remove From Team",
   "team_members_dropdown.makeActive": "Tornar Ativo",
   "team_members_dropdown.makeAdmin": "Tornar Admin de Equipe",
   "team_members_dropdown.makeInactive": "Tornar Inativo",
@@ -1606,10 +1646,26 @@
   "user.settings.security.newPassword": "Nova Senha",
   "user.settings.security.oneSignin": "Você pode ter somente um método de login por vez. Trocando o método de login será enviado um email de notificação se você alterar com sucesso.",
   "user.settings.security.password": "Senha",
+  "user.settings.security.passwordError": "Your password must contain at least {min} characters.",
+  "user.settings.security.passwordErrorLowercase": "Your password must contain at least {min} characters made up of at least one lowercase letter.",
+  "user.settings.security.passwordErrorLowercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one number.",
+  "user.settings.security.passwordErrorLowercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercase": "Your password must contain at least {min} characters made up of at least one lowercase letter and at least one uppercase letter.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumber": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number.",
+  "user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorLowercaseUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorNumber": "Your password must contain at least {min} characters made up of at least one number.",
+  "user.settings.security.passwordErrorNumberSymbol": "Your password must contain at least {min} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorSymbol": "Your password must contain at least {min} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercase": "Your password must contain at least {min} characters made up of at least one uppercase letter.",
+  "user.settings.security.passwordErrorUppercaseNumber": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one number.",
+  "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").",
+  "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
   "user.settings.security.passwordGitlabCantUpdate": "Login ocorreu através do GitLab. Senha não pode ser atualizada.",
   "user.settings.security.passwordLdapCantUpdate": "Login ocorreu através de LDAP. Senha não pode ser atualizada.",
-  "user.settings.security.passwordLengthError": "Novas senhas precisam ter pelo menos {chars} characters",
   "user.settings.security.passwordMatchError": "As novas senhas que você inseriu não correspondem",
+  "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
   "user.settings.security.retypePassword": "Digite Novamente a nova Senha",
   "user.settings.security.saml": "SAML",
   "user.settings.security.switchEmail": "Trocar para usar email e senha",