translations PR 20170220 (#5482)

22 files changed, 290 insertions, 210 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 44ceebcc5..60fa73d6e 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -305,7 +305,7 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
-    "translation": "Fehler beim Abrufen des Nutzers während des aktualisierens des DisplayName-Feldes"
+    "translation": "Fehler beim Abrufen des Nutzers während des Aktualisierens des DisplayName-Feldes"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
@@ -1154,6 +1154,10 @@
     "translation": "Ein Fehler während des Lesens vom lokalen Server ist aufgetreten"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Dateiupload nicht möglich. Header können nicht geparst werden."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "Datei über den maximalen Dimensionen konnte nicht hochgeladen werden: {{.Filename}}"
   },
@@ -2773,223 +2777,223 @@
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
-    "translation": "Failed to post channel purpose message"
+    "translation": "Fehler beim Senden des Kanalzwecks"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.removed",
-    "translation": "Der Kanaltitel %s wurde entfernt (vorher: %s)"
+    "translation": "%s hat den Kanalzweck entfernt (war: %s)"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.retrieve_user.error",
-    "translation": "Fehler beim Abrufen des Nutzers während des Sicherns der Kanalüberschrift %v"
+    "translation": "Fehler beim Abrufen des Nutzers während des Aktualisierens des Kanalzwecks %v"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_from",
-    "translation": "%s Der Kanaltitel wurde aktualisiert von %s nach %s"
+    "translation": "%s hat den Kanalzweck von: %s nach: %s aktualisiert"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
-    "translation": "%s der Kanaltitel wurde aktualisiert in %s"
+    "translation": "%s hat den Kanalzweck aktualisiert zu: %s"
   },
   {
     "id": "app.import.bulk_import.file_scan.error",
-    "translation": "Error reading import data file."
+    "translation": "Fehler beim Lesen der Importdatei."
   },
   {
     "id": "app.import.bulk_import.json_decode.error",
-    "translation": "JSON decode of line failed."
+    "translation": "JSON Decode der Zeile fehlgeschlagen."
   },
   {
     "id": "app.import.import_channel.team_not_found.error",
-    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
+    "translation": "Fehler beim Importieren des Kanals. Team mit dem Namen \"{{.TeamName}}\" konnte nicht gefunden werden."
   },
   {
     "id": "app.import.import_line.null_channel.error",
-    "translation": "Import data line has type \"channel\" but the channel object is null."
+    "translation": "Importdatenzeile hat den Typ \"channel\", aber das Kanalobjekt ist null."
   },
   {
     "id": "app.import.import_line.null_team.error",
-    "translation": "Import data line has type \"team\" but the team object is null."
+    "translation": "Importdatenzeile hat den Typ \"team\", aber das Teamobjekt ist null."
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "Import data line has type \"user\" but the user object is null."
+    "translation": "Importdatenzeile hat den Typ \"user\", aber das Benutzerobjekt ist null."
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
-    "translation": "Import data line has unknown type \"{{.Type}}\"."
+    "translation": "Importdatenzeile hat den unbekannten Typ \"{{.Type}}\"."
   },
   {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
-    "translation": "Channel create_at must not be 0 if provided."
+    "translation": "Kanal create_at darf nicht 0 sein wenn angegeben."
   },
   {
     "id": "app.import.validate_channel_import_data.display_name_length.error",
-    "translation": "Channel display_name is not within permitted length constraints."
+    "translation": "Kanal display_name befindet sich nicht innerhalb der Längenbegrenzung."
   },
   {
     "id": "app.import.validate_channel_import_data.display_name_missing.error",
-    "translation": "Missing required channel property: display_name."
+    "translation": "Fehlende erforderliche Kanaleigenschaft: display_name."
   },
   {
     "id": "app.import.validate_channel_import_data.header_length.error",
-    "translation": "Channel header is too long."
+    "translation": "Kanalüberschrift ist zu lang."
   },
   {
     "id": "app.import.validate_channel_import_data.name_characters.error",
-    "translation": "Channel name contains invalid characters."
+    "translation": "Kanalname enthält ungültige Zeichen."
   },
   {
     "id": "app.import.validate_channel_import_data.name_length.error",
-    "translation": "Channel name is too long."
+    "translation": "Kanalname ist zu lang."
   },
   {
     "id": "app.import.validate_channel_import_data.name_missing.error",
-    "translation": "Missing required channel property: name"
+    "translation": "Fehlende erforderliche Kanaleigenschaft: name"
   },
   {
     "id": "app.import.validate_channel_import_data.purpose_length.error",
-    "translation": "Channel purpose is too long."
+    "translation": "Kanalzweck ist zu lang."
   },
   {
     "id": "app.import.validate_channel_import_data.team_missing.error",
-    "translation": "Missing required channel property: team"
+    "translation": "Fehlende erforderliche Kanaleigenschaft: team"
   },
   {
     "id": "app.import.validate_channel_import_data.type_invalid.error",
-    "translation": "Channel type is invalid."
+    "translation": "Kanaltyp ist ungültig."
   },
   {
     "id": "app.import.validate_channel_import_data.type_missing.error",
-    "translation": "Missing required channel property: type."
+    "translation": "Fehlende erforderliche Kanaleigenschaft: type."
   },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
-    "translation": "Team allowed_domains is too long."
+    "translation": "Team allowed_domains ist zu lang."
   },
   {
     "id": "app.import.validate_team_import_data.create_at_zero.error",
-    "translation": "Team create_at must not be 0 if provided."
+    "translation": "Team create_at darf nicht 0 sein wenn angegeben."
   },
   {
     "id": "app.import.validate_team_import_data.description_length.error",
-    "translation": "Team description is too long."
+    "translation": "Team description ist zu lang."
   },
   {
     "id": "app.import.validate_team_import_data.display_name_length.error",
-    "translation": "Team display_name is not within permitted length constraints."
+    "translation": "Team display_name befindet sich nicht innerhalb der Längenbegrenzung."
   },
   {
     "id": "app.import.validate_team_import_data.display_name_missing.error",
-    "translation": "Missing required team property: display_name"
+    "translation": "Fehlende erforderliche Teameigenschaft: display_name"
   },
   {
     "id": "app.import.validate_team_import_data.name_characters.error",
-    "translation": "Team name contains invalid characters."
+    "translation": "Team name enthält ungültige Zeichen."
   },
   {
     "id": "app.import.validate_team_import_data.name_length.error",
-    "translation": "Team name is too long."
+    "translation": "Team name ist zu lang."
   },
   {
     "id": "app.import.validate_team_import_data.name_missing.error",
-    "translation": "Missing required team property: name."
+    "translation": "Fehlende erforderliche Teameigenschaft: name."
   },
   {
     "id": "app.import.validate_team_import_data.name_reserved.error",
-    "translation": "Team name contains reserved word."
+    "translation": "Team name enthält ein reserviertes Wort."
   },
   {
     "id": "app.import.validate_team_import_data.type_invalid.error",
-    "translation": "Team type is not valid."
+    "translation": "Team type is ungütig."
   },
   {
     "id": "app.import.validate_team_import_data.type_missing.error",
-    "translation": "Missing required team property: type"
+    "translation": "Fehlende erforderliche Teameigenschaft: type"
   },
   {
     "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
-    "translation": "Channel name missing from User's Channel Membership."
+    "translation": "Kanalname fehlt in der Kanalmitgliedschaft des Benutzers."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+    "translation": "Ungültige Desktop NotifyProps für Kanalmitgliedschaft des Benutzers."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+    "translation": "Ungültige MarkUnread NotifyProps für Kanalmitgliedschaft des Benutzers."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Channel Membership."
+    "translation": "Ungültige Rollen für die Kanalmitgliedschaft des Benutzers."
   },
   {
     "id": "app.import.validate_user_import_data.auth_data_length.error",
-    "translation": "User AuthData is too long."
+    "translation": "Benutzer AuthData ist zu lang."
   },
   {
     "id": "app.import.validate_user_import_data.auth_service_length.error",
-    "translation": "User AuthService should not be empty if it is provided."
+    "translation": "Benutzer AuthService sollte nicht leer sein wenn angegeben."
   },
   {
     "id": "app.import.validate_user_import_data.email_length.error",
-    "translation": "User email has an invalid length."
+    "translation": "Benutzer email hat eine ungültige länge."
   },
   {
     "id": "app.import.validate_user_import_data.email_missing.error",
-    "translation": "Missing required user property: email."
+    "translation": "Fehlende erforderliche Benutzereigenschaft: email."
   },
   {
     "id": "app.import.validate_user_import_data.first_name_length.error",
-    "translation": "User First Name is too long."
+    "translation": "Benutzer Vorname ist zu lang."
   },
   {
     "id": "app.import.validate_user_import_data.last_name_length.error",
-    "translation": "User Last Name is too long."
+    "translation": "Benutzer Nachname ist zu lang."
   },
   {
     "id": "app.import.validate_user_import_data.nickname_length.error",
-    "translation": "User nickname is too long."
+    "translation": "Benutzer nickname ist zu lang."
   },
   {
     "id": "app.import.validate_user_import_data.position_length.error",
-    "translation": "User Position is too long."
+    "translation": "Benutzer Position ist zu lang."
   },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
-    "translation": "User roles are not valid."
+    "translation": "Benutzer roles sind nicht gültig."
   },
   {
     "id": "app.import.validate_user_import_data.username_invalid.error",
-    "translation": "Username is not valid."
+    "translation": "Benutzername ist ungültig."
   },
   {
     "id": "app.import.validate_user_import_data.username_missing.error",
-    "translation": "Missing require user property: username."
+    "translation": "Fehlende erforderliche Benutzereigenschaft: username."
   },
   {
     "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Team Membership."
+    "translation": "Ungültige Rollen für Teammitgliedschaft des Benutzers."
   },
   {
     "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
-    "translation": "Team name missing from User's Team Membership."
+    "translation": "Team name fehlt in Teammitgliedschaft des Benutzers."
   },
   {
     "id": "authentication.permissions.create_team_roles.description",
-    "translation": "Ability to create new teams"
+    "translation": "Die Möglichkeit, neue Teams zu erstellen"
   },
   {
     "id": "authentication.permissions.create_team_roles.name",
-    "translation": "Create Teams"
+    "translation": "Teams erstellen"
   },
   {
     "id": "authentication.permissions.manage_team_roles.description",
-    "translation": "Ability to change the roles of a team member"
+    "translation": "Die Möglichkeit, die Rollen eines Teammitgliedes zu ändern"
   },
   {
     "id": "authentication.permissions.manage_team_roles.name",
-    "translation": "Manage Team Roles"
+    "translation": "Teamrollen verwalten"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3540,6 +3544,10 @@
     "translation": "Authentifizierungstoken stimmten nicht überein"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "Es trat ein Fehler beim Lesen der Datei auf"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Erstellt am muss eine gültige Zeit sein"
   },
@@ -3613,7 +3621,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "E-Mail-Stapelverarbeitung lässt sich bei aktiviertem Clustering nicht aktivieren"
+    "translation": "E-Mail-Stapelverarbeitung lässt sich bei aktiviertem Clustering nicht aktivieren."
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -3841,7 +3849,7 @@
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
-    "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
+    "translation": "Zeit zwischen Benutzereingabenaktualisierung sollte nicht weniger als 1000 Millisekunden betragen."
   },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
@@ -4517,11 +4525,11 @@
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
-    "translation": "Der bestehende Kanal konnte nicht gefunden werden"
+    "translation": "Der bestehende gelöschte Kanal konnte nicht gefunden werden"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
-    "translation": "No deleted channel exists with that name"
+    "translation": "Es existieren keine gelöschten Kanäle mit dem Namen"
   },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
@@ -4601,7 +4609,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "A channel with that name already exists on the same team"
+    "translation": "Ein Kanal mit dem Namen existiert bereits im gleichen Team"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4933,7 +4941,7 @@
   },
   {
     "id": "store.sql_post.permanent_delete_by_channel.app_error",
-    "translation": "Der Kanal konnte nicht gelöscht werden"
+    "translation": "Die Nachrichten nach Kanal konnten nicht gelöscht werden"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
@@ -5245,7 +5253,7 @@
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "Ein Team mit dieser Domain existiert bereits"
+    "translation": "Ein Team mit diesem Namen existiert bereits"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
diff --git a/i18n/en.json b/i18n/en.json
index 30a258137..cea44ef0a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1154,6 +1154,10 @@
     "translation": "Encountered an error reading from local server storage"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
@@ -1166,10 +1170,6 @@
     "translation": "Unable to upload file. File is too large."
   },
   {
-    "id": "api.file.upload_file.bad_parse.app_error",
-    "translation": "Unable to upload file. Header cannot be parsed."
-  },
-  {
     "id": "api.file.write_file.configured.app_error",
     "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
   },
@@ -3528,10 +3528,6 @@
     "translation": "Invalid user id"
   },
   {
-    "id": "model.client.read_file.app_error",
-    "translation": "We encountered an error while reading the file"
-  },
-  {
     "id": "model.client.connecting.app_error",
     "translation": "We encountered an error while connecting to the server"
   },
@@ -3552,6 +3548,10 @@
     "translation": "Authentication tokens didn't match"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "We encountered an error while reading the file"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 5888a2876..f0fc23454 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1154,6 +1154,10 @@
     "translation": "Se encontró un error al leer desde el almacenamiento del servidor local"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "No se puedo subir el archivo. El encabezado no puede ser analizado."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "No se pudo subir el archivo que supera las dimensiones máximas: {{.Filename}}"
   },
@@ -2913,11 +2917,11 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+    "translation": "Las NotifyProps de escritorio para el Canal del Usuario en la Afiliación no es válido."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+    "translation": "Las NotifyProps de MarkUnread para el Canal del Usuario en la Afiliación no es válido."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
@@ -3540,6 +3544,10 @@
     "translation": "Token de autenticación no coincidió"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "Encontramos un error mientras se leía el archivo"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Fecha de Creación debe ser válida"
   },
@@ -4953,7 +4961,7 @@
   },
   {
     "id": "store.sql_post.search.app_error",
-    "translation": "Encontramos un error mientras buscabamos los mensajes"
+    "translation": "Encontramos un error mientras buscamos los mensajes"
   },
   {
     "id": "store.sql_post.update.app_error",
@@ -4969,15 +4977,15 @@
   },
   {
     "id": "store.sql_preference.get.app_error",
-    "translation": "Encontramos un error mientras buscabamos las preferencias"
+    "translation": "Encontramos un error mientras buscamos las preferencias"
   },
   {
     "id": "store.sql_preference.get_all.app_error",
-    "translation": "Encontramos un error mientras buscabamos las preferencias"
+    "translation": "Encontramos un error mientras buscamos las preferencias"
   },
   {
     "id": "store.sql_preference.get_category.app_error",
-    "translation": "Encontramos un error mientras buscabamos las preferencias"
+    "translation": "Encontramos un error mientras buscamos las preferencias"
   },
   {
     "id": "store.sql_preference.insert.exists.app_error",
@@ -4989,7 +4997,7 @@
   },
   {
     "id": "store.sql_preference.is_feature_enabled.app_error",
-    "translation": "Encontramos un error mientras buscabamos las preferencias de las características de pre-lanzamiento"
+    "translation": "Encontramos un error mientras buscamos las preferencias de las características de pre-lanzamiento"
   },
   {
     "id": "store.sql_preference.permanent_delete_by_user.app_error",
@@ -5073,7 +5081,7 @@
   },
   {
     "id": "store.sql_session.get_sessions.app_error",
-    "translation": "Encontramos un error mientras buscabamos las sesiones de usuario"
+    "translation": "Encontramos un error mientras buscamos las sesiones de usuario"
   },
   {
     "id": "store.sql_session.get_sessions.error",
@@ -5225,7 +5233,7 @@
   },
   {
     "id": "store.sql_team.get_teams_for_email.app_error",
-    "translation": "Encontramos un problema cuando buscabamos los equipos"
+    "translation": "Encontramos un problema cuando buscamos los equipos"
   },
   {
     "id": "store.sql_team.get_unread.app_error",
@@ -5313,7 +5321,7 @@
   },
   {
     "id": "store.sql_user.get_profiles.app_error",
-    "translation": "Encontramos un error mientras buscabamos los perfiles de usuario"
+    "translation": "Encontramos un error mientras buscamos los perfiles de usuario"
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
@@ -5321,7 +5329,7 @@
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
-    "translation": "Encontramos un error mientras buscabamos los perfiles de usuario"
+    "translation": "Encontramos un error mientras buscamos los perfiles de usuario"
   },
   {
     "id": "store.sql_user.get_total_users_count.app_error",
diff --git a/i18n/fr.json b/i18n/fr.json
index 8c7392b91..02222e7b2 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1154,6 +1154,10 @@
     "translation": "Une erreur est survenue lors de la lecture depuis le stockage local du serveur"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "Le fichier est au-dessus des limites de dimensions, il n'a pas pu être envoyé : {{.Filename}}"
   },
@@ -3540,6 +3544,10 @@
     "translation": "Les jetons d’authentification ne correspondent pas"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "Nous avons rencontré une erreur lors de la recherche des profils utilisateurs"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "La date de création doit être une date valide"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 07bf4fb7e..040b45433 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -1154,6 +1154,10 @@
     "translation": "ローカルサーバーストレージからの読み込みに失敗しました"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "ファイルをアップロードできません。ヘッダーを解析できません。"
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "最大サイズ以上のファイルはアップロードできません: {{.Filename}}"
   },
@@ -3540,6 +3544,10 @@
     "translation": "認証トークンが一致しません"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "ファイルを読み込む際にエラーが発生しました"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "作成日時は有効な時刻にしてください"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 00c8f2195..73d5a2aa7 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -197,7 +197,7 @@
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
-    "translation": "개인 메시지 채널을 만들기 위해선 반드시 createDirectChannel API 서비스를 이용해야 합니다"
+    "translation": "개인 메시지 채널을 만들기 위해서는 반드시 createDirectChannel API 서비스를 이용해야 함"
   },
   {
     "id": "api.channel.create_channel.invalid_character.app_error",
@@ -209,15 +209,15 @@
   },
   {
     "id": "api.channel.create_default_channels.off_topic",
-    "translation": "잡담방"
+    "translation": "잡담"
   },
   {
     "id": "api.channel.create_default_channels.town_square",
-    "translation": "광장"
+    "translation": "공지사항"
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Invalid user ID for direct channel creation"
+    "translation": "개인 메시지 채널에 적합하지 않은 사용자 ID"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -301,19 +301,19 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "Failed to post displayname update message"
+    "translation": "displayname 업데이트 메시지 등록 실패"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
-    "translation": "업데이트 채널 헤더 메시지 %v을(를) 저장 시도중 사용자를 가져오는데 실패했습니다"
+    "translation": "채널 DisplayName 란을 업데이트 중 사용자를 가져오는 데 실패함"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
-    "translation": "%s 이(가) 채널 헤더를 %s에서 %s(으)로 갱신했습니다"
+    "translation": "%s 이(가) 채널 표시명을 %s에서 %s(으)로 갱신함"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
-    "translation": "Failed to post update channel header message"
+    "translation": "채널 헤더 업데이트 표시 실패"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -321,7 +321,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "업데이트 채널 헤더 메시지 %v을(를) 저장 시도중 사용자를 가져오는데 실패했습니다"
+    "translation": "채널 헤더 업데이트 중 사용자를 가져오는 데 실패함"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
@@ -333,11 +333,11 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "메시지 %v 를 포스트 하는 데 실패하였습니다"
+    "translation": "들어옴/나감 메시지를 등록하는 데 실패함"
   },
   {
     "id": "api.channel.remove.default.app_error",
-    "translation": "기본 채널은 삭제할 수 없습니다 {{.Channel}}"
+    "translation": "기본 채널로부터는 사용자를 강퇴할 수 없음 {{.Channel}}"
   },
   {
     "id": "api.channel.remove_member.permissions.app_error",
@@ -421,7 +421,7 @@
   },
   {
     "id": "api.command.init.debug",
-    "translation": "명령 API 경로 초기화 중"
+    "translation": "명령어 API 경로 초기화 중"
   },
   {
     "id": "api.command.invite_people.desc",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.update.app_error",
-    "translation": "삭제 명령 권한 없음"
+    "translation": "명령어 업데이트 권한 없음"
   },
   {
     "id": "api.command_away.desc",
@@ -485,7 +485,7 @@
   },
   {
     "id": "api.command_collapse.success",
-    "translation": "Image links now collapse by default"
+    "translation": "이미지 링크가 기본값으로 접히도록 설정됨"
   },
   {
     "id": "api.command_echo.create.app_error",
@@ -509,7 +509,7 @@
   },
   {
     "id": "api.command_echo.message.app_error",
-    "translation": "A message must be provided with the /echo command."
+    "translation": "메시지는 /echo 명령어와 함께 제공되어야 합니다."
   },
   {
     "id": "api.command_echo.name",
@@ -525,11 +525,11 @@
   },
   {
     "id": "api.command_expand.success",
-    "translation": "Image links now expand by default"
+    "translation": "이미지 링크가 기본값으로 펼쳐지도록 설정됨"
   },
   {
     "id": "api.command_expand_collapse.fail.app_error",
-    "translation": "미리보기를 확장하는 중 오류가 발생하였습니다"
+    "translation": "미리보기를 펼치는 중 오류가 발생하였습니다."
   },
   {
     "id": "api.command_join.desc",
@@ -545,7 +545,7 @@
   },
   {
     "id": "api.command_join.list.app_error",
-    "translation": "채널 목록을 나열하는 중 오류가 발생했습니다."
+    "translation": "채널 목록을 나열하는 중 오류가 발생하였습니다."
   },
   {
     "id": "api.command_join.missing.app_error",
@@ -589,11 +589,11 @@
   },
   {
     "id": "api.command_msg.dm_fail.app_error",
-    "translation": "메시지를 전송하는 중 오류가 발생했습니다."
+    "translation": "메시지 암호화 중 오류가 발생하였습니다."
   },
   {
     "id": "api.command_msg.fail.app_error",
-    "translation": "사용자에게 메시지를 전달하는 중에 오류가 발생했습니다."
+    "translation": "사용자에게 메시지 전달 중 오류가 발생하였습니다."
   },
   {
     "id": "api.command_msg.hint",
@@ -601,7 +601,7 @@
   },
   {
     "id": "api.command_msg.list.app_error",
-    "translation": "사용자 목록을 표시하는 중 오류가 발생했습니다."
+    "translation": "사용자 제거 중 오류가 발생하였습니다."
   },
   {
     "id": "api.command_msg.missing.app_error",
@@ -641,11 +641,11 @@
   },
   {
     "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Next channel in your history\n"
+    "translation": "{{.ChannelNextCmd}}: 기록 상의 다음 채널\n"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+RIGHT"
+    "translation": "ALT+오른쪽 방향키"
   },
   {
     "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
@@ -653,11 +653,11 @@
   },
   {
     "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
+    "translation": "{{.ChannelPrevCmd}}: 기록 상의 이전 채널\n"
   },
   {
     "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+LEFT"
+    "translation": "ALT+왼쪽 방향키"
   },
   {
     "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
@@ -665,27 +665,27 @@
   },
   {
     "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
+    "translation": "{{.CmdOrCtrl}}+MINUS: 글자 크기 줄이기 (배율 축소)\n"
   },
   {
     "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
+    "translation": "{{.CmdOrCtrl}}+PLUS: 글자 크기 늘이기 (배율 확대)\n"
   },
   {
     "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Built-in Browser Commands\n\n"
+    "translation": "#### 브라우저 내장 명령어\n\n"
   },
   {
     "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
+    "translation": "(입력 란에서) SHIFT+아래 방향키: 다음 줄까지의 글자를 선택\n"
   },
   {
     "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+    "translation": "(입력 란에서) SHIFT+위 방향키: 이전 줄까지의 글자를 선택\n"
   },
   {
     "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "(입력 란에서) SHIFT+ENTER: 줄바꾸기\n"
   },
   {
     "id": "api.command_shortcuts.cmd",
@@ -701,47 +701,47 @@
   },
   {
     "id": "api.command_shortcuts.files.header",
-    "translation": "#### Files\n\n"
+    "translation": "#### 파일\n\n"
   },
   {
     "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Upload file(s)\n\n"
+    "translation": "{{.CmdOrCtrl}}+U: 파일 업로드 (복수 파일 가능)\n\n"
   },
   {
     "id": "api.command_shortcuts.header",
-    "translation": "### Keyboard Shortcuts\n\n"
+    "translation": "### 키보드 단축키\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[character]+TAB: Autocomplete channel beginning with [character]\n"
+    "translation": "~[문자]+TAB: [문자]로 시작하는 채널명 자동 완성\n"
   },
   {
     "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": ":[문자]+TAB: [문자]로 시작하는 이모지 자동 완성\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[character]+TAB: Autocomplete @username beginning with [character]\n"
+    "translation": "@[문자]+TAB: [문자]로 시작하는 @사용자명 자동 완성\n"
   },
   {
     "id": "api.command_shortcuts.msgs.edit",
-    "translation": "UP (in empty input field): Edit your last message in the current channel\n"
+    "translation": "위 방향키 (빈 입력란에서): 현재 채널에서 마지막으로 보낸 메시지 수정\n"
   },
   {
     "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Messages\n\n"
+    "translation": "#### 메시지\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Mark all messages in the current channel as read\n"
+    "translation": "ESC: 현재 채널의 모든 메시지를 읽음으로 표시\n"
   },
   {
     "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
+    "translation": "{{.CmdOrCtrl}}+아래 방향키 (빈 입력란에서): 입력한 다음 차례의 메시지 혹은 슬래시 명령어 재입력\n"
   },
   {
     "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
+    "translation": "{{.CmdOrCtrl}}+아래 방향키 (빈 입력란에서): 입력한 다음 차례의 메시지 혹은 슬래시 명령어 재입력\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -1154,6 +1154,10 @@
     "translation": "로컬 서버 저장소를 읽는 도중 에러가 발생했습니다."
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
@@ -2509,19 +2513,19 @@
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
-    "translation": "이메일 변경 알림 메일을 발송하지 못했습니다. err=%v"
+    "translation": "이메일 변경 알림 메일을 발송하지 못하였습니다."
   },
   {
     "id": "api.user.send_email_change_username_and_forget.error",
-    "translation": "사용자명 변경 알림 메일을 발송하지 못했습니다. err=%v"
+    "translation": "사용자명 변경 알림 메일을 발송하지 못하였습니다."
   },
   {
     "id": "api.user.send_email_change_verify_email_and_forget.error",
-    "translation": "이메일 변경 검증 메일을 발송하지 못했습니다. err=%v"
+    "translation": "이메일 변경 확인 메일을 발송하지 못하였습니다."
   },
   {
     "id": "api.user.send_password_change_email_and_forget.error",
-    "translation": "비밀번호 변경 알림 메일을 발송하지 못했습니다. err=%v"
+    "translation": "비밀번호 변경 알림 메일을 발송하지 못하였습니다."
   },
   {
     "id": "api.user.send_password_reset.find.app_error",
@@ -2537,15 +2541,15 @@
   },
   {
     "id": "api.user.send_sign_in_change_email_and_forget.error",
-    "translation": "비밀번호 변경 알림 메일을 발송하지 못했습니다. err=%v"
+    "translation": "비밀번호 변경 알림 메일을 발송하지 못하였습니다."
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
-    "translation": "이메일 검증 메일을 발송하지 못했습니다. err=%v"
+    "translation": "이메일 확인 메일을 발송하지 못하였습니다."
   },
   {
     "id": "api.user.send_welcome_email_and_forget.failed.error",
-    "translation": "가입 환경 메일을 발송하지 못했습니다. err=%v"
+    "translation": "가입 환영 메일을 발송하지 못하였습니다."
   },
   {
     "id": "api.user.update_active.no_deactivate_ldap.app_error",
@@ -3540,6 +3544,10 @@
     "translation": "Authentication tokens didn't match"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "We encountered an error while finding user profiles"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index b3052ae29..b85ddecfb 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -1154,6 +1154,10 @@
     "translation": "Er is een fout opgetreden bij het lezen van een bestand uit lokale opslag"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
   },
@@ -3540,6 +3544,10 @@
     "translation": "Authenticatie tokens komen niet overeen"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "Er is een probleem opgestreden tijdens het opzoeken van het gebruikersprofiel"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Aangemaakt op moet een geldige tijd zijn"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 1e2039eba..5d2c75f68 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -1154,6 +1154,10 @@
     "translation": "Encontrado um erro ao ler a partir do servidor de armazenamento local"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "Arquivo acima das dimensões máximas não pode ser enviado: {{.Filename}}"
   },
@@ -2913,11 +2917,11 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+    "translation": "Desktop NotifyProps inválido para Usuário Membro do Canal."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+    "translation": "MarkUnread NotifyProps inválido para Usuário Membro do Canal."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
@@ -3540,6 +3544,10 @@
     "translation": "Tokens de autenticação não são iguais"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "Encontramos um erro enquanto procurava os perfis de usuários"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create deve ser um tempo válido"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 52b088c17..c487aa704 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -1154,6 +1154,10 @@
     "translation": "Произошла ошибка при чтении из локального серверного хранилища"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "Размер файла превышает максимальный размер и не может быть загружен: {{.Filename}}"
   },
@@ -3540,6 +3544,10 @@
     "translation": "Маркеры аутентификации не совпадают"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "Возникла ошибка при поиске пользовательских профилей"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "\"Создать в\" должно быть корректным временем"
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 900dc834f..025b9edff 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -1154,6 +1154,10 @@
     "translation": "读取本地存储时遇到错误"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "无法上传超过最大尺寸的文件：{{.Filename}}"
   },
@@ -3540,6 +3544,10 @@
     "translation": "认证令牌不匹配"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "我们查找用户配置文件遇到了一个错误"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "创建时必须是有效时间"
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 6d27c6467..98137e0a5 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -1154,6 +1154,10 @@
     "translation": "從本地儲存讀取時遇到錯誤"
   },
   {
+    "id": "api.file.upload_file.bad_parse.app_error",
+    "translation": "Unable to upload file. Header cannot be parsed."
+  },
+  {
     "id": "api.file.upload_file.large_image.app_error",
     "translation": "無法上傳超過最大尺寸的檔案：{{.Filename}}"
   },
@@ -3540,6 +3544,10 @@
     "translation": "認證 Token 不合"
   },
   {
+    "id": "model.client.read_file.app_error",
+    "translation": "尋找使用者資訊時遇到錯誤"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "\"新增時間\"必須是一個有效時間"
   },
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 226220dfa..884eb0454 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -28,7 +28,7 @@
   "activity_log.sessionsDescription": "Sitzungen werden erstellt, sobald Sie sich in einem neuen Browser eines Gerätes anmelden. Sitzungen ermöglichen es Ihnen Mattermost ohne erneutes Anmelden nach einer vom System Administrator definierten Zeit zu verwenden. Um sich früher abzumelden, verwenden Sie den 'Abmelden' Button unten, um die Sitzung zu beenden.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android App",
-  "activity_log_modal.desktop": "Native Desktop App",
+  "activity_log_modal.desktop": "Native Desktopanwendung",
   "activity_log_modal.iphoneNativeApp": "iPhone App",
   "add_command.autocomplete": "Auto-Vervollständigung",
   "add_command.autocomplete.help": "(Optional) Zeige Slash-Befehle in Autovervollständigungsliste.",
@@ -310,20 +310,20 @@
   "admin.general.localization.serverLocaleTitle": "Standardsprache Server:",
   "admin.general.log": "Protokollierung",
   "admin.general.policy": "Richtlinie",
-  "admin.general.policy.allowEditPostAlways": "Any time",
-  "admin.general.policy.allowEditPostDescription": "Set policy on the length of time authors have to edit their messages after posting.",
+  "admin.general.policy.allowEditPostAlways": "Jederzeit",
+  "admin.general.policy.allowEditPostDescription": "Regel festlegen, wie lange Authoren ihre Nachtichten nach dem Absenden bearbeiten können.",
   "admin.general.policy.allowEditPostNever": "Nie",
-  "admin.general.policy.allowEditPostTimeLimit": "seconds after posting",
-  "admin.general.policy.allowEditPostTitle": "Allow users to edit their messages:",
+  "admin.general.policy.allowEditPostTimeLimit": "Sekunden nach dem Absenden",
+  "admin.general.policy.allowEditPostTitle": "Erlaube Benutzern das Bearbeiten ihrer Nachrichten:",
   "admin.general.policy.permissionsAdmin": "Team- und Systemadministratoren",
   "admin.general.policy.permissionsAll": "Alle Teammitglieder",
   "admin.general.policy.permissionsAllChannel": "Alle Kanalmitglieder",
   "admin.general.policy.permissionsDeletePostAdmin": "Team- und Systemadministratoren",
-  "admin.general.policy.permissionsDeletePostAll": "Message authors can delete their own messages, and Administrators can delete any message",
+  "admin.general.policy.permissionsDeletePostAll": "Nachrichtenersteller können ihre eigenen Nachrichten löschen, Administratoren können jede Nachricht löschen",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "Systemadministratoren",
   "admin.general.policy.permissionsSystemAdmin": "Systemadministratoren",
-  "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.",
-  "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:",
+  "admin.general.policy.restrictPostDeleteDescription": "Richtline festlegen, wer die Berechtigung erhält, Nachrichten zu löschen.",
+  "admin.general.policy.restrictPostDeleteTitle": "Löschen von Nachrichten erlauben:",
   "admin.general.policy.restrictPrivateChannelCreationDescription": "Regel festlegen, wer private Gruppen erstellen darf.",
   "admin.general.policy.restrictPrivateChannelCreationTitle": "Erlaube Erstellung privater Gruppen für:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "Kommandozeilenwerkzeug",
@@ -375,7 +375,7 @@
   "admin.image.amazonS3BucketExample": "z.B.: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
   "admin.image.amazonS3EndpointDescription": "Hostname Ihres S3 kompatiblen Speicheranbieters. Standardmäßig 's3.amazonaws.com'.",
-  "admin.image.amazonS3EndpointExample": "E.g.: \"s3.amazonaws.com\"",
+  "admin.image.amazonS3EndpointExample": "z.B.: \"s3.amazonaws.com\"",
   "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpunkt:",
   "admin.image.amazonS3IdDescription": "Erhalten Sie diesen Wert von Ihrem Amazon EC2 Administrator.",
   "admin.image.amazonS3IdExample": "z.B.: \"AKIADTOVBGERKLCBV\"",
@@ -526,7 +526,7 @@
   "admin.metrics.enableDescription": "Wenn wahr, wird Mattermost Performance Daten sammeln und profilieren. Bitte schauen Sie in die <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>Dokumentation</a> um mehr über die Konfiguration von Performanceüberwachung für Mattermost zu erfahren.",
   "admin.metrics.enableTitle": "Performance Monitoring aktivieren:",
   "admin.metrics.listenAddressDesc": "Die Adresse auf die der Server hören wird um die Performancemetriken auszugeben.",
-  "admin.metrics.listenAddressEx": "z.B.: \":8065\"",
+  "admin.metrics.listenAddressEx": "z.B.: \":8067\"",
   "admin.metrics.listenAddressTitle": "Empfangs-Adresse:",
   "admin.mfa.bannerDesc": "Multi-Faktor-Authentifizierung ist nur verfügbar für Zugänge mit LDAP und E-Mail Logins.  Wenn es Benutzer in Ihrem System mit anderen Loginmethoden gibt,  wird es empfohlen das Sie Multi-Faktor-Authentifizierung direkt in SSO oder SAML implementieren.",
   "admin.mfa.cluster": "Hoch",
@@ -847,7 +847,7 @@
   "admin.team.maxChannelsExample": "z.B.: \"100\"",
   "admin.team.maxChannelsTitle": "Maximal Kanäle pro Team:",
   "admin.team.maxNotificationsPerChannelDescription": "Maximale Anzahl von Benutzern in einem Kanal bis Benutzer mit @all,@here und @channel keine Benachrichtigungen aufgrund von Performance auslösen können.",
-  "admin.team.maxNotificationsPerChannelExample": "z.B.: \"10000\"",
+  "admin.team.maxNotificationsPerChannelExample": "z.B.: \"1000\"",
   "admin.team.maxNotificationsPerChannelTitle": "Maximale Benachrichtigungen pro Kanal:",
   "admin.team.maxUsersDescription": "Maximale Anzahl an Benutzern pro Team, inklusive Aktive und Inaktive Benutzer.",
   "admin.team.maxUsersExample": "z.B.: \"25\"",
@@ -914,13 +914,13 @@
   "admin.webrtc.gatewayWebsocketUrlTitle": "Gateway-Websocket-URL:",
   "admin.webrtc.stunUriDescription": "Geben Sie ihre STUN URI als stun:<ihre-stun-url>:<port> ein. STUN ist ein standardisiertes Netzwerkprotokoll, das einem Endgerät dabei hilft, seine öffentliche IP-Adresse zu erhalten, wenn es sich hinter einem NAT befindet.",
   "admin.webrtc.stunUriExample": "z.B.: \"stun:webrtc.mattermost.com:5349\"",
-  "admin.webrtc.stunUriTitle": "STUN URI",
+  "admin.webrtc.stunUriTitle": "STUN URI:",
   "admin.webrtc.turnSharedKeyDescription": "Geben Sie ihren TURN Server Shared Key ein. Dies wird verwendet, um dynamische Kennwörter zum herstellen der Verbindung zu erzeugen. Jedes Kennwort ist für einen kurzen Zeitraum gültig.",
   "admin.webrtc.turnSharedKeyExample": "z.B.: \"bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg=\"",
   "admin.webrtc.turnSharedKeyTitle": "TURN Shared Key:",
   "admin.webrtc.turnUriDescription": "Geben Sie ihre TURN URI als turn:<ihre-turn-url>:<port> ein. TURN ist ein standardisiertes Netzwerkprotokoll, das einem Endgerät dabei hilft, eine Verbindung durch die Nutzung einer öffentlichen IP-Weiterleitungsadressse aufzubauen, wenn es sich hinter einem symmetrischen NAT befindet.",
   "admin.webrtc.turnUriExample": "z.B.: \"turn:webrtc.mattermost.com:5349\"",
-  "admin.webrtc.turnUriTitle": "TURN URI",
+  "admin.webrtc.turnUriTitle": "TURN URI:",
   "admin.webrtc.turnUsernameDescription": "Geben Sie Ihren TURN-Server-Benutzernamen ein.",
   "admin.webrtc.turnUsernameExample": "z.B.: \"Benutzername\"",
   "admin.webrtc.turnUsernameTitle": "TURN Benutzername:",
@@ -936,10 +936,10 @@
   "analytics.chart.meaningful": "Nicht genügend Daten für eine aussagekräftige Darstellung.",
   "analytics.system.activeUsers": "Aktive Nutzer mit Beiträgen",
   "analytics.system.channelTypes": "Kanal Typen",
-  "analytics.system.dailyActiveUsers": "Daily Active Users",
+  "analytics.system.dailyActiveUsers": "Tägliche aktive Benutzer",
   "analytics.system.expiredBanner": "Die Enterprise Lizenz im am {date} abgelaufen. Sie haben 15 Tage vom genannten Datum an Zeit die Lizenz zu erneuern, bitte kontaktieren Sie <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.expiringBanner": "Die Enterprise Lizenz wird am {date} ablaufen. Um sie zu erneuern kontaktieren Sie bitte <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
-  "analytics.system.monthlyActiveUsers": "Monthly Active Users",
+  "analytics.system.monthlyActiveUsers": "Monatliche aktive Benutzer",
   "analytics.system.postTypes": "Nachrichten, Dateien und Hashtags",
   "analytics.system.privateGroups": "Private Gruppen",
   "analytics.system.publicChannels": "Öffentliche Kanäle",
@@ -968,18 +968,18 @@
   "analytics.team.title": "Team Statistiken für {team}",
   "analytics.team.totalPosts": "Beiträge Gesamt",
   "analytics.team.totalUsers": "Benutzer Gesamt",
-  "api.channel.add_member.added": "{addedUsername} added to the channel by {username}",
-  "api.channel.delete_channel.archived": "{username} has archived the channel.",
-  "api.channel.join_channel.post_and_forget": "{username} has joined the channel.",
-  "api.channel.leave.left": "{username} has left the channel.",
-  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} updated the channel display name from: {old} to: {new}",
-  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removed the channel header (was: {old})",
-  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} updated the channel header from: {old} to: {new}",
-  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} updated the channel header to: {new}",
-  "api.channel.remove_member.removed": "{removedUsername} was removed from the channel",
-  "app.channel.post_update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {old})",
-  "app.channel.post_update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {old} to: {new}",
-  "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}",
+  "api.channel.add_member.added": "{addedUsername} hinzugefügt zum Kanal durch {username}",
+  "api.channel.delete_channel.archived": "{username} hat den Kanal archiviert.",
+  "api.channel.join_channel.post_and_forget": "{username} ist dem Kanal beigetreten.",
+  "api.channel.leave.left": "{username} hat den Kanal verlassen.",
+  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} hat den Kanalanzeigenamen aktualisiert. Alt: {old} Neu: {new}",
+  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} hat die Kanalüberschrift entfernt (war: {old})",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} hat die Kanalüberschrift aktualisiert. Alt: {old} Neu: {new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} hat die Kanalüberschrift geändert zu: {new}",
+  "api.channel.remove_member.removed": "{removedUsername} wurde vom Kanal entfernt",
+  "app.channel.post_update_channel_purpose_message.removed": "{username} hat den Kanalzweck entfernt (war: {old})",
+  "app.channel.post_update_channel_purpose_message.updated_from": "{username} hat den Kanalzweck aktualisiert. Alt: {old} Neu: {new}",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} hat den Kanalzweck geändert zu: {new}",
   "audit_table.accountActive": "Aktiv geschaltete Zugänge",
   "audit_table.accountInactive": "Inaktiv geschaltete Zugänge",
   "audit_table.action": "Aktion",
@@ -1106,12 +1106,12 @@
   "channel_loader.uploadedFile": " hat eine Datei hochgeladen",
   "channel_loader.uploadedImage": " hat ein Bild hochgeladen",
   "channel_loader.wrote": " schrieb: ",
-  "channel_members_dropdown.channel_admin": "Channel Admin",
+  "channel_members_dropdown.channel_admin": "Kanal-Administrator",
   "channel_members_dropdown.channel_member": "Kanalmitglieder",
-  "channel_members_dropdown.make_channel_admin": "Make Channel Admin",
-  "channel_members_dropdown.make_channel_member": "Make Channel Member",
-  "channel_members_dropdown.remove_from_channel": "Remove From Channel",
-  "channel_members_dropdown.remove_member": "Remove Member",
+  "channel_members_dropdown.make_channel_admin": "Zum Kanal-Administrator machen",
+  "channel_members_dropdown.make_channel_member": "Zum Kanalmitglied machen",
+  "channel_members_dropdown.remove_from_channel": "Vom Kanal entfernen",
+  "channel_members_dropdown.remove_member": "Mitglied entfernen",
   "channel_members_modal.addNew": " Füge neue Mitglieder hinzu",
   "channel_members_modal.members": " Mitglieder",
   "channel_modal.cancel": "Abbrechen",
@@ -1122,7 +1122,7 @@
   "channel_modal.edit": "Bearbeiten",
   "channel_modal.group": "Gruppe",
   "channel_modal.header": "Überschrift",
-  "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
+  "channel_modal.headerEx": "z.B.: \"[Link Titel](http://beispiel.de)\"",
   "channel_modal.headerHelp": "Der Text der in der Kopfzeile der/des {term} neben dem Namen steht. Zum Beispiel könnten Sie häufig genutzte Links durch Hinzufügen von [Link Titel](http://example.de) anzeigen lassen.",
   "channel_modal.modalTitle": "Neue(r) ",
   "channel_modal.name": "Name",
@@ -1133,7 +1133,7 @@
   "channel_modal.publicChannel1": "Erstelle einen öffentlichen Kanal",
   "channel_modal.publicChannel2": "Erstelle einen neuen öffentlichen Kanal dem jeder beitreten kann. ",
   "channel_modal.purpose": "Zweck",
-  "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
+  "channel_modal.purposeEx": "z.B.: \"Ein Kanal um Fehler und Verbesserungsvorschläge abzulegen\"",
   "channel_notifications.allActivity": "Für alle Aktivitäten",
   "channel_notifications.allUnread": "Für alle ungelesenen Nachrichten",
   "channel_notifications.globalDefault": "Globaler Standard ({notifyLevel})",
@@ -1146,7 +1146,7 @@
   "channel_notifications.unreadInfo": "Der Kanalname wird fettgedruckt dargestellt wenn es ungelesene Nachrichten gibt. Auswählen von \"Nur für Erwähnungen\" wird die Fettschreibung der Kanäle nur durchführen wenn Sie erwähnt werden.",
   "channel_select.placeholder": "--- Wählen Sie einen Kanal ---",
   "channel_switch_modal.dm": "(Direktnachricht)",
-  "channel_switch_modal.failed_to_open": "Failed to open channel.",
+  "channel_switch_modal.failed_to_open": "Fehler beim Öffnen des Kanals.",
   "channel_switch_modal.help": "Geben Sie den Kanalnamen ein. Verwenden Sie ↑↓ zum Browsen, TAB zum auswählen, ↵ zum Bestätigen, ESC zum verwerfen",
   "channel_switch_modal.not_found": "Keine Treffer.",
   "channel_switch_modal.submit": "Wechseln",
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>Kurz und gut merkbar ist von Vorteil</li><li>Nur Kleinbuchstaben, Ziffern und Bindestriche verwenden</li><li>Es muss mit einem Buchstaben begonnen werden und darf nicht mit einem Bindestrich enden.</li>",
   "create_team.team_url.regex": "Nur Kleinbuchstaben, Ziffern und Bindestriche verwenden. Es muss mit einem Buchstaben begonnen werden und darf nicht mit einem Bindestrich enden.",
   "create_team.team_url.required": "Dieses Feld ist erforderlich",
-  "create_team.team_url.taken": "URL is taken or contains a reserved word",
+  "create_team.team_url.taken": "URL wird bereits verwendet oder enthält ein reserviertes Wort",
   "create_team.team_url.teamUrl": "Team URL",
   "create_team.team_url.unavailable": "Diese URL ist nicht verfügbar. Bitte eine andere versuchen.",
   "create_team.team_url.webAddress": "Wählen Sie die Webadresse für Ihr neues Team:",
@@ -1307,7 +1307,7 @@
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 Mitglieder} one {Mitglied} other {Mitglieder}} von {total} insgesamt",
   "filtered_user_list.member": "Mitglied",
   "filtered_user_list.next": "Weiter",
-  "filtered_user_list.prev": "Previous",
+  "filtered_user_list.prev": "Zurück",
   "filtered_user_list.search": "Benutzer suchen",
   "filtered_user_list.searchButton": "Suchen",
   "filtered_user_list.show": "Filter:",
@@ -1321,13 +1321,13 @@
   "find_team.submitError": "Bitte eine gültige E-Mail-Adresse eingeben",
   "flag_post.flag": "zur Nachverfolgung markieren",
   "flag_post.unflag": "Demarkieren",
-  "general_tab.chooseDescription": "Bitte wählen Sie einen neuen Namen für Ihr Team",
+  "general_tab.chooseDescription": "Bitte wählen Sie eine neue Beschreibung für Ihr Team",
   "general_tab.chooseName": "Bitte wählen Sie einen neuen Namen für Ihr Team",
   "general_tab.codeDesc": "Auf 'Bearbeiten' klicken um den Einladungscode neu zu generieren.",
   "general_tab.codeLongDesc": "Der Einladungscode ist Teil der URL im Team Einladungslink, welcher über {getTeamInviteLink} im Hauptmenü generiert wird. Eine Neugenerierung erstellt einen neuen Team Einladungslink und macht den vorherigen Link ungültig.",
   "general_tab.codeTitle": "Einladungscode",
   "general_tab.emptyDescription": "Klicken Sie auf 'Bearbeiten' um eine Teambeschreibung hinzuzufügen.",
-  "general_tab.getTeamInviteLink": "Team Einladungslink erhalten",
+  "general_tab.getTeamInviteLink": "Team-Einladungslink abrufen",
   "general_tab.includeDirDesc": "Dieses Team mit aufzuführen wird den Team Namen im Teamverzeichnis auf der Startseite zeigen und einen Link zur Registrierungsseite bereitstellen.",
   "general_tab.no": "Nein",
   "general_tab.openInviteDesc": "Wenn erlaubt wird ein Link zu diesem Team auf der Startseite eingefügt und erlaubt jedem diesem Team beizutreten.",
@@ -1585,7 +1585,7 @@
   "login.passwordChanged": " Passwort erfolgreich aktualisiert",
   "login.session_expired": " Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.",
   "login.signIn": "Anmelden",
-  "login.signInLoading": "Signing in...",
+  "login.signInLoading": "Anmeldung läuft...",
   "login.signInWith": "Anmelden mit:",
   "login.userNotFound": "Ein existierender Zugang mit Ihrem Benutzernamen wurde in diesem Team nicht gefunden.",
   "login.username": "Benutzername",
@@ -1629,7 +1629,7 @@
   "more_channels.join": "Betreten",
   "more_channels.next": "Weiter",
   "more_channels.noMore": "Keine weiteren Kanäle zum betreten",
-  "more_channels.prev": "Previous",
+  "more_channels.prev": "Zurück",
   "more_channels.title": "Weitere Kanäle",
   "more_direct_channels.close": "Schließen",
   "more_direct_channels.message": "Nachricht",
@@ -1706,7 +1706,7 @@
   "post_info.permalink": "Dauerhafter Link",
   "post_info.reply": "Antworten",
   "post_info.system": "System",
-  "post_message_view.edited": "(edited)",
+  "post_message_view.edited": "(bearbeitet)",
   "posts_view.loadMore": "Weitere Nachrichten laden",
   "posts_view.newMsg": "Neue Nachrichten",
   "posts_view.newMsgBelow": "{count} neue {count, plural, one {Mitteilung} other {Mitteilungen}} weiter unten",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - Kann nicht für den Vorgabe-Kanal geändert werden",
   "rename_channel.displayName": "Angezeigter Name",
   "rename_channel.displayNameHolder": "Anzeigenamen eingeben",
-  "rename_channel.handle": "Anfasser",
   "rename_channel.handleHolder": "nur Kleinbuchstaben und Ziffern",
   "rename_channel.lowercase": "Dürfen nur Kleinbuchstaben oder Ziffern sein",
   "rename_channel.maxLength": "Dieses Feld darf nur bis zu 22 Zeichen enthalten",
   "rename_channel.required": "Dieses Feld wird erforderlich",
   "rename_channel.save": "Speichern",
   "rename_channel.title": "Kanal umbenennen",
+  "rename_channel.url": "URL:",
   "rhs_comment.comment": "Kommentar",
   "rhs_comment.del": "Löschen",
   "rhs_comment.edit": "Bearbeiten",
@@ -1940,7 +1940,7 @@
   "update_command.question": "Ihre Änderungen könnten einen existierenden Slash-Befehl außer Kraft setzen. Sind Sie sich sicher dass Sie ihn aktualisieren möchten?",
   "update_command.update": "Aktualisieren",
   "upload_overlay.info": "Datei zum Hochladen hier ablegen.",
-  "user.settings.advance.embed_preview": "For the first web link in a message, display a preview of website content below the message, if available",
+  "user.settings.advance.embed_preview": "Für den ersten Weblink in einer Nachricht, eine Vorschau des Webseiteninhaltes unterhalb der Nachricht, sofern verfügbar, anzeigen",
   "user.settings.advance.embed_toggle": "Zeige Umschalter für alle eingebetteten Vorschauen",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} aktiviert",
   "user.settings.advance.formattingDesc": "Wenn aktiviert werden Nachrichten formatiert, sodass Links erstellt, Emojis angezeigt, Text formatiert und Zeilenumbrüche hinzugefügt werden. Standardmäßig ist dies aktiviert. Ändern der Einstellung erfordert ein Neuladen der Seite.",
@@ -1985,10 +1985,10 @@
   "user.settings.display.channelDisplayTitle": "Kanalanzeige-Modus",
   "user.settings.display.channeldisplaymode": "Wählen Sie die Breite den mittleren Kanals.",
   "user.settings.display.clockDisplay": "Uhrzeit Format",
-  "user.settings.display.collapseDesc": "Set whether previews of image links show as expanded or collapsed by default. This setting can also be controlled using the slash commands /expand and /collapse.",
-  "user.settings.display.collapseDisplay": "Default appearance of image link previews",
-  "user.settings.display.collapseOff": "Collapsed",
-  "user.settings.display.collapseOn": "Expanded",
+  "user.settings.display.collapseDesc": "Einstellen ob Vorschauen für Bildlinks standardmäßig ausgeklappt oder eingeklappt dargestellt werden sollen. Diese Einstellung kann auch über den Slash-Befehl /expand und /collapse verwaltet werden.",
+  "user.settings.display.collapseDisplay": "Standardansicht für Bildlink-Vorschauen",
+  "user.settings.display.collapseOff": "Eingeklappt",
+  "user.settings.display.collapseOn": "Ausgeklappt",
   "user.settings.display.fixedWidthCentered": "Feste Breite, zentriert",
   "user.settings.display.fontDesc": "Wählen Sie die Schriftart zur Anzeige im Mattermost Interface aus.",
   "user.settings.display.fontTitle": "Schriftart",
@@ -2171,9 +2171,9 @@
   "user.settings.security.lastUpdated": "Zuletzt aktualisiert am {date} um {time}",
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Anmeldung durchgeführt durch GitLab",
-  "user.settings.security.loginGoogle": "Login done through Google Apps",
+  "user.settings.security.loginGoogle": "Anmeldung via Google Apps",
   "user.settings.security.loginLdap": "Anmeldung via AD/LDAP",
-  "user.settings.security.loginOffice365": "Login done through Office 365",
+  "user.settings.security.loginOffice365": "Anmeldung via Office 365",
   "user.settings.security.loginSaml": "Anmeldung durchgeführt durch SAML",
   "user.settings.security.logoutActiveSessions": "Zeigen und beenden von aktiven Sitzungen",
   "user.settings.security.method": "Anmeldemethode",
@@ -2202,11 +2202,11 @@
   "user.settings.security.passwordErrorUppercaseNumberSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben, eine Ziffer und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
   "user.settings.security.passwordErrorUppercaseSymbol": "Ihr Passwort muss aus mindestens {min} Zeichen bestehen und mindestens einen Großbuchstaben und ein Symbol (wie \"~!@#$%^&*()\") enthalten.",
   "user.settings.security.passwordGitlabCantUpdate": "Einloggen findet über GitLab statt. Die Adresse kann nicht aktualisiert werden.",
-  "user.settings.security.passwordGoogleCantUpdate": "Einloggen findet über GitLab statt. Die Adresse kann nicht aktualisiert werden.",
+  "user.settings.security.passwordGoogleCantUpdate": "Anmeldung findet über Google Apps statt. Das Passwort kann nicht aktualisiert werden.",
   "user.settings.security.passwordLdapCantUpdate": "Einloggen findet über AD/LDAP statt. Die Adresse kann nicht aktualisiert werden.",
   "user.settings.security.passwordMatchError": "Die eingegebenen neuen Passwörter stimmen nicht überein.",
   "user.settings.security.passwordMinLength": "Ungültige minimale Länge, kann keine Vorschau anzeigen.",
-  "user.settings.security.passwordOffice365CantUpdate": "Einloggen findet über GitLab statt. Die Adresse kann nicht aktualisiert werden.",
+  "user.settings.security.passwordOffice365CantUpdate": "Anmeldung findet über Office 365 statt. Das Passwort kann nicht aktualisiert werden.",
   "user.settings.security.passwordSamlCantUpdate": "Dieses Feld wird durch Ihren Login Provider festgelegt. Wenn Sie es ändern möchten, müssen Sie dies durch den Login Provider tun.",
   "user.settings.security.retypePassword": "Passwort erneut eingeben",
   "user.settings.security.saml": "SAML",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index e9c65ea76..c460c19aa 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - Cannot be changed for the default channel",
   "rename_channel.displayName": "Display Name",
   "rename_channel.displayNameHolder": "Enter display name",
-  "rename_channel.url": "URL",
   "rename_channel.handleHolder": "lowercase alphanumeric&#39;s only",
   "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
   "rename_channel.maxLength": "This field must be less than 22 characters",
   "rename_channel.required": "This field is required",
   "rename_channel.save": "Save",
   "rename_channel.title": "Rename Channel",
+  "rename_channel.url": "URL",
   "rhs_comment.comment": "Comment",
   "rhs_comment.del": "Delete",
   "rhs_comment.edit": "Edit",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index a4ebdc522..535ae6ffd 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -1219,9 +1219,9 @@
   "create_team.team_url.hint": "<li>Corto y memorable es mejor</li><li>Utiliza letras en minúscula, números y guiones</li><li>Debe comenzar con una letra y no puede terminar en guión</li>",
   "create_team.team_url.regex": "Utiliza letras en minúscula, números y guiones. Debe comenzar con una letra y no puede terminar en guión.",
   "create_team.team_url.required": "Este campo es requerido",
-  "create_team.team_url.taken": "Esta URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>comienza con una palabra reservada</a> o no está disponible. Por favor, pruebe con otra.",
+  "create_team.team_url.taken": "El URL ya está en uso o contiene una palabra reservada",
   "create_team.team_url.teamUrl": "URL del Equipo",
-  "create_team.team_url.unavailable": "Esta dirección URL está siendo utilizada o no está disponible. Por favor, pruebe con otra.",
+  "create_team.team_url.unavailable": "Esta dirección URL no está disponible. Por favor, pruebe con otra.",
   "create_team.team_url.webAddress": "Escoge la dirección web para tu nuevo equipo:",
   "custom_emoji.empty": "No se encontraron emoticones personalizados",
   "custom_emoji.header": "Emoticones Personalizados",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - No se puede cambiar el del canal predeterminado",
   "rename_channel.displayName": "Nombre a Mostrar",
   "rename_channel.displayNameHolder": "Ingresa el nombre a mostrar",
-  "rename_channel.handle": "Identificador",
   "rename_channel.handleHolder": "Sólo caracteres alfanumericos y en minúscula",
   "rename_channel.lowercase": "Debe tener caracteres alfanumericos y minúscula",
   "rename_channel.maxLength": "Este campo debe tener menos de 22 caracteres",
   "rename_channel.required": "Este campo es obligatorio",
   "rename_channel.save": "Guardar",
   "rename_channel.title": "Renombrar Canal",
+  "rename_channel.url": "URL",
   "rhs_comment.comment": "Comentario",
   "rhs_comment.del": "Borrar",
   "rhs_comment.edit": "Editar",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 621d8ec66..eab73132c 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>Courte et facile à retenir</li><li>Utilisez des lettres minuscules, des chiffres et des tirets </li><li>Doit commencer par une lettre et ne peut pas se terminer par un tiret</li>",
   "create_team.team_url.regex": "Utilisez uniquement des lettres minuscules , des chiffres et des tirets. Doit commencer par une lettre et ne peut pas se terminer par un tiret.",
   "create_team.team_url.required": "Ce champ est obligatoire",
-  "create_team.team_url.taken": "URL is taken or contains a reserved word",
+  "create_team.team_url.taken": "Cette URL est déjà prise ou contient un mot réservé",
   "create_team.team_url.teamUrl": "URL d’équipe",
   "create_team.team_url.unavailable": "cette url est invalide. Essayer en une autre.",
   "create_team.team_url.webAddress": "Choisissez l’adresse Web de votre nouvelle équipe :",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - Ne peut être changé en canal par défaut",
   "rename_channel.displayName": "Nom d'affichage",
   "rename_channel.displayNameHolder": "Saisissez le nom d'affichage",
-  "rename_channel.handle": "Identifiant",
   "rename_channel.handleHolder": "minuscules alphanumériques seulement",
   "rename_channel.lowercase": "Doit être en caractères alphanumériques minuscules",
   "rename_channel.maxLength": "Ce champ doit faire moins de 22 caractères",
   "rename_channel.required": "Ce champ est obligatoire",
   "rename_channel.save": "Enregistrer",
   "rename_channel.title": "Renommer le canal",
+  "rename_channel.url": "URL :",
   "rhs_comment.comment": "Commentaire",
   "rhs_comment.del": "Supprimer",
   "rhs_comment.edit": "Éditer",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index c03303778..6dcefc3b9 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>短く覚えやすいものがベストです</li><li>英小文字、数字、ダッシュを使ってください</li><li>英小文字で始めてください。ダッシュで終わることはできません</li>",
   "create_team.team_url.regex": "英小文字、数字、ダッシュのみ使用できます。英小文字で始めてください。ダッシュで終わることはできません。",
   "create_team.team_url.required": "この項目は必須です",
-  "create_team.team_url.taken": "このURLは <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>予約語で始まっている</a>か、使用できません。 他のものを試してください。",
+  "create_team.team_url.taken": "URLが取得済みか、予約された単語を含んでいます",
   "create_team.team_url.teamUrl": "チームURL",
   "create_team.team_url.unavailable": "このURLは使用できません。他のものを試してください。",
   "create_team.team_url.webAddress": "あなたの新しいチームのウェブアドレスを選択してください:",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - デフォルトのチャンネルは変更できません",
   "rename_channel.displayName": "表示名",
   "rename_channel.displayNameHolder": "表示名を入力してください",
-  "rename_channel.handle": "ハンドル",
   "rename_channel.handleHolder": "小文字の英数字のみ",
   "rename_channel.lowercase": "小文字の英数字にしてください",
   "rename_channel.maxLength": "この項目は22文字より短くしてください",
   "rename_channel.required": "この項目は必須です",
   "rename_channel.save": "保存する",
   "rename_channel.title": "チャンネル名を変更する",
+  "rename_channel.url": "URL",
   "rhs_comment.comment": "コメント",
   "rhs_comment.del": "削除する",
   "rhs_comment.edit": "編集する",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index baa49f8fe..c6fed27e4 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -439,7 +439,7 @@
   "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost. When set, users will not be able to edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their own first name in Account Settings.",
   "admin.ldap.firstnameAttrEx": "예시 \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "이름 속성",
-  "admin.ldap.idAttrDesc": "AD/LDAP 서버에서 속성(attribute) 의 경우 Mattermost 에서 고유한 식별자로 사용 됩니다. username과 uid 등은 변경되지 않는 값을 가진 AD / LDAP 의 속성이어야합니다. 사용자 ID 특성이 변경된 경우 이전과 관련되지 않은 새로운 Mattermost 계정이 생성됩니다. 이것은 로그인 페이지의 \"AD / LDAP 사용자 이름\"필드에 Mattermost에 로그인하는 데 사용되는 값입니다. 일반적으로이 속성은 위의 \"사용자 이름 속성 '필드와 같습니다. 팀이 일반적으로 도메인 username을 사용하여 AD / LDAP를 사용하여 다른 서비스에 로그인하는 경우 사이트 간의 일관성을 유지하기 위해 도메인 사용자 이름을이 필드에 입력 할 수 있습니다.",
+  "admin.ldap.idAttrDesc": "AD/LDAP 서버에서 속성(attribute)의 경우 Mattermost에서 고유한 식별자로 사용됩니다. 이는 username과 uid 등 변경되지 않는 값을 가진 AD/LDAP 속성이어야 합니다. 사용자의 ID 속성이 변경된 경우, 원래 계정과 무관한 새로운 Mattermost 계정을 생성하게 됩니다. 이는 Mattermost 로그인 페이지에서 \"AD/LDAP 사용자명\" 란에 사용되는 값입니다. 일반적으로 이 속성은 위의 \"사용자 이름 속성\" 란과 같습니다. 팀에서 AD/LDAP를 사용하는 다른 서비스에 로그인할 때 대개 domain\\\\username을 사용할 경우, 사이트 간의 일관성을 유지하기 위해 domain\\\\username을 이 란에 입력할 수 있습니다.",
   "admin.ldap.idAttrEx": "예시 \"sAMAccountName\"",
   "admin.ldap.idAttrTitle": "ID 속성: ",
   "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost. When set, users will not be able to edit their last name, since it is synchronized with the LDAP server. When left blank, users can set their own last name in Account Settings.",
@@ -1086,7 +1086,7 @@
   "channel_header.webrtc.call": "영상 통화 시작하기",
   "channel_header.webrtc.offline": "사용자가 오프라인입니다",
   "channel_header.webrtc.unavailable": "New call unavailable until your existing call ends",
-  "channel_info.about": "About",
+  "channel_info.about": "정보",
   "channel_info.close": "닫기",
   "channel_info.header": "헤더:",
   "channel_info.id": "ID: ",
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>Short and memorable is best</li><li>Use lowercase letters, numbers and dashes</li><li>Must start with a letter and can't end in a dash</li>",
   "create_team.team_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.",
   "create_team.team_url.required": "필수 항목입니다.",
-  "create_team.team_url.taken": "URL is taken or contains a reserved word",
+  "create_team.team_url.taken": "URL이 이미 있거나 예약된 단어입니다.",
   "create_team.team_url.teamUrl": "팀 URL",
   "create_team.team_url.unavailable": "This URL is unavailable. Please try another.",
   "create_team.team_url.webAddress": "팀의 웹 주소:",
@@ -1261,7 +1261,7 @@
   "email_signup.address": "이메일 주소",
   "email_signup.createTeam": "팀 만들기",
   "email_signup.emailError": "유효한 이메일 주소를 입력하세요.",
-  "email_signup.find": "팀 찾기",
+  "email_signup.find": "나의 팀 찾기",
   "email_verify.almost": "{siteName}: 거의 완료되었습니다.",
   "email_verify.failed": " 검증메일 발송을 실패했습니다.",
   "email_verify.notVerifiedBody": "Please verify your email address. Check your inbox for an email.",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - 기본 채널의 URL은 변경할 수 없습니다.",
   "rename_channel.displayName": "표시명",
   "rename_channel.displayNameHolder": "표시명을 입력하세요.",
-  "rename_channel.handle": "URL",
   "rename_channel.handleHolder": "lowercase alphanumeric&#39;s only",
   "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
   "rename_channel.maxLength": "This field must be less than 22 characters",
   "rename_channel.required": "필수 항목입니다.",
   "rename_channel.save": "저장",
   "rename_channel.title": "채널 이름 변경",
+  "rename_channel.url": "URL:",
   "rhs_comment.comment": "답글",
   "rhs_comment.del": "삭제",
   "rhs_comment.edit": "편집",
@@ -2242,7 +2242,7 @@
   "webrtc.declined": "Your call has been declined by {username}.",
   "webrtc.disabled": "{username} has WebRTC disabled, and cannot receive calls. To enable the feature, they must go to Account Settings > Advanced > Preview pre-release features and turn on WebRTC.",
   "webrtc.failed": "There was a problem connecting the video call.",
-  "webrtc.hangup": "Hangup",
+  "webrtc.hangup": "끊어짐",
   "webrtc.header": "{username}과/와의 통화",
   "webrtc.inProgress": "You have a call in progress. Please hangup first.",
   "webrtc.mediaError": "Unable to access camera or microphone.",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index 3b74e5c5b..6fec37537 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>Kort en gemakkelijk te onthouden is het beste</li><li>Gebruik kleine letter, nummers en streepjes</li><li>Een teamnaam moet met een letter beginnen en mag niet met een streepje eindigen</li>",
   "create_team.team_url.regex": "Gebruik enkel kleine letters, nummers en streepjes. De naam moet met een letter beginnen en mag niet met een streepje eindigen.",
   "create_team.team_url.required": "Dit is een verplicht veld",
-  "create_team.team_url.taken": "URL is taken or contains a reserved word",
+  "create_team.team_url.taken": "Deze URL is niet meer beschikbaar of bevat een gereserveerd woord",
   "create_team.team_url.teamUrl": "Team URL",
   "create_team.team_url.unavailable": "Deze URL is niet beschikbaar, probleer een andere.",
   "create_team.team_url.webAddress": "Kies het web adres van uw nieuw team:",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - Kan niet worden verandert voor het standaard kanaal",
   "rename_channel.displayName": "Weergavenaam",
   "rename_channel.displayNameHolder": "Voer de weergavenaam in",
-  "rename_channel.handle": "Handle",
   "rename_channel.handleHolder": "enkel kleine letters en nummers",
   "rename_channel.lowercase": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.maxLength": "Dit veld moet minder dan 22 tekens bevatten",
   "rename_channel.required": "Dit veld is verplicht",
   "rename_channel.save": "Opslaan",
   "rename_channel.title": "Hernoem kanaal...",
+  "rename_channel.url": "URL:",
   "rhs_comment.comment": "Commentaar",
   "rhs_comment.del": "Verwijder",
   "rhs_comment.edit": "Bewerken",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 79e8bf11d..0d767fadc 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -1219,9 +1219,9 @@
   "create_team.team_url.hint": "<li>Curto e memorizável é o melhor</li><li>Use letras minúsculas, números e traços</li><li>Deve começar com uma letra e não pode terminar em um traço</li>",
   "create_team.team_url.regex": "Utilize apenas letras minúsculas, números e traços. Deve começar com uma letra e não pode terminar em um traço.",
   "create_team.team_url.required": "Este campo é obrigatório",
-  "create_team.team_url.taken": "Esta URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>começa com uma palavra reservada</a> ou está indisponível. Por favor tente outra.",
+  "create_team.team_url.taken": "URL é usada ou contém uma palavra reservada",
   "create_team.team_url.teamUrl": "Equipe URL",
-  "create_team.team_url.unavailable": "Esta URL já foi utilizada ou está indisponível. Por favor tente outra.",
+  "create_team.team_url.unavailable": "Esta URL está indisponível. Por favor tente outra.",
   "create_team.team_url.webAddress": "Escolha o endereço web para sua nova equipe:",
   "custom_emoji.empty": "Emoji personalizado não encontrado",
   "custom_emoji.header": "Emoji Personalizado",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - Não pode ser alterado para o canal padrão",
   "rename_channel.displayName": "Nome De Exibição",
   "rename_channel.displayNameHolder": "Insira o nome de exibição",
-  "rename_channel.handle": "Handle",
   "rename_channel.handleHolder": "alfanuméricos minúsculos somente",
   "rename_channel.lowercase": "Tem de ser caracteres minúsculos alfanuméricos",
   "rename_channel.maxLength": "Este campo deve ser menor do que 22 caracteres",
   "rename_channel.required": "Este campo é obrigatório",
   "rename_channel.save": "Salvar",
   "rename_channel.title": "Renomear Canal",
+  "rename_channel.url": "URL:",
   "rhs_comment.comment": "Comentário",
   "rhs_comment.del": "Deletar",
   "rhs_comment.edit": "Editar",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index 6d243f311..13ca881c5 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>Лучше использовать короткие и запоминающиеся</li><li>Используйте строчные буквы, цифры и тире</li><li>Должно начинаться с буквы и не может заканчиваться на тире</li>",
   "create_team.team_url.regex": "Используйте строчные буквы, цифры и тире. Должно начинаться с буквы и не может заканчиваться на тире.",
   "create_team.team_url.required": "Обязательное поле",
-  "create_team.team_url.taken": "Этот URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>начинается с зарезервированного слова</a> или недоступен. Пожалуйста, попробуйте другой.",
+  "create_team.team_url.taken": "Адрес используется или включает зарезервированные слова",
   "create_team.team_url.teamUrl": "URL команды",
   "create_team.team_url.unavailable": "Этот URL занят или недоступен. Пожалуйста, попробуйте другой.",
   "create_team.team_url.webAddress": "Выберите адрес вашей новой команды:",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - Нельзя изменить для канала по умолчанию",
   "rename_channel.displayName": "Имя",
   "rename_channel.displayNameHolder": "Введите имя",
-  "rename_channel.handle": "Handle",
   "rename_channel.handleHolder": "только цифры и строчные буквы",
   "rename_channel.lowercase": "Должны быть буквы или цифры в нижнем регистре",
   "rename_channel.maxLength": "Содержание поля должно быть короче 22 байт",
   "rename_channel.required": "Обязательное поле",
   "rename_channel.save": "Сохранить",
   "rename_channel.title": "Переименовать канал",
+  "rename_channel.url": "URL:",
   "rhs_comment.comment": "Комментарий",
   "rhs_comment.del": "Удалить",
   "rhs_comment.edit": "Редактировать",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 88364005d..5d623c233 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>简短和易记为最好的</li><li>使用小写字母，数字和连字符</li><li>必须以字母开头且不能以连字符结尾</li>",
   "create_team.team_url.regex": "只使用小写字母，数字和连字符。必须以字母开头且不能以连字符结尾。",
   "create_team.team_url.required": "此栏必须填写",
-  "create_team.team_url.taken": "这个 URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>以预留字开头</a> 或不可用。请尝试其他的。",
+  "create_team.team_url.taken": "URL已被使用或含有预留词",
   "create_team.team_url.teamUrl": "团队URL",
   "create_team.team_url.unavailable": "这个URL已使用或不可用。请尝试其他。",
   "create_team.team_url.webAddress": "选择您的新团队网址：",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": "-不能改变默认频道",
   "rename_channel.displayName": "显示名称",
   "rename_channel.displayNameHolder": "输入显示名",
-  "rename_channel.url": "链接地址",
   "rename_channel.handleHolder": "小写字母数字#39;只有",
   "rename_channel.lowercase": "必须小写字母数字字符",
   "rename_channel.maxLength": "这个字段必须少于22个字符",
   "rename_channel.required": "该字段不能为空",
   "rename_channel.save": "保存",
   "rename_channel.title": "重命名频道",
+  "rename_channel.url": "URL：",
   "rhs_comment.comment": "评论",
   "rhs_comment.del": "删除",
   "rhs_comment.edit": "编辑",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index 14b6eb172..9a0adfe85 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -1219,7 +1219,7 @@
   "create_team.team_url.hint": "<li>短且好記憶是最好的</li><li>請用小寫英字母、數字及連接號(-)</li><li>請以小寫英字母開頭，請不要以連接號結尾</li>",
   "create_team.team_url.regex": "請只用小寫英字母、數字及連接號。必須以小寫英字母開頭且不能以連接號結尾。",
   "create_team.team_url.required": "此欄位是必需的",
-  "create_team.team_url.taken": "此網址<a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>以保留字起始</a>或是已被使用。請嘗試其他的網址。",
+  "create_team.team_url.taken": "網址已被使用或是含有保留字",
   "create_team.team_url.teamUrl": "團隊網址",
   "create_team.team_url.unavailable": "不能使用這網址。請嘗試其他的。",
   "create_team.team_url.webAddress": "為新團隊選取網址：",
@@ -1730,13 +1730,13 @@
   "rename_channel.defaultError": " - 預設頻道不能更改",
   "rename_channel.displayName": "顯示名稱",
   "rename_channel.displayNameHolder": "請輸入顯示名稱",
-  "rename_channel.url": "鏈接地址",
   "rename_channel.handleHolder": "僅限小寫英數字",
   "rename_channel.lowercase": "請用小寫英數字",
   "rename_channel.maxLength": "此欄位必須少於22個字元",
   "rename_channel.required": "此欄位是必需的",
   "rename_channel.save": "儲存",
   "rename_channel.title": "變更頻道名稱",
+  "rename_channel.url": "網址：",
   "rhs_comment.comment": "註解",
   "rhs_comment.del": "刪除",
   "rhs_comment.edit": "編輯",