Merge release 3.2 into master (#3548)

* Bumping version to: 3.2.0-rc1

* PLT-2863 fixing bad merge that broke this PR (#3523)

* PLT-2863 adding remove user from team

* PLT-2863 adding the client side UI

* Fixing trailing space

* Fixing reported issues

* Adding documentatino

* Switching to final javascript driver

* Fixing bad merge

* Fixing bad merge

* PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524)

* Login error messages fix (#3525)

* daily translations 20160708 (#3533)

* Fixed permissions when getting a file attachment to use the correct user id (#3535)

* PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534)

* PLT-3560 blocking adding to channel once user is removed (#3537)

* Always allow system admins to see the Integrations sidebar (#3536)

* Plt 3475 - Post control improvements (#3538)

* Adding class to post when dropdown is active.

* plt-3475 - Post controls improvements

* daily translations 20160711 (#3544)

6 files changed, 862 insertions, 235 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 463c7f74d..289cec3b6 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,15 +89,15 @@
   },
   {
     "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",
-    "translation": "<br/><br/><br/>Dein Mattermost E-Mail Setup scheint korrekt zu sein!"
+    "translation": "<br/><br/><br/>Ihr Mattermost E-Mail Setup scheint korrekt zu sein!"
   },
   {
     "id": "api.admin.test_email.missing_server",
@@ -164,6 +164,10 @@
     "translation": "Benutzer konnte dem Channel nicht hinzugefügt werden"
   },
   {
+    "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
+    "translation": "Failed to add user to channel because they have been removed from the team."
+  },
+  {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
     "translation": "Der Channel wurde archiviert oder gelöscht"
   },
@@ -172,6 +176,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 +633,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 +665,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",
@@ -1049,7 +1069,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " hat dich erwähnt in "
+    "translation": " hat Sie erwähnt in "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
@@ -1125,7 +1145,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 +1380,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."
   },
@@ -1449,7 +1473,7 @@
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} hat dich eingeladen dem Team {{ .TeamDisplayName }} auf {{.SiteName}} beizutreten"
+    "translation": "{{ .SenderName }} hat Sie eingeladen dem Team {{ .TeamDisplayName }} auf {{.SiteName}} beizutreten"
   },
   {
     "id": "api.templates.password_change_body.info",
@@ -1756,6 +1780,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": "Benutzername oder Passwort inkorrekt."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "Entweder Nutzername oder Teamname und E-Mail-Addresse müssen angegeben werden"
   },
@@ -1833,7 +1861,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 +2096,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 +2145,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 +2237,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 +2328,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 +2593,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 +2708,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 +2729,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 +3093,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 +3364,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 +3585,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 +4057,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 +4320,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 16a973ab2..b8a00d5a8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -164,6 +164,10 @@
     "translation": "Failed to add user to channel"
   },
   {
+    "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
+    "translation": "Failed to add user to channel because they have been removed from the team."
+  },
+  {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
     "translation": "The channel has been archived or deleted"
   },
@@ -172,6 +176,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 +332,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 +1268,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 +1380,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."
   },
@@ -1776,6 +1780,10 @@
     "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"
   },
@@ -2088,6 +2096,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."
   },
@@ -2316,6 +2328,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"
   },
@@ -2680,14 +2708,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"
   },
@@ -3072,32 +3100,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",
@@ -3108,24 +3148,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",
@@ -3244,10 +3272,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"
   },
@@ -3340,6 +3364,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"
   },
@@ -3368,10 +3396,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"
   },
@@ -4295,28 +4319,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..30ea90ad5 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -164,6 +164,10 @@
     "translation": "Falla al agregar el usuario al canal"
   },
   {
+    "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
+    "translation": "Failed to add user to channel because they have been removed from the team."
+  },
+  {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
     "translation": "El canal ha sido archivado o eliminado"
   },
@@ -172,6 +176,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 +1380,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 +1780,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 +2096,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 +2328,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 +2708,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 +3093,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 +3364,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 +4320,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..a0c0d97fe 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",
@@ -164,6 +164,10 @@
     "translation": "Échec de l'ajout utilisateur"
   },
   {
+    "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
+    "translation": "Failed to add user to channel because they have been removed from the team."
+  },
+  {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
     "translation": "Le canal a été archivé ou effacé"
   },
@@ -172,6 +176,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 +557,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",
@@ -605,7 +625,7 @@
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Impossible de créer un emoji. Impossible de comprendre la demande."
+    "translation": "Impossible de créer un emoji. Impossible de comprendre la requête."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
@@ -613,7 +633,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",
@@ -645,7 +665,7 @@
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image must be at most 128 by 128 pixels."
+    "translation": "Impossible de créer un emoji. L'image doit faire au plus 128x128 pixels."
   },
   {
     "id": "api.export.json.app_error",
@@ -1125,7 +1145,7 @@
   },
   {
     "id": "api.saml.save_certificate.app_error",
-    "translation": "Certificate did not save properly."
+    "translation": "Le certificat ne s'est pas enregistré correctement."
   },
   {
     "id": "api.server.new_server.init.info",
@@ -1360,6 +1380,10 @@
     "translation": "Équipe %v supprimée définitivement id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "L'utilisateur n'appartient pas à cette équipe."
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "L'inscription avec une adresse électronique est désactivée."
   },
@@ -1756,6 +1780,10 @@
     "translation": "Votre compte a été désactivé.  Veuillez contacter un administrateur."
   },
   {
+    "id": "api.user.login.invalid_credentials",
+    "translation": "Nom d'utilisateur ou mot de passe invalide."
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "Veuillez entrer soit un identifiant utilisateur, soit le nom d'une équipe"
   },
@@ -1833,7 +1861,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "MFA n'est pas configuré ou supporté sur ce serveur"
+    "translation": "SAML n'est pas configuré ou supporté sur ce serveur."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2068,6 +2096,10 @@
     "translation": "Droits insuffisants pour regénérer le jeton du webhook sortant"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "Fonctionnalité désactivée pour la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "Impossible de décoder l'image."
   },
@@ -2113,7 +2145,7 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "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."
+    "translation": "Emoji personnalisés désactivés par la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2205,39 +2237,39 @@
   },
   {
     "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": "Erreur lors de la requête au fournisseur d'identité. Veuillez contacter votre administrateur système."
   },
   {
     "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": "Erreur lors de l'encodage de la requête pour le fournisseur d'identité. Veuillez contacter votre administrateur système."
   },
   {
     "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": "Erreur d'encodage de la requête signée vers le fournisseur d'identité. Veuillez contacter votre administrateur système."
   },
   {
     "id": "ent.saml.configure.app_error",
-    "translation": "An error occurred while configuring SAML Service Provider, err=%v"
+    "translation": "Erreur lors de la configuration du fournisseur 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": "La connexion SAML a échoué car le chiffrement n'est pas activé. Veuillez contacter votre administrateur système."
   },
   {
     "id": "ent.saml.configure.load_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "Le fichier de certificat de fournisseur d'identité est introuvable. Veuillez contacter votre administrateur système."
   },
   {
     "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": "La connexion SAML a échoué car la clé privée du fournisseur d'identité est introuvable. Veuillez contacter votre administrateur système."
   },
   {
     "id": "ent.saml.configure.load_public_cert.app_error",
-    "translation": "Service Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "Le certificat public du fournisseur est introuvable. Veuillez contacter votre administrateur système."
   },
   {
     "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": "La connexion SAML a échoué car la réponse du fournisseur d'identité n'est pas chiffrée. Veuillez contacter votre administrateur système."
   },
   {
     "id": "ent.saml.do_login.decrypt.app_error",
@@ -2249,23 +2281,23 @@
   },
   {
     "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": "Erreur lors de l'encodage de la requête pour le fournisseur d'identité. Veuillez contacter votre administrateur système."
   },
   {
     "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": "Erreur lors de l'encodage de la requête pour le fournisseur d'identité. Veuillez contacter votre administrateur système."
   },
   {
     "id": "ent.saml.license_disable.app_error",
-    "translation": "Your license does not support SAML authentication."
+    "translation": "Votre licence ne permet pas l'authentification SAML."
   },
   {
     "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",
-    "translation": "MFA n'est pas configuré ou supporté sur ce serveur"
+    "translation": "SAML n'est pas configuré ou supporté sur ce serveur"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -2296,6 +2328,22 @@
     "translation": "Page introuvable"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "Vous serez supprimé de tous les canaux et groupes privés. Si l'équipe est privée, vous ne pourrez plus la rejoindre à nouveau. Êtes-vous sûr ?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "Non"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "Quitter l'équipe ?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Oui"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Impossible de trouver le canal : %v, %v possibilités recherchées"
   },
@@ -2660,6 +2708,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."
   },
@@ -2673,15 +2729,15 @@
   },
   {
     "id": "model.config.is_valid.saml_assertion_consumer_service_url.app_error",
-    "translation": "URL invalude. Il doit s'agir d'une URL valide et commencer par http:// ou https://"
+    "translation": "URL invalide. Il doit s'agir d'une URL valide et commencer par http:// ou https://"
   },
   {
     "id": "model.config.is_valid.saml_email_attribute.app_error",
-    "translation": "Invalid Email attribute. Must be set."
+    "translation": "L'attribut \"Username\" est invalide. Il doit être renseigné."
   },
   {
     "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Invalid First Name attribute. Must be set."
+    "translation": "L'attribut \"Username\" est invalide. Il doit être renseigné."
   },
   {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
@@ -2689,15 +2745,15 @@
   },
   {
     "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 invalide. Il doit s'agir d'une URL valide et commencer par http:// ou https://."
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
-    "translation": "URL invalude. Il doit s'agir d'une URL valide et commencer par http:// ou https://"
+    "translation": "URL SSO SAML invalide. Il doit s'agir d'une URL valide et commencer par http:// ou https://."
   },
   {
     "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Invalid Last Name attribute. Must be set."
+    "translation": "L'attribut \"Username\" est invalide. Il doit être renseigné."
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
@@ -2709,7 +2765,7 @@
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
-    "translation": "Invalid Username attribute. Must be set."
+    "translation": "L'attribut \"Username\" est invalide. Il doit être renseigné."
   },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
@@ -3037,7 +3093,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "Mot de passe invalide"
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères et une lettre minuscule."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre minuscule et un chiffre."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre minuscule, un chiffre et un symbole (parmi \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre minuscule et un symbole (parmi \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre minuscule et une majuscule."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre minuscule, une majuscule et un chiffre."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre minuscule, une majuscule, un chiffre et un symbole (parmi \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre minuscule, une majuscule et un symbole (parmi \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, un chiffre."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, un chiffre et un symbole (parmi \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, un symbole (parmi \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre majuscule."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre majuscule et un chiffre."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre majuscule, un chiffre et un symbole (parmi \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "Votre mot de passe doit contenir au moins {{.Min}} caractères, une lettre majuscule et un symbole (parmi \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3364,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"
   },
@@ -3937,7 +4057,7 @@
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
-    "translation": "Ce compte n'utilise pas l'authentification LDAP. Veuillez vous connecter avec votre adresse électronique et votre mot de passe."
+    "translation": "Ce compte n'utilise pas l'authentification SAML. Veuillez vous connecter avec votre adresse électronique et votre mot de passe."
   },
   {
     "id": "store.sql_user.save.existing.app_error",
@@ -4200,6 +4320,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..1fd671ce1 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",
@@ -164,6 +164,10 @@
     "translation": "ユーザーをチャンネルに追加できませんでした"
   },
   {
+    "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
+    "translation": "Failed to add user to channel because they have been removed from the team."
+  },
+  {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
     "translation": "チャンネルはアーカイブされているか削除されています"
   },
@@ -172,6 +176,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 +633,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 +665,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 +1145,7 @@
   },
   {
     "id": "api.saml.save_certificate.app_error",
-    "translation": "Certificate did not save properly."
+    "translation": "証明書が正常に保存されませんでした。"
   },
   {
     "id": "api.server.new_server.init.info",
@@ -1360,6 +1380,10 @@
     "translation": "チーム%vを完全に削除しました id=%v"
   },
   {
+    "id": "api.team.remove_user_from_team.missing.app_error",
+    "translation": "ユーザーはこのチームの一員ではありません。"
+  },
+  {
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "電子メールによるチームへの利用登録は無効です。"
   },
@@ -1756,6 +1780,10 @@
     "translation": "あなたのアカウントは無効化されています。システム管理者に連絡してください。"
   },
   {
+    "id": "api.user.login.invalid_credentials",
+    "translation": "ユーザーIDまたはパスワードが間違っています。"
+  },
+  {
     "id": "api.user.login.not_provided.app_error",
     "translation": "ユーザーIDまたはチーム名と電子メールアドレスの組み合わせを指定しなくてはいけません"
   },
@@ -1833,7 +1861,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 +2096,10 @@
     "translation": "外向きのウェブフックトークンを再生成するのに十分な権限が付与されていません"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "機能にはエンタープライズライセンスが必要です。システム管理者にエンタープライズライセンスにアップグレードするように連絡してください。"
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "画像をデコードできません。"
   },
@@ -2113,7 +2145,7 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "コンプライアンス機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
+    "translation": "カスタム絵文字の制限機能が現在のライセンスでは無効になっています。システム管理者にエンタープライズライセンスをアップグレードするように連絡してください。"
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2205,71 +2237,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": "認証プロバイダーへのリクエストを初期化する際にエラーが発生しました。システム管理者に連絡してください。"
   },
   {
     "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": "認証プロバイダーへのリクエストをエンコードする際にエラーが発生しました。システム管理者に連絡してください。"
   },
   {
     "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": "認証プロバイダーへのサイン済みリクエストをエンコードする際にエラーが発生しました。システム管理者に連絡してください。"
   },
   {
     "id": "ent.saml.configure.app_error",
-    "translation": "An error occurred while configuring SAML Service Provider, err=%v"
+    "translation": "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ログインは、暗号化が有効になっていないため、失敗しました。システム管理者に連絡してください。"
   },
   {
     "id": "ent.saml.configure.load_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "認証プロバイダーの公開証明書ファイルが見付かりません。システム管理者に連絡してください。"
   },
   {
     "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ログインは、サービスプロバイダーの秘密鍵が見付からないため失敗しました。システム管理者に連絡してください。"
   },
   {
     "id": "ent.saml.configure.load_public_cert.app_error",
-    "translation": "Service Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "サービスプロバイダーの公開証明書ファイルが見付かりません。システム管理者に連絡してください。"
   },
   {
     "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ログインは、認証プロバイダーのレスポンスが暗号化されていないため失敗しました。システム管理者に連絡してください。"
   },
   {
     "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ログインは、認証プロバイダーからのレスポンスを復号する際にエラーが発生したため、失敗しました。システム管理者に連絡してください。"
   },
   {
     "id": "ent.saml.do_login.empty_response.app_error",
-    "translation": "We received an empty response from the Identity Provider"
+    "translation": "認証プロバイダーから空のレスポンスを受け取りました"
   },
   {
     "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": "認証プロバイダーからのレスポンスを解析中にエラーが発生しました。システム管理者に連絡してください。"
   },
   {
     "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": "認証プロバイダーからのレスポンスの妥当性を確認中にエラーが発生しました。システム管理者に連絡してください。"
   },
   {
     "id": "ent.saml.license_disable.app_error",
-    "translation": "Your license does not support SAML authentication."
+    "translation": "現在のライセンスではSAML認証はサポートされていません。"
   },
   {
     "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",
-    "translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
+    "translation": "既存のSAMLユーザーをアップデートすることはできません。ログインは有効です。err=%v"
   },
   {
     "id": "error.generic.link_message",
@@ -2296,6 +2328,22 @@
     "translation": "ページが見付かりません"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "全ての公開チャンネルとプライベートグループから脱退します。チームがプライベートな場合、再度参加することはできません。実行してよろしいですか?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "いいえ"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "チームから脱退しますか?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "はい"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "チャンネルが見付かりません: %v、%vではありませんか"
   },
@@ -2625,7 +2673,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_max_page_size.app_error",
-    "translation": "Invalid max page size value."
+    "translation": "最大ページサイズの値が不正です。"
   },
   {
     "id": "model.config.is_valid.ldap_required.app_error",
@@ -2660,6 +2708,14 @@
     "translation": "チーム設定のチーム毎の最大ユーザー数が不正です。正の数を指定してください。"
   },
   {
+    "id": "model.config.is_valid.password_length.app_error",
+    "translation": "最小パスワード長さは、{{.MinLength}}以上、{{.MaxLength}}以下に設定してください。"
+  },
+  {
+    "id": "model.config.is_valid.password_length_max_min.app_error",
+    "translation": "最大パスワード長さは、最小パスワード長さ以上に設定してください、"
+  },
+  {
     "id": "model.config.is_valid.rate_mem.app_error",
     "translation": "投稿頻度設定のメモリー保存サイズが不正です。正の数を指定してください。"
   },
@@ -2673,43 +2729,43 @@
   },
   {
     "id": "model.config.is_valid.saml_assertion_consumer_service_url.app_error",
-    "translation": "不正なURLです。正しいURLはhttp://またはhttps://で始まります"
+    "translation": "サービスプロバイダーのURLを正しく設定してください。URLはhttp://またはhttps://で始まります。"
   },
   {
     "id": "model.config.is_valid.saml_email_attribute.app_error",
-    "translation": "Invalid Email attribute. Must be set."
+    "translation": "電子メールの属性値が不正です。設定してください。"
   },
   {
     "id": "model.config.is_valid.saml_first_name_attribute.app_error",
-    "translation": "Invalid First Name attribute. Must be set."
+    "translation": "ファーストネームの属性値が不正です。設定してください。"
   },
   {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "認証プロバイダーの公開証明書が見付かりません。アップロードを忘れていませんか?"
   },
   {
     "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",
-    "translation": "不正なURLです。正しいURLはhttp://またはhttps://で始まります"
+    "translation": "SAML SSOのURLを正しく設定してください。URLはhttp://またはhttps://で始まります。"
   },
   {
     "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Invalid Last Name attribute. Must be set."
+    "translation": "ラストネームの属性値が不正です。設定してください。"
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
-    "translation": "Service Provider Private Key missing. Did you forget to upload it?"
+    "translation": "サービスプロバイダーの秘密鍵が見付かりません。アップロードを忘れていませんか?"
   },
   {
     "id": "model.config.is_valid.saml_public_cert.app_error",
-    "translation": "Service Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "サービスプロバイダーの公開証明書が見付かりません。アップロードを忘れていませんか?"
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
-    "translation": "Invalid Username attribute. Must be set."
+    "translation": "ユーザー名の属性値が不正です。設定してください。"
   },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
@@ -3037,7 +3093,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "不正なパスワードです"
+    "translation": "パスワードは{{.Min}}文字以上に設定してください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字は英小文字にしてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英小文字と数字を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英小文字と数字、記号(例: \"~!@#$%^&*()\")を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英小文字と記号(例: \"~!@#$%^&*()\")を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつ英小文字と英大文字を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英小文字と英大文字、数字を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英大文字と数字、記号(例: \"~!@#$%^&*()\")を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英小文字と英大文字、記号(例: \"~!@#$%^&*()\")を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字は数字にしてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの数字、記号(例: \"~!@#$%^&*()\")を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字は記号(例: \"~!@#$%^&*()\")にしてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字は英大文字にしてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英大文字と数字を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英大文字と数字、記号(例: \"~!@#$%^&*()\")を含めてください。"
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "パスワードは少なくとも{{.Min}}文字以上に設定してください。少なくとも1文字ずつの英大文字と記号(例: \"~!@#$%^&*()\")を含めてください。"
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3364,10 @@
     "translation": "チャンネルを探す際にエラーが発生しました"
   },
   {
+    "id": "store.sql_channel.get_all.app_error",
+    "translation": "チャンネルが全ては取得できませんでした"
+  },
+  {
     "id": "store.sql_channel.get_by_name.existing.app_error",
     "translation": "チャンネルが見付かりませんでした"
   },
@@ -3937,7 +4057,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 +4320,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..30b09e713 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",
@@ -164,6 +164,10 @@
     "translation": "Não foi possível adicionar o usuário no canal"
   },
   {
+    "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
+    "translation": "Failed to add user to channel because they have been removed from the team."
+  },
+  {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
     "translation": "O canal foi deletado ou arquivado"
   },
@@ -172,6 +176,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 +625,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 +633,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 +665,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 +1145,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 +1380,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 +1780,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": "ID do usuário ou senha incorreta."
+  },
+  {
     "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 +1861,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 +2096,10 @@
     "translation": "Permissões inadequadas para re-gerar o token do webhook de saída"
   },
   {
+    "id": "cli.license.critical",
+    "translation": "Funcionalidade requer uma licença enterprise. Entre em contato com o administrador do sistema sobre como atualizar sua licença enterprise."
+  },
+  {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "Não foi possível ler a imagem."
   },
@@ -2113,7 +2145,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 +2237,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 +2328,22 @@
     "translation": "Página não encontrada"
   },
   {
+    "id": "leave_team_modal.desc",
+    "translation": "Você será removido de todos os canais públicos e grupos privados.  Se a equipe é privada você não será capaz de se juntar à equipe.  Você tem certeza?"
+  },
+  {
+    "id": "leave_team_modal.no",
+    "translation": "Não"
+  },
+  {
+    "id": "leave_team_modal.title",
+    "translation": "Deixar a equipe?"
+  },
+  {
+    "id": "leave_team_modal.yes",
+    "translation": "Sim"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Não foi possível encontrar o canal %v, procurado %v possibilidades"
   },
@@ -2660,6 +2708,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,43 +2729,43 @@
   },
   {
     "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 Emissora do Provedor de Identidade deve ser uma URL válida e começar com http:// ou https://."
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
-    "translation": "URL inválida. Deve ser uma URL válida e começar com http:// ou https://"
+    "translation": "URL SAML SSO deve ser uma URL válida e começar com http:// ou https://."
   },
   {
     "id": "model.config.is_valid.saml_last_name_attribute.app_error",
-    "translation": "Invalid Last Name attribute. Must be set."
+    "translation": "Atributo Último Nome Inválido. Deve ser definido."
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
-    "translation": "Service Provider Private Key missing. Did you forget to upload it?"
+    "translation": "Chave Privada do Provedor de Serviço. Esqueceu-se de carregá-lo?"
   },
   {
     "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 Serviço. Esqueceu-se de carregá-lo?"
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
-    "translation": "Invalid Username attribute. Must be set."
+    "translation": "Atributo Usuário Inválido. Deve ser definido."
   },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
@@ -3037,7 +3093,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "Senha inválida"
+    "translation": "Sua senha precisa conter no mínimo {{.Min}} caracteres."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula e pelo menos um número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula, pelo menos um número e um símbolo (ex. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula e pelo menos um símbolo (ex. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula e pelo menos uma letra maiúscula."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula, pelo menos uma letra maiúscula, e pelo menos um número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula, pelo menos uma letra maiúscula, e pelo menos um número, e pelo menos um símbolo (ex. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra minúscula, pelo menos uma letra maiúscula, e pelo menos um símbolo (ex. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos um número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_number_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos um número e pelo menos um símbolo (ex. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos um símbolo (ex. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra maiúscula."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra maiúscula e pelo menos um número."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra maiúscula e pelo menos um número e pelo menos um símbolo (ex. \"~!@#$%^&*()\")."
+  },
+  {
+    "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
+    "translation": "Sua senha deve conter no mínimo {{.Min}} caracteres composta de pelo menos uma letra maiúscula e pelo menos um símbolo (ex. \"~!@#$%^&*()\")."
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3248,6 +3364,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"
   },
@@ -3937,7 +4057,7 @@
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
-    "translation": "Está conta não usa autenticação LDAP. Por favor faça login usando email e senha."
+    "translation": "Está conta não usa autenticação SAML. Por favor faça login usando email e senha."
   },
   {
     "id": "store.sql_user.save.existing.app_error",
@@ -4200,6 +4320,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"
   },