translations PR 20170206 (#5319)

* translations PR 20170206

* Fix platform zh_TW

i18n/de.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Ungültige other user id "
+    "translation": "Invalid user ID for direct channel creation"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "Entschuldigung, wir können die Seite nicht finden."
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "Invalid or missing {{.Name}} in request body"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "Ungültiger {{.Name}} Parameter"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "Alle Caches werden geleert"
@@ -2759,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Ungültiger {{.Name}} Parameter"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Must specify the team ID to create a channel"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
@@ -2779,6 +2791,182 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s der Kanaltitel wurde aktualisiert in %s"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "Error reading import data file."
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSON decode of line failed."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "Import data line has type \"channel\" but the channel object is null."
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "Import data line has type \"team\" but the team object is null."
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "Import data line has type \"user\" but the user objcet is null."
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "Import data line has unknown type \"{{.Type}}\"."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "Channel create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "Channel display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Missing required channel property: display_name."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "Channel header is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "Channel name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "Channel name is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Missing required channel property: name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "Channel purpose is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Missing required channel property: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Channel type is invalid."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Missing required channel property: type."
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Team allowed_domains is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "Team create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "Team description is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "Team display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Missing required team property: display_name"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "Team name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "Team name is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "Missing required team property: name."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "Team name contains reserved word."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "Team type is not valid."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Missing required team property: type"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "User AuthData is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "User AuthService should not be empty if it is provided."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "User email has an invalid length."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Missing required user property: email."
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "User First Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "User Last Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "User nickname is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "User Position is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "User roles are not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Username is not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Ungültige maximale Anzahl an offenen Verbindungen in SQL Einstellungen.  Muss eine positive Zahl sein."
   },
+  {
+    "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."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "Das WebRTC-Gateway-Admin-Secret muss gesetzt sein."
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "Es wurden keine Kanäle gefunden"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "Der bestehende Kanal konnte nicht gefunden werden"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "No deleted channel exists with that name"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "Konnte Extrainformationen für Kanalmitglieder nicht abrufen"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "Konnte Erwähnungenanzahl nicht erhöhen"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "Der Kanal konnte nicht gelöscht werden"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "Die Kanäle konnten nicht gelöscht werden"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "Es existiert bereits ein Kanal mit dieser URL"
+    "translation": "A channel with that name already exists on the same team"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "Die Kommentare des Benutzers konnten nicht gelöscht werden"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "Der Kanal konnte nicht gelöscht werden"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "Es konnte die Nachricht nicht ausgewählt werden welche für den Benutzer gelöscht werden soll"
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "Es konnte kein existierender Account entsprechend Ihrer E-Mail-Adresse für dieses Team gefunden werden. Dieses Team erfordert eventuell eine Einladung vom Teambesitzer um beizutreten."
+    "translation": "Der Benutzer konnte nicht gefunden werden"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/en.json

@@ -207,10 +207,6 @@
     "id": "api.channel.create_channel.max_channel_limit.app_error",
     "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team"
   },
-  {
-    "id": "app.channel.create_channel.no_team_id.app_error",
-    "translation": "Must specify the team ID to create a channel"
-  },
   {
     "id": "api.channel.create_default_channels.off_topic",
     "translation": "Off-Topic"
@@ -799,17 +795,13 @@
     "id": "api.context.404.app_error",
     "translation": "Sorry, we could not find the page."
   },
-  {
-    "id": "api.context.invalid_param.app_error",
-    "translation": "Invalid {{.Name}} parameter"
-  },
   {
     "id": "api.context.invalid_body_param.app_error",
     "translation": "Invalid or missing {{.Name}} in request body"
   },
   {
-    "id": "api.context.invalid_url_param.app_error",
+    "id": "api.context.invalid_param.app_error",
-    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+    "translation": "Invalid {{.Name}} parameter"
   },
   {
     "id": "api.context.invalid_session.error",
@@ -823,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purging all caches"
@@ -2771,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Invalid {{.Name}} parameter"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Must specify the team ID to create a channel"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
@@ -2791,22 +2791,26 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s updated the channel purpose to: %s"
   },
-  {
-    "id": "app.import.bulk_import.json_decode.error",
-    "translation": "JSON decode of line failed."
-  },
   {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error reading import data file."
   },
   {
-    "id": "app.import.import_line.null_team.error",
+    "id": "app.import.bulk_import.json_decode.error",
-    "translation": "Import data line has type \"team\" but the team object is null."
+    "translation": "JSON decode of line failed."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
   },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "Import data line has type \"team\" but the team object is null."
+  },
   {
     "id": "app.import.import_line.null_user.error",
     "translation": "Import data line has type \"user\" but the user object is null."
@@ -2816,36 +2820,52 @@
     "translation": "Import data line has unknown type \"{{.Type}}\"."
   },
   {
-    "id": "app.import.validate_team_import_data.name_missing.error",
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
-    "translation": "Missing required team property: name."
+    "translation": "Channel create_at must not be 0 if provided."
   },
   {
-    "id": "app.import.validate_team_import_data.name_length.error",
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
-    "translation": "Team name is too long."
+    "translation": "Channel display_name is not within permitted length constraints."
   },
   {
-    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
-    "translation": "Team name contains reserved word."
+    "translation": "Missing required channel property: display_name."
   },
   {
-    "id": "app.import.validate_team_import_data.name_characters.error",
+    "id": "app.import.validate_channel_import_data.header_length.error",
-    "translation": "Team name contains invalid characters."
+    "translation": "Channel header is too long."
   },
   {
-    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "id": "app.import.validate_channel_import_data.name_characters.error",
-    "translation": "Missing required team property: display_name"
+    "translation": "Channel name contains invalid characters."
   },
   {
-    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "id": "app.import.validate_channel_import_data.name_length.error",
-    "translation": "Team display_name is not within permitted length constraints."
+    "translation": "Channel name is too long."
   },
   {
-    "id": "app.import.validate_team_import_data.type_missing.error",
+    "id": "app.import.validate_channel_import_data.name_missing.error",
-    "translation": "Missing required team property: type"
+    "translation": "Missing required channel property: name"
   },
   {
-    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
-    "translation": "Team type is not valid."
+    "translation": "Channel purpose is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Missing required channel property: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Channel type is invalid."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Missing required channel property: type."
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Team allowed_domains is too long."
   },
   {
     "id": "app.import.validate_team_import_data.create_at_zero.error",
@@ -2856,84 +2876,60 @@
     "translation": "Team description is too long."
   },
   {
-    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "id": "app.import.validate_team_import_data.display_name_length.error",
-    "translation": "Team allowed_domains is too long."
+    "translation": "Team display_name is not within permitted length constraints."
   },
   {
-    "id": "app.import.import_channel.team_not_found.error",
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
-    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
+    "translation": "Missing required team property: display_name"
   },
   {
-    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "id": "app.import.validate_team_import_data.name_characters.error",
-    "translation": "Missing required channel property: team"
+    "translation": "Team name contains invalid characters."
   },
   {
-    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "id": "app.import.validate_team_import_data.name_length.error",
-    "translation": "Missing required channel property: name"
+    "translation": "Team name is too long."
   },
   {
-    "id": "app.import.validate_channel_import_data.name_length.error",
+    "id": "app.import.validate_team_import_data.name_missing.error",
-    "translation": "Channel name is too long."
+    "translation": "Missing required team property: name."
   },
   {
-    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "id": "app.import.validate_team_import_data.name_reserved.error",
-    "translation": "Channel name contains invalid characters."
+    "translation": "Team name contains reserved word."
   },
   {
-    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "id": "app.import.validate_team_import_data.type_invalid.error",
-    "translation": "Missing required channel property: display_name."
+    "translation": "Team type is not valid."
   },
   {
-    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "id": "app.import.validate_team_import_data.type_missing.error",
-    "translation": "Channel display_name is not within permitted length constraints."
+    "translation": "Missing required team property: type"
   },
   {
-    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
-    "translation": "Missing required channel property: type."
+    "translation": "Channel name missing from User's Channel Membership."
   },
   {
-    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
-    "translation": "Channel type is invalid."
+    "translation": "Invalid roles for User's Channel Membership."
-  },
-  {
-    "id": "app.import.validate_channel_import_data.create_at_zero.error",
-    "translation": "Channel create_at must not be 0 if provided."
-  },
-  {
-    "id": "app.import.validate_channel_import_data.header_length.error",
-    "translation": "Channel header is too long."
-  },
-  {
-    "id": "app.import.validate_channel_import_data.purpose_length.error",
-    "translation": "Channel purpose is too long."
-  },
-  {
-    "id": "app.import.validate_user_import_data.username_missing.error",
-    "translation": "Missing require user property: username."
-  },
-  {
-    "id": "app.import.validate_user_import_data.username_invalid.error",
-    "translation": "Username is not valid."
-  },
-  {
-    "id": "app.import.validate_user_import_data.email_missing.error",
-    "translation": "Missing required user property: email."
-  },
-  {
-    "id": "app.import.validate_user_import_data.email_length.error",
-    "translation": "User email has an invalid length."
-  },
-  {
-    "id": "app.import.validate_user_import_data.auth_service_length.error",
-    "translation": "User AuthService should not be empty if it is provided."
   },
   {
     "id": "app.import.validate_user_import_data.auth_data_length.error",
     "translation": "User AuthData is too long."
   },
   {
-    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
-    "translation": "User nickname is too long."
+    "translation": "User AuthService should not be empty if it is provided."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "User email has an invalid length."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Missing required user property: email."
   },
   {
     "id": "app.import.validate_user_import_data.first_name_length.error",
@@ -2943,6 +2939,10 @@
     "id": "app.import.validate_user_import_data.last_name_length.error",
     "translation": "User Last Name is too long."
   },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "User nickname is too long."
+  },
   {
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "User Position is too long."
@@ -2952,20 +2952,20 @@
     "translation": "User roles are not valid."
   },
   {
-    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "id": "app.import.validate_user_import_data.username_invalid.error",
-    "translation": "Team name missing from User's Team Membership."
+    "translation": "Username is not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
   },
   {
     "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Team Membership."
   },
   {
-    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
-    "translation": "Channel name missing from User's Channel Membership."
+    "translation": "Team name missing from User's Team Membership."
-  },
-  {
-    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Channel Membership."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
@@ -3611,10 +3611,6 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "To must be greater than From"
   },
-  {
-    "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."
-  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Unable to enable email batching when clustering is enabled."
@@ -3843,6 +3839,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
+  {
+    "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."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "WebRTC Gateway Admin Secret must be set."
@@ -4563,14 +4563,14 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "We couldn't increment the mention count"
   },
-  {
-    "id": "store.sql_channel.permanent_delete_by_team.app_error",
-    "translation": "We couldn't delete the channels"
-  },
   {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "We couldn't delete the channel"
   },
+  {
+    "id": "store.sql_channel.permanent_delete_by_team.app_error",
+    "translation": "We couldn't delete the channels"
+  },
   {
     "id": "store.sql_channel.permanent_delete_members_by_user.app_error",
     "translation": "We couldn't remove the channel member"
@@ -4927,14 +4927,14 @@
     "id": "store.sql_post.permanent_delete.app_error",
     "translation": "We couldn't delete the post"
   },
-  {
-    "id": "store.sql_post.permanent_delete_by_channel.app_error",
-    "translation": "We couldn't delete the posts by channel"
-  },
   {
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "We couldn't delete the comments for user"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "We couldn't delete the posts by channel"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "We couldn't select the posts to delete for the user"

i18n/es.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Id de otro usuario no válido "
+    "translation": "Invalid user ID for direct channel creation"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -321,7 +321,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "No se pudo recuperar el usuario al actualizar el mensaje del encabezado del canal %v"
+    "translation": "No se pudo recuperar el usuario al actualizar el mensaje del encabezado del canal"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "Lo sentimos, pero no pudimos encontrar la página."
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "{{.Name}} no válido o no se encuentra en el cuerpo de solicitud"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "Parámetro {{.Name}} inválido"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "Token {{.Token}} de sesión no válido, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "El parámetro {{.Name}} no es válido o no se encuentra en la URL solicitada"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purgando todos los cachés"
@@ -2759,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Parámetro {{.Name}} inválido"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Debe especificar el ID del equipo crear un canal"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "No pudo publicar el mensaje del propósito del canal"
@@ -2779,21 +2791,197 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s actualizó el propósito del canal a: %s"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "Error al leer el archivo de importación de datos."
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "Falla al decodificar la línea en el JSON,"
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Error al importar el canal. El equipo con el nombre \"{{.TeamName}}\" no pudo ser encontrado."
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "La linea a importar tiene un tipo de \"canal\" pero el objeto del canal es null."
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "La linea a importar tiene un tipo de \"equipo\" pero el objeto del equipo es null."
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "La linea a importar tiene un tipo de \"usuario\" pero el objeto del usuario es null."
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "La línea a importar tiene un tipo desconocido de \"{{.Type}}\""
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "La propiedad create_at del canal no debe ser 0 si se proporciona."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "La propiedad del canal display_name no se encuentra dentro de las restricciones de longitud permitida."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Falta la propiedad obligatoria del canal: display_name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "Encabezado del canal es demasiado largo."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "Nombre del canal contiene caracteres no válidos."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "Nombre del canal es demasiado largo."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Falta la propiedad obligatoria del canal: name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "Propósito del canal es demasiado largo."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Falta la propiedad obligatoria del canal: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Tipo de canal no es válido."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Falta la propiedad obligatoria del canal: type"
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "La propiedad del equipo allowed_domains es demasiado larga."
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "La propiedad create_at del equipo no debe ser 0 si se proporciona."
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "Descripción del equipo es demasiado larga."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "La propiedad del equipo display_name no se encuentra dentro de las restricciones de longitud permitida."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Falta la propiedad obligatoria del equipo: display_name."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "Nombre de equipo contiene caracteres no válidos."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "Nombre del equipo es demasiado largo."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "Falta la propiedad obligatoria del equipo: name."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "Nombre de equipo contiene palabra(s) reservada(s)."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "Tipo de equipo no es válido."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Falta la propiedad obligatoria del equipo: type."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "La propiedad AuthData del usuario es demasiado larga."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "La propiedad AuthService del usuario no debe estar vacía si se proporciona"
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "El correo electrónico del usuario tiene una longitud no válida."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Falta la propiedad obligatoria del usuario: email."
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "La propiedad First Name del usuario es demasiado larga."
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "La propiedad Last Name del usuario es demasiado larga."
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "La propiedad nickname del usuario es demasiado larga."
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "La propiedad Position del usuario es demasiado larga."
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "Los roles del usuario no son válidos."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "El nombre de usuario no es válido."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Falta la propiedad obligatoria del usuario: username."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
-    "translation": "Ability to create new teams"
+    "translation": "Capacidad para crear equipos nuevos"
   },
   {
     "id": "authentication.permissions.create_team_roles.name",
-    "translation": "Create Teams"
+    "translation": "Crear Equipos"
   },
   {
     "id": "authentication.permissions.manage_team_roles.description",
-    "translation": "Ability to change the roles of a team member"
+    "translation": "Capacidad para cambiar los roles de un miembro del equipo"
   },
   {
     "id": "authentication.permissions.manage_team_roles.name",
-    "translation": "Manage Team Roles"
+    "translation": "Administrar los roles del Equipo"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3417,7 +3605,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "No puede habilitar el correo electrónico por lotes cuando la agrupación de servidores está habilitada"
+    "translation": "No se puede habilitar el correo electrónico por lotes cuando la agrupación de servidores está habilitada"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Inválida cantidad de conexiones abiertas para la configuración de SQL.  Debe ser un número positivo."
   },
+  {
+    "id": "model.config.is_valid.time_between_user_typing.app_error",
+    "translation": "El tiempo transcurrido para actualizar que el usuario está escribiendo no debe ser menor a 1000 milisegundos."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "La clave secreta de Administración de la Puerta de enlace para WebRTC debe ser asignada."
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "No se encontró ningún canal"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "No pudimos encontrar el canal eliminado"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "No existe un canal eliminado con ese nombre"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "No pudimos obtener información extra de los miembros del canal"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "No pudimos incrementar la cantidad de menciones"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "No pudimos eliminar el canal"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "No pudimos eliminar los canales"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "Un canal con este URL ya existe"
+    "translation": "A channel with that name already exists on the same team"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "No pudimos eliminar los comentarios para el usuario"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "No pudimos eliminar el canal"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "No pudimos seleccionar los mensajes a borrar para el usuario"
@@ -5029,7 +5237,7 @@
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "Ya existe un equipo con ese dominio"
+    "translation": "Ya existe un equipo con ese nombre"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "No pudimos encontrar una cuenta existente que coincida con tu dirección de correo electrónico para este equipo. Es posible que necesites una invitación del dueño del equipo para poder unirte."
+    "translation": "No pudimos encontrar el usuario"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/fr.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "L'autre utilisateur a une ID invalide "
+    "translation": "Invalid user ID for direct channel creation"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "Désolé, impossible de trouver cette page."
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "Invalid or missing {{.Name}} in request body"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "Paramètre {{.Name}} invalide"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purger tous les caches"
@@ -2759,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Paramètre {{.Name}} invalide"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Must specify the team ID to create a channel"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
@@ -2779,6 +2791,182 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s a mis à jour l'en-tête du canal en : %s"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "Error reading import data file."
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSON decode of line failed."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "Import data line has type \"channel\" but the channel object is null."
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "Import data line has type \"team\" but the team object is null."
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "Import data line has type \"user\" but the user objcet is null."
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "Import data line has unknown type \"{{.Type}}\"."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "Channel create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "Channel display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Missing required channel property: display_name."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "Channel header is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "Channel name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "Channel name is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Missing required channel property: name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "Channel purpose is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Missing required channel property: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Channel type is invalid."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Missing required channel property: type."
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Team allowed_domains is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "Team create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "Team description is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "Team display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Missing required team property: display_name"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "Team name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "Team name is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "Missing required team property: name."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "Team name contains reserved word."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "Team type is not valid."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Missing required team property: type"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "User AuthData is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "User AuthService should not be empty if it is provided."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "User email has an invalid length."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Missing required user property: email."
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "User First Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "User Last Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "User nickname is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "User Position is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "User roles are not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Username is not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Nombre maximum de connexions ouvertes invalide dans les paramètres SQL. Doit être un entier positif."
   },
+  {
+    "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."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "La clé secrète de la passerelle administrateur WebRTC doit être définie."
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "Aucun canal n'a pu être trouvé"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "Nous n'avons pas pu trouver le canal existant"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "No deleted channel exists with that name"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "Nous n'avons pas pu charger les informations supplémentaires sur les membres du canal"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "Nous n'avons pas pu incrémenter le nombre de mentions"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "Nous n'avons pas pu supprimer le canal"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "Nous n'avons pas pu supprimer les canaux"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "Un canal avec cette URL existe déjà"
+    "translation": "A channel with that name already exists on the same team"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "Nous n'avons pas supprimer les commentaires de l'utilisateur"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "Nous n'avons pas pu supprimer le canal"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "Nous n'avons pas pu sélectionner les messages à supprimer pour l'utilisateur"
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "Nous n'avons pas pu trouver un compte existant correspondant à l'adresse e-mail pour cette équipe. Cette équipe nécessite peut-être une invitation de la part du propriétaire pour pouvoir la rejoindre."
+    "translation": "Utilisateur introuvable"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/ja.json

@@ -61,7 +61,7 @@
   },
   {
     "id": "api.admin.file_read_error",
-    "translation": "ログファイルの読み込み中にエラーになりました"
+    "translation": "ログファイルの読み込み中にエラーが発生しました"
   },
   {
     "id": "api.admin.get_brand_image.not_available.app_error",
@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "他のユーザーIDが不正です "
+    "translation": "ダイレクトチャンネル作成のユーザーIDが不正です"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -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",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "申し訳ありません。ページが見付かりません。"
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "リクエストボディの{{.Name}}が存在しないか不正です"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "不正な{{.Name}}パラメーターです"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "無効なセッショントークン={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "リクエストURLの{{.Name}}が存在しないか不正です"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "全てのキャッシュを破棄しています"
@@ -2759,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "不正な{{.Name}}パラメーターです"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "チャンネルを作成するにはチームIDを指定しなければなりません"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "チャンネルの目的メッセージを投稿できませんでした"
@@ -2779,21 +2791,197 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s がチャンネルの目的を %s に更新しました"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "インポートデータファイルの読み込み中にエラーが発生しました。"
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSONをデコードできませんでした。"
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "チャンネルのインポート中にエラーが発生しました。 名前 \"{{.TeamName}}\" のチームが見つかりません。"
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "インポートデータに \"channel\" という型がありましたが、そのチャンネルのオブジェクトがnullでした。"
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "インポートデータに \"team\" という型がありましたが、そのチームのオブジェクトがnullでした。"
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "インポートデータに \"user\" という型がありましたが、そのユーザーのオブジェクトがnullでした。"
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "インポートデータに不明な型 \"{{.Type}}\"がありました。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "チャンネル作成日時は0ではないはずです。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "チャンネルの表示名の長さが制限を超えています。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "必須のチャンネル設定値 display_name が存在しません。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "チャンネルヘッダーが長すぎます。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "チャンネル名が不正な文字を含んでいます。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "チャンネル名が長すぎます。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "必須のチャンネル設定値 name が存在しません。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "チャンネルの目的が長すぎます。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "必須のチャンネル設定値 team が存在しません。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "チャンネルの種類が不正です。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "必須のチャンネル設定値 type が存在しません。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "チームの許可されたドメインが長すぎます。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "チームの作成日時は0ではないはずです。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "チームの説明が長すぎます。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "チームの表示名の長さが制限を超えています。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "必須のチーム設定値 display_name が存在しません。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "チーム名が不正な文字を含んでいます。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "チーム名が長すぎます。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "必須のチーム設定値 name が存在しません。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "チーム名が予約語を含んでいます。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "チームの種類が正しくありません。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "必須のチーム設定値 type が存在しません。"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "ユーザーのチャンネルメンバーシップにチャンネル名が存在しません。"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "ユーザーのチャネルメンバーシップの役割が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "ユーザーの認証データが長すぎます。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "ユーザーの認証サービス設定を指定する場合、空ではいけません。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "ユーザーの電子メールの長さが不正です。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "必須のユーザー設定値 email が存在しません。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "ユーザーの名前（ファーストネーム）が長すぎます。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "ユーザーの姓（ラストネーム）が長すぎます。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "ユーザーのニックネームが長すぎます。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "ユーザーの役職が長すぎます。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "ユーザーの役割が正しくありません。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "ユーザー名が正しくありません。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "必須のユーザー設定値 uername が存在しません。"
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "ユーザーのチームメンバーシップの役割が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "ユーザーのチームメンバーシップにチーム名が存在しません。"
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
-    "translation": "Ability to create new teams"
+    "translation": "新しいチームを作成できるようにする"
   },
   {
     "id": "authentication.permissions.create_team_roles.name",
-    "translation": "Create Teams"
+    "translation": "チームを作成する"
   },
   {
     "id": "authentication.permissions.manage_team_roles.description",
-    "translation": "Ability to change the roles of a team member"
+    "translation": "チームメンバーの役割を変更できるようにする"
   },
   {
     "id": "authentication.permissions.manage_team_roles.name",
-    "translation": "Manage Team Roles"
+    "translation": "チームの役割を管理する"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3417,7 +3605,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "クラスタリングが有効化されている場合、電子メールのバッチ処理は有効化できません"
+    "translation": "クラスタリングが有効化されている場合、電子メールバッチ処理は有効化できません。"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "SQL設定の最大稼働接続数が不正です。正の数を指定してください。"
   },
+  {
+    "id": "model.config.is_valid.time_between_user_typing.app_error",
+    "translation": "ユーザー入力の更新間隔は1000ミリ秒未満に設定しないでください。"
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "WebRTCゲートウェイ管理者秘密情報を設定してください。"
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "チャンネルが見付かりませんでした"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "削除されたチャンネルが見付かりませんでした"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "その名前を持つ削除されたチャンネルは存在しません"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "チャンネルメンバーに関する追加の情報を取得できませんでした"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "あなたについての投稿数を集計できませんでした"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "チャンネルを削除できませんでした"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "チャンネルが削除できませんでした"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "このURLは他のチャンネルで使用済みです"
+    "translation": "その名前を持つチャンネルは既に同じチームに存在します"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "ユーザーのコメントを削除できませんでした"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "チャンネルの投稿を削除できませんでした"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "ユーザーの削除しようとする投稿を選択できませんでした"
@@ -5029,7 +5237,7 @@
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "そのドメインを持つチームは既に存在しています"
+    "translation": "その名前を持つチームは既に存在しています"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "このチームの電子メールアドレスに合致する既存のアカウントを見付けられませんでした。このチームに参加するには、チームのオーナーから招待を受ける必要があります。"
+    "translation": "ユーザーが見付かりませんでした。"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/ko.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "사용자 아이디가 적합하지 않습니다"
+    "translation": "Invalid user ID for direct channel creation"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "죄송합니다, 페이지를 찾을 수 없습니다."
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "Invalid or missing {{.Name}} in request body"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "적절하지 않은 {{.Name}} 파라미터"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purging all caches"
@@ -2759,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "적절하지 않은 {{.Name}} 파라미터"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Must specify the team ID to create a channel"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
@@ -2779,6 +2791,182 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s이(가) 채널 헤더를 %s로 갱신했습니다"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "Error reading import data file."
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSON decode of line failed."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "Import data line has type \"channel\" but the channel object is null."
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "Import data line has type \"team\" but the team object is null."
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "Import data line has type \"user\" but the user objcet is null."
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "Import data line has unknown type \"{{.Type}}\"."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "Channel create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "Channel display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Missing required channel property: display_name."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "Channel header is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "Channel name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "Channel name is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Missing required channel property: name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "Channel purpose is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Missing required channel property: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Channel type is invalid."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Missing required channel property: type."
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Team allowed_domains is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "Team create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "Team description is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "Team display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Missing required team property: display_name"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "Team name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "Team name is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "Missing required team property: name."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "Team name contains reserved word."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "Team type is not valid."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Missing required team property: type"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "User AuthData is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "User AuthService should not be empty if it is provided."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "User email has an invalid length."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Missing required user property: email."
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "User First Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "User Last Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "User nickname is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "User Position is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "User roles are not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Username is not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
+  {
+    "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."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "WebRTC Gateway Admin Secret 이 설정되어야 합니다."
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "No channels were found"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "존재하는 채널을 찾지 못했습니다."
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "No deleted channel exists with that name"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "We couldn't get the extra info for channel members"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "We couldn't increment the mention count"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "채널을 삭제하지 못했습니다."
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "채널을 찾을 수 없습니다"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "A channel with that URL already exists"
+    "translation": "A channel with that name already exists on the same team"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "We couldn't delete the comments for user"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "채널을 삭제하지 못했습니다."
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "We couldn't select the posts to delete for the user"
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "We couldn't find an existing account matching your email address for this team. This team may require an invite from the team owner to join."
+    "translation": "사용자를 찾을 수 없습니다"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/nl.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Andere gebruiker heeft een ongeldig id "
+    "translation": "Invalid user ID for direct channel creation"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "Sorry, we kunnen de pagina niet vinden."
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "Invalid or missing {{.Name}} in request body"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "Ongeldig {{.Name}} parameter"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purging all caches"
@@ -2759,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Ongeldige {{.Name}} parameter"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Must specify the team ID to create a channel"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
@@ -2779,6 +2791,182 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s heeft de kanaalkoptekst bijgewerkt naar: %s"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "Error reading import data file."
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSON decode of line failed."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "Import data line has type \"channel\" but the channel object is null."
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "Import data line has type \"team\" but the team object is null."
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "Import data line has type \"user\" but the user objcet is null."
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "Import data line has unknown type \"{{.Type}}\"."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "Channel create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "Channel display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Missing required channel property: display_name."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "Channel header is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "Channel name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "Channel name is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Missing required channel property: name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "Channel purpose is too long."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Missing required channel property: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Channel type is invalid."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Missing required channel property: type."
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Team allowed_domains is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "Team create_at must not be 0 if provided."
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "Team description is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "Team display_name is not within permitted length constraints."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Missing required team property: display_name"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "Team name contains invalid characters."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "Team name is too long."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "Missing required team property: name."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "Team name contains reserved word."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "Team type is not valid."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Missing required team property: type"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "User AuthData is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "User AuthService should not be empty if it is provided."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "User email has an invalid length."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Missing required user property: email."
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "User First Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "User Last Name is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "User nickname is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "User Position is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "User roles are not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Username is not valid."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Ongeldig maximaal aantal open verbindingen bij SQL instellingen. Moet een getal groter dan 0 zijn."
   },
+  {
+    "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."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "WebRTC Gateway Admin Secret moet worden ingesteld."
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "Geen kanaal gevonden"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "Het kanaal kon niet gevonden worden"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "No deleted channel exists with that name"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "We kunnen de extra info niet ophalen voor de kanaal leden"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "We kunnen de vermeldingen niet ophogen"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "Het kanaal kan niet verwijderd worden"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "De kanalen kunnen niet verwijderd worden"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "Een kanaal met die URL bestaat al"
+    "translation": "A channel with that name already exists on the same team"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "We kunnen het bericht voor de gebruiker niet verwijderen"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "Het kanaal kan niet verwijderd worden"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "We kunnen de gekozen berichten voor de gebruiker niet verwijderen"
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "Er is geen bestaand account gevonden op basis van het e-mail adres voor dit team. Het kan zijn dat een uitnodiging nodig is om lid te worden van dit team."
+    "translation": "De gebruiker kan niet gevonden worden"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/pt-BR.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "ID do outro usuário inválida  "
+    "translation": "ID de usuário inválido para a criação do canal direto"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -321,7 +321,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "Não foi possível recuperar o usuário ao tentar salvar a atualização da mensagem do cabeçalho do canal %v"
+    "translation": "Não foi possível recuperar o usuário ao tentar atualizar a mensagem do cabeçalho do canal"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "Desculpe, não conseguimos encontrar a página."
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "{{.Name}} inválido ou ausente no corpo da requisição"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "Parâmetro {{.Name}} inválido"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "Token de sessão inválido={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Parâmetro {{.Name}} inválido ou ausente na URL de requisição"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purgar todos os caches"
@@ -2759,6 +2767,10 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Parâmetro {{.Name}} inválido"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "É necessário informar o ID da equipe para criar um canal"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Falha ao postar a mensagem de propósito do canal"
@@ -2779,21 +2791,197 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s atualizou o propósito do canal para: %s"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "Erro ao ler arquivo de importação."
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "Decodificação JSON da linha falhou."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Erro ao importar canal. A equipe com o nome \"{{.TeamName}}\" não foi encontrado."
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "A linha de dados de importação é do tipo \"channel\" mas o objeto channel é nulo."
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "A linha de dados de importação é do tipo \"team\" mas o objeto team é nulo."
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "A linha de dados de importação tem o tipo \"user\", mas o objeto user é nulo."
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "A linha de dados de importação possui o tipo desconhecido \"{{.Type}}\"."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "Canal create_at precisa ser maior que 0 se informado."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "A propriedade display_name do canal não está dentro das restrições de comprimento permitidas."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Faltando a propriedade obrigatória do canal: display_name."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "O cabeçalho do canal é muito longo."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "O nome do canal contém caracteres inválidos."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "O nome do canal é muito longo."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Faltando a propriedade obrigatória do canal: name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "O propósito do canal é muito longo."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Faltando a propriedade obrigatória do canal: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "O tipo do canal é inválido."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Faltando a propriedade obrigatória do canal: type."
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Equipe allowed_domains é muito longo."
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "Equipe create_at não pode ser 0 se informado."
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "A descrição da equipe é muito longa."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "A propriedade display_name da equipe não está dentro das restrições de comprimento permitidas."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Falta a propriedade obrigatória da equipe: display_name"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "O nome da equipe contém caracteres inválidos."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "O nome da equipe é muito longo."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "A propriedade obrigatória nome não foi informada para a equipe."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "O nome da equipe possui palavras reservadas."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "O tipo da equipe não é válido."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Falta a propriedade obrigatória da equipe: type"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Falta nome do canal em Usuário Membro do Canal."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Função inválida em Usuário Membro do Canal."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "O AuthData do usuário é muito longo."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "O AuthService do usuário não deve ser vazio caso informado."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "O email do usuário possui um comprimento inválido."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Faltando a propriedade obrigatória do usuário: email."
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "O Primeiro Nome do usuário é muito longo."
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "O Último Nome do usuário é muito longo."
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "O apelido do usuário é muito longo."
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "O Cargo do usuário é muito longo."
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "As funções de usuário não são válidas."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Nome de usuário inválido"
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Faltando a propriedade obrigatória do usuário: username."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Função inválida em Usuário Membro da Equipe."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Falta nome da equipe em Usuário Membro da Equipe."
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
-    "translation": "Ability to create new teams"
+    "translation": "Capacidade de criar novas equipes"
   },
   {
     "id": "authentication.permissions.create_team_roles.name",
-    "translation": "Create Teams"
+    "translation": "Criar Equipes"
   },
   {
     "id": "authentication.permissions.manage_team_roles.description",
-    "translation": "Ability to change the roles of a team member"
+    "translation": "Capacidade de alterar as funções de um membro da equipe"
   },
   {
     "id": "authentication.permissions.manage_team_roles.name",
-    "translation": "Manage Team Roles"
+    "translation": "Gerenciar Funções da Equipe"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3417,7 +3605,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Não é possível ativar email em lote quando clustering está ativo"
+    "translation": "Não é possível ativar email em lote quando clustering está ativo."
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Inválido máximo de conexões abertas em configurações SQL.  Deve ser um número positivo."
   },
+  {
+    "id": "model.config.is_valid.time_between_user_typing.app_error",
+    "translation": "O tempo de atualização de digitação do usuário não deve ser definido para menos de 1000 milissegundos."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "Chave Secreta de Administração do WebRTC Gateway precisa ser definida."
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "Nenhum canal foi encontrado"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "Não foi possível encontrar o canal excluído existente"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "Não existe nenhum canal excluído com esse nome"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "Nós não podemos obter a informação extra para membros do canal"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "Não foi possível incrementar o número de menções"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "Não foi possível excluir o canal"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "Não foi possível deletar os canais"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "Um canal com essa URL já existe"
+    "translation": "Um canal com o este nome já existe nesta equipe"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "Não foi possível deletar os comentários para o usuário"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "Não foi possível excluir as postagens por canal"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "Não foi possível selecionar os posts para deletar para o usuário"
@@ -5029,7 +5237,7 @@
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "Uma equipe com este domínio já existe"
+    "translation": "Já existe uma equipe com este nome"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "Não foi possível encontrar uma conta correspondente ao seu endereço de email para esta equipe. Esta equipe pode exigir um convite do dono da equipe para participar."
+    "translation": "Não foi possível encontrar o usuário."
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/ru.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Неверный идентификатор другого пользователя "
+    "translation": "Неверный ID пользователя при создании приватного канала"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -313,7 +313,7 @@
   },
   {
     "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",
@@ -795,13 +795,17 @@
     "id": "api.context.404.app_error",
     "translation": "Извините, мы не смогли найти страницу."
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "Неверно или пропущено {{.Name}} в теле запроса"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "Неверный параметр {{.Name}}"
   },
   {
     "id": "api.context.invalid_session.error",
-    "translation": "Invalid session err=%v"
+    "translation": "Неверная сессия err=%v"
   },
   {
     "id": "api.context.invalid_team_url.debug",
@@ -809,7 +813,11 @@
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
+    "translation": "Неверный токен сессии={{.Token}}, err={{.Error}}"
+  },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Неверный или пропущенный параметр {{.Name}} в запросе URL"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1581,7 +1589,7 @@
   },
   {
     "id": "api.post.update_post.permissions_denied.app_error",
-    "translation": "Возможность создания команд была отключена. Пожалуйста, обратитесь к вашему системному администратору за подробностями."
+    "translation": "Возможность редактирования сообщений была отключена. Пожалуйста, обратитесь к Вашему системному администратору за подробностями."
   },
   {
     "id": "api.post.update_post.permissions_details.app_error",
@@ -1589,7 +1597,7 @@
   },
   {
     "id": "api.post.update_post.permissions_time_limit.app_error",
-    "translation": "Post edit is only allowed for {{.timeLimit}} seconds. Please ask your systems administrator for details."
+    "translation": "Редактирование сообщений разрешено только {{.timeLimit}} секунд после публикации. За подробностями обратитесь к Вашему системному администратору."
   },
   {
     "id": "api.post.update_post.system_message.app_error",
@@ -2249,7 +2257,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
+    "translation": "Не удалось применить настройки приватного канала для пользователя: user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2753,15 +2761,19 @@
   },
   {
     "id": "api.websocket.invalid_session.error",
-    "translation": "Invalid session err=%v"
+    "translation": "Неверная сессия err=%v"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "Недопустимый параметр {{.Name}}"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Для создания канала необходимо указать ID команды"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
-    "translation": "Failed to post channel purpose message"
+    "translation": "Не удалось обновить заголовок канала."
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.removed",
@@ -2779,21 +2791,197 @@
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
     "translation": "%s обновил заголовок канала на: %s"
   },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "Ошибка чтения файла импорта."
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "Ошибка обработки строки JSON."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Ошибка импорта канала. Команда с именем \"{{.TeamName}}\" не найдена."
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "Строка импорта данных содержит тип \"channel\", но объект channel равен null."
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "Строка импорта данных содержит тип \"team\", но объект team равен null."
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "Строка импорта данных содержит тип \"user\", но объект user равен null."
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "Строка импорта данных содержит неизвестный тип \"{{.Type}}\"."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "Если свойство Channel create_at присутствует, то оно не может быть равно 0."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "Свойство Channel display_name не находится в пределах допустимых ограничений длины."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Пропущено обязательное свойство channel: display_name."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "Длина заголовка канала слишком большая."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "Имя канала содержит недопустимые символы."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "Имя канала слишком длинное."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Пропущено обязательное свойство channel: name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "Заголовок канала слишком длинный."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Пропущено обязательное свойство channel: team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Неверный тип канала."
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Пропущено обязательное свойство channel: type."
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Свойство Team allowed_domains слишком длинное."
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "Если свойство Team create_at задано, то оно не может быть 0."
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "Описание команды слишком длинное."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "Свойство Team display_name не находится в пределах допустимых ограничений длины."
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Пропущено необходимое свойство team: display_name"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "Имя команды содержит недопустимые символы."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "Имя команды слишком длинное."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "Пропущено необходимое свойство team: name."
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "Имя команды содержит зарезервированные слова."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "Неверный тип команды."
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Пропущено необходимое свойство team: type"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "User AuthData is too long."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "Если задан пользователь AuthService, то он не может быть пустым."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "E-Mail пользователя имеет неверную длину."
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Пропущено обязательное свойство user: email."
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "Имя пользователя слишком длинное."
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "Фамилия пользователя слишком длинная."
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "Псевдоним пользователя слишком длинный."
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "Расположение пользователя слишком длинное."
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "Неверные роли пользователя."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Неверное имя пользователя."
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Пропущено необходимое свойство user: username."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
+  },
   {
     "id": "authentication.permissions.create_team_roles.description",
-    "translation": "Ability to create new teams"
+    "translation": "Возможность создавать новые команды"
   },
   {
     "id": "authentication.permissions.create_team_roles.name",
-    "translation": "Create Teams"
+    "translation": "Создание команд"
   },
   {
     "id": "authentication.permissions.manage_team_roles.description",
-    "translation": "Ability to change the roles of a team member"
+    "translation": "Возможность изменять роли участников команды"
   },
   {
     "id": "authentication.permissions.manage_team_roles.name",
-    "translation": "Manage Team Roles"
+    "translation": "Управление ролями команды"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "Неверное значение максимального количества открытых соединений в настройках SQL. Число должно быть положительным."
   },
+  {
+    "id": "model.config.is_valid.time_between_user_typing.app_error",
+    "translation": "Обновления статуса набора текста пользователем не могут быть чаще, чем раз в 1000 миллисекунд."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "Admin Secret для шлюза WebRTC должен быть установлен."
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "Каналы не найдены"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "Не удалось найти существующий канал"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "Не существует удалённого канала с таким именем."
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "Не удалось получить дополнительные сведения об участниках канала"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "Не удалось увеличить счетчик упоминаний"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "Неудачная попытка удалить канал"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "Безуспешная попытка удалить каналы"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "Канал с таким URL уже существует"
+    "translation": "Канал с таким именем уже существует в этой команде"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "Неудачная попытка удалить комментарии пользователя"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "Неудачная попытка удалить канал"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "Не удалось выбрать для удаления посты пользователя"
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "Не удалось найти действительную учетную запись с соответствующим адресом электронной почты для данной команды. Эта команда может требовать приглашения от владельца команды для присоединения."
+    "translation": "Мы не смогли найти пользователя"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/zh_CN.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "无效的其他用户 ID "
+    "translation": "Invalid user ID for direct channel creation"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -305,7 +305,7 @@
   },
   {
     "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",
@@ -313,7 +313,7 @@
   },
   {
     "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",
@@ -795,6 +795,10 @@
     "id": "api.context.404.app_error",
     "translation": "对不起，我们找不到该页面。"
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "请求消息体有无效或缺少 {{.Name}}"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "无效 {{.Name}} 参数"
@@ -811,6 +815,10 @@
     "id": "api.context.invalid_token.error",
     "translation": "无效会话令牌 token={{.Token}}, err={{.Error}}"
   },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "请求网址有无效或缺少 {{.Name}}"
+  },
   {
     "id": "api.context.invalidate_all_caches",
     "translation": "清除所有缓存"
@@ -1509,7 +1517,7 @@
   },
   {
     "id": "api.post.send_notifications.user_id.debug",
-    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
+    "translation": "消息创建者不在频道中，未发送推送 post_id=%v channel_id=%v user_id=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
@@ -1561,7 +1569,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
+    "translation": "发送推送失败 device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
@@ -1581,7 +1589,7 @@
   },
   {
     "id": "api.post.update_post.permissions_denied.app_error",
-    "translation": "团队创建被禁用。详细请询问您的系统管理员。"
+    "translation": "消息修改已禁用。详细请询问您的系统管理员。"
   },
   {
     "id": "api.post.update_post.permissions_details.app_error",
@@ -1589,7 +1597,7 @@
   },
   {
     "id": "api.post.update_post.permissions_time_limit.app_error",
-    "translation": "Post edit is only allowed for {{.timeLimit}} seconds. Please ask your systems administrator for details."
+    "translation": "消息只允许在 {{.limeLimit}} 秒内编辑。详情请咨询您的系统管理员。"
   },
   {
     "id": "api.post.update_post.system_message.app_error",
@@ -2501,19 +2509,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",
@@ -2529,15 +2537,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",
@@ -2759,41 +2767,221 @@
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "无效的参数 {{.Name}}"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Must specify the team ID to create a channel"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
-    "translation": "Failed to post channel purpose message"
+    "translation": "发送频道作用消息失败"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.removed",
-    "translation": "%s 删除了频道标题 (原为: %s)"
+    "translation": "%s 删除了频道作用 (原为: %s)"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.retrieve_user.error",
-    "translation": "尝试保存更新的频道标题消息 %v 时获取用户信息失败"
+    "translation": "尝试保存更新的频道作用消息 %v 时获取用户信息失败"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_from",
-    "translation": "%s 将频道标题从 %s 更新为 %s"
+    "translation": "%s 将频道作用从: %s 更新为: %s"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
-    "translation": "%s 更新频道标题为: %s"
+    "translation": "%s 更新了频道作用为: %s"
+  },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "读取数据导入文件错误。"
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSON 解码行失败。"
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "导入频道失败。团队名 \"{{.TeamName}}\" 无法找到。"
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "导入数据行有类型 \"channel\" 但频道对象是无。"
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "导入数据行有类型 \"team\" 但团队对象是无。"
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "导入数据行有类型 \"user\" 但用户对象是无。"
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "导入数据行有无效的类型 \"{{.Type}}\"。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "如果提供频道 create_at 则不能为 0。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "频道 display_name 不在允许的长度范围内。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "缺少频道必须属性：display_name。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "频道标题过长。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "频道名称包含无效字符。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "频道名称过长。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "缺少频道必须属性：name"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "频道作用过长。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "缺少频道必须属性：team"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "无效频道类型。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "缺少频道必须属性：type。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "团队 allowed_domains 过长。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "如果提供团队 create_at 则不能为 0。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "团队简介过长。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "团队 display_name 不在允许的长度范围内。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "缺少频道必须属性：display_name"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "团队名包含非法字符。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "团队名过长。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "缺少频道必须属性：name。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "团队名含有预留词。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "无效团队类型。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "缺少频道必须属性：type"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "用户 AuthData 过长。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "如果提供用户 AuthService 则不能留空。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "用户邮箱地址拥有无效长度。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "缺少用户必须属性：email。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "用户名子过长。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "用户姓氏过长。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "用户昵称过长。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "用户职位过长。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "无效用户角色。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "无效的用户名。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "缺少用户必须属性：username。"
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
   },
   {
     "id": "authentication.permissions.create_team_roles.description",
-    "translation": "Ability to create new teams"
+    "translation": "能创建新团队"
   },
   {
     "id": "authentication.permissions.create_team_roles.name",
-    "translation": "Create Teams"
+    "translation": "创建团队"
   },
   {
     "id": "authentication.permissions.manage_team_roles.description",
-    "translation": "Ability to change the roles of a team member"
+    "translation": "能修改团队成员的角色"
   },
   {
     "id": "authentication.permissions.manage_team_roles.name",
-    "translation": "Manage Team Roles"
+    "translation": "管理团队角色"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3417,7 +3605,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "当机群启用时没法启动批量电子邮件"
+    "translation": "当机群启用时没法启动批量电子邮件。"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "SQL 设置中最大开启连接数无效。必须是正整数。"
   },
+  {
+    "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."
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "WebRTC 网关管理密码必须设定。"
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "没有找到频道"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "我们找不到存在的已删除频道"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "没有用于此名的已删频道"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "我们无法获得额外的信息频道成员"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "我们不能增加提及数"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "我们无法删除频道"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "我们无法删除频道"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "已存在使用该 URL 的频道"
+    "translation": "A channel with that name already exists on the same team"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "我们不能删除用户的评论"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "我们无法删除频道"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "我们不能为用户选择要删除的信息"
@@ -5029,7 +5237,7 @@
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "该网域的团队已存在"
+    "translation": "已有团队拥有此名称"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "我们无法从这个团队找到一个现有匹配您的电子邮件的帐户。此团队或许需要从团队拥有者获得邀请才可加入。"
+    "translation": "无法找到该用户。"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

i18n/zh_TW.json

@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "無效的其他使用者 ID"
+    "translation": "Invalid user ID for direct channel creation"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -301,11 +301,11 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "發送顯示名稱更新訊息時失敗 %v"
+    "translation": "發送顯示名稱更新訊息時失敗"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
-    "translation": "嘗試儲存更新的頻道標題訊息 %v 時取得使用者資訊失敗"
+    "translation": "在更新頻道顯示名稱時無法取得使用者資訊"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
@@ -313,7 +313,7 @@
   },
   {
     "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,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "張貼 加入/退出 訊息 %v 失敗"
+    "translation": "發送加入/退出 訊息失敗"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -795,13 +795,17 @@
     "id": "api.context.404.app_error",
     "translation": "抱歉，無法找到頁面。"
   },
+  {
+    "id": "api.context.invalid_body_param.app_error",
+    "translation": "要求內容中缺少 {{.Name}} 或是該值為無效"
+  },
   {
     "id": "api.context.invalid_param.app_error",
     "translation": "無效的 {{.Name}} 參數"
   },
   {
     "id": "api.context.invalid_session.error",
-    "translation": "Invalid session err=%v"
+    "translation": "無效工作階段 err=%v"
   },
   {
     "id": "api.context.invalid_team_url.debug",
@@ -809,7 +813,11 @@
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
+    "translation": "無效工作階段 token={{.Token}}, err={{.Error}}"
+  },
+  {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "要求網址中缺少 {{.Name}} 參數或是該值為無效 "
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1489,7 +1497,7 @@
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "取得直接訊息頻道的兩位成員失敗 channel_id=%v"
+    "translation": "取得直接訊息頻道的兩位成員失敗 channel_id={{.ChannelId}}"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
@@ -1509,7 +1517,7 @@
   },
   {
     "id": "api.post.send_notifications.user_id.debug",
-    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
+    "translation": "此訊息的發起人不在頻道，將不發送通知 post_id=%v channel_id=%v user_id=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
@@ -1561,7 +1569,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
+    "translation": "發送推播失敗 device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
@@ -1581,7 +1589,7 @@
   },
   {
     "id": "api.post.update_post.permissions_denied.app_error",
-    "translation": "建立團隊已被停用。請洽詢系統管理員了解詳情。"
+    "translation": "編輯訊息已被停用。請洽詢系統管理員了解詳情。"
   },
   {
     "id": "api.post.update_post.permissions_details.app_error",
@@ -1589,7 +1597,7 @@
   },
   {
     "id": "api.post.update_post.permissions_time_limit.app_error",
-    "translation": "Post edit is only allowed for {{.timeLimit}} seconds. Please ask your systems administrator for details."
+    "translation": "僅在 {{.timeLimit}} 秒內可以編輯訊息。請洽詢系統管理員了解詳情。 "
   },
   {
     "id": "api.post.update_post.system_message.app_error",
@@ -2249,7 +2257,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
+    "translation": "為使用者增加直接訊息頻道設定時失敗 user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2501,19 +2509,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",
@@ -2529,15 +2537,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",
@@ -2753,47 +2761,227 @@
   },
   {
     "id": "api.websocket.invalid_session.error",
-    "translation": "Invalid session err=%v"
+    "translation": "無效的工作階段 err=%v"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
     "translation": "無效的參數 {{.Name}}"
   },
+  {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "建立頻道時必須指定團隊 ID"
+  },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
-    "translation": "Failed to post channel purpose message"
+    "translation": "發送頻道用途訊息失敗"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.removed",
-    "translation": "%s 已移除了頻道標題 (原為: %s)"
+    "translation": "%s 已移除了頻道用途 (原為: %s)"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.retrieve_user.error",
-    "translation": "嘗試儲存更新的頻道標題訊息 %v 時取得使用者資訊失敗"
+    "translation": "嘗試儲存更新的頻道用途訊息 %v 時取得使用者資訊失敗"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_from",
-    "translation": "%s 將原頻道標題由 %s 改為 %s"
+    "translation": "%s 將原頻道用途由 %s 改為 %s"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
-    "translation": "%s 已更新頻道標題為：%s"
+    "translation": "%s 已更新頻道用途為：%s"
+  },
+  {
+    "id": "app.import.bulk_import.file_scan.error",
+    "translation": "讀取匯入資料檔失敗。"
+  },
+  {
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSON 解碼失敗。"
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "匯入頻道失敗。不存在名字為 \"{{.TeamName}}\" 的團隊。"
+  },
+  {
+    "id": "app.import.import_line.null_channel.error",
+    "translation": "匯入資料行資料型別為\"頻道\"但頻道物件為 null"
+  },
+  {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "匯入資料行資料型別為\"團隊\"但團隊物件為 null"
+  },
+  {
+    "id": "app.import.import_line.null_user.error",
+    "translation": "匯入資料行資料型別為\"使用者\"但使用者物件為 null"
+  },
+  {
+    "id": "app.import.import_line.unknown_line_type.error",
+    "translation": "匯入資料行型別為未知型別 \"{{.Type}}\"。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "如果有提供頻道建立時間，該值不能為 0。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "頻道顯示名稱長度不符要求。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "缺少必要的頻道屬性：顯示名稱。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "頻道標題過長。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "頻道名稱包含無效的字元。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "頻道名稱過長。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "缺少必要的頻道屬性：名字。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "頻道用途過長。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "缺少必要的頻道屬性：團隊。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "無效的頻道類型。"
+  },
+  {
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "缺少必要的頻道屬性：類型。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "團隊允許網域過長。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "如果有提供團隊建立時間，該值不能為 0。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "團隊描述過長。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "團隊顯示名稱長度不符要求。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "缺少必要的團隊屬性：顯示名稱。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "使用者名稱帶有無效字元。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "團隊名稱過長。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "缺少必要的團隊屬性：名字。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "團隊名稱帶有保留字。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "無效的團隊類型。"
+  },
+  {
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "缺少必要的團隊屬性：類型。"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "使用者頻道資料中缺少頻道名字。"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "使用者頻道資料的角色為無效資料。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "使用者認證資料過長。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.auth_service_length.error",
+    "translation": "如果有提供使用者認證服務，該值不能為空。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "使用者電子郵件的長度無效。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "缺少必要的使用者屬性：電子郵件。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.first_name_length.error",
+    "translation": "使用者名字過長。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.last_name_length.error",
+    "translation": "使用者姓氏過長。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "使用者暱稱過長。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "使用者職位過長。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "無效的使用者角色。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "無效的使用者名稱。"
+  },
+  {
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "缺少必要的使用者屬性：名字。"
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "使用者團隊資料的角色為無效資料。"
+  },
+  {
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "使用者團隊資料中缺少團隊名字。"
   },
   {
     "id": "authentication.permissions.create_team_roles.description",
-    "translation": "Ability to create new teams"
+    "translation": "允許建立團隊"
   },
   {
     "id": "authentication.permissions.create_team_roles.name",
-    "translation": "Create Teams"
+    "translation": "建立團隊"
   },
   {
     "id": "authentication.permissions.manage_team_roles.description",
-    "translation": "Ability to change the roles of a team member"
+    "translation": "允許改變團隊成員的角色"
   },
   {
     "id": "authentication.permissions.manage_team_roles.name",
-    "translation": "Manage Team Roles"
+    "translation": "管理團隊角色"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3643,6 +3831,10 @@
     "id": "model.config.is_valid.sql_max_conn.app_error",
     "translation": "SQL 設定中的最高開啟連線數無效。必須為正數。"
   },
+  {
+    "id": "model.config.is_valid.time_between_user_typing.app_error",
+    "translation": "使用者輸入更新間隔不應該設定為低於 1000 毫秒。"
+  },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "必須設定 WebRTC 閘道管理員密碼。"
@@ -4315,6 +4507,14 @@
     "id": "store.sql_channel.get_channels.not_found.app_error",
     "translation": "找不到頻道"
   },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
+    "translation": "找不到現有的已刪除頻道"
+  },
+  {
+    "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
+    "translation": "沒有該名字的已刪除頻道"
+  },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
     "translation": "無法取得頻道成員的更多資訊"
@@ -4355,6 +4555,10 @@
     "id": "store.sql_channel.increment_mention_count.app_error",
     "translation": "無法遞增提及計數"
   },
+  {
+    "id": "store.sql_channel.permanent_delete.app_error",
+    "translation": "無法刪除頻道"
+  },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
     "translation": "無法刪除這些頻道"
@@ -4389,7 +4593,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "該網址已經被其他頻道使用"
+    "translation": "相同名字的頻道已存在於同團隊"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4719,6 +4923,10 @@
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "無法刪除使用者的註解"
   },
+  {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "無法根據頻道刪除訊息"
+  },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "無法選擇該使用者的訊息以刪除"
@@ -5029,7 +5237,7 @@
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "該網域的團隊已存在"
+    "translation": "已經存在相同名稱的團隊"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
@@ -5125,7 +5333,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "在此團隊中找不到符合您的電子郵件之帳號，此團隊需要從團隊擁有者取得邀請才可加入。"
+    "translation": "找不到使用者"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",

webapp/i18n/de.json

@@ -968,6 +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}",
   "audit_table.accountActive": "Aktiv geschaltete Zugänge",
   "audit_table.accountInactive": "Inaktiv geschaltete Zugänge",
   "audit_table.action": "Aktion",
@@ -1207,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 wird bereits verwendet oder enthält ein reserviertes Wort",
+  "create_team.team_url.taken": "This URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>starts with a reserved word</a> or is unavailable. Please try another.",
   "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:",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 Mitglieder} one {Mitglied} other {Mitglieder}} von {total} insgesamt",
   "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.search": "Benutzer suchen",
   "filtered_user_list.searchButton": "Suchen",
   "filtered_user_list.show": "Filter:",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "Neuen Kanal erstellen",
   "more_channels.createClick": "Klicken Sie auf 'neuen Kanal erstellen' um einen neuen zu erzeugen",
   "more_channels.join": "Betreten",
+  "more_channels.next": "Weiter",
   "more_channels.noMore": "Keine weiteren Kanäle zum betreten",
+  "more_channels.prev": "Previous",
   "more_channels.title": "Weitere Kanäle",
   "more_direct_channels.close": "Schließen",
   "more_direct_channels.message": "Nachricht",
@@ -1689,6 +1705,7 @@
   "post_info.mobile.unflag": "Demarkieren",
   "post_info.permalink": "Dauerhafter Link",
   "post_info.reply": "Antworten",
+  "post_info.system": "System",
   "post_message_view.edited": "(edited)",
   "posts_view.loadMore": "Weitere Nachrichten laden",
   "posts_view.newMsg": "Neue Nachrichten",

webapp/i18n/es.json

@@ -968,6 +968,18 @@
   "analytics.team.title": "Estádisticas del Equipo {team}",
   "analytics.team.totalPosts": "Total de Mensajes",
   "analytics.team.totalUsers": "Total de Usuarios",
+  "api.channel.add_member.added": "{addedUsername} fue agregado al canal por {username}",
+  "api.channel.delete_channel.archived": "{username} ha archivado el canal.",
+  "api.channel.join_channel.post_and_forget": "{username} se ha unido al canal.",
+  "api.channel.leave.left": "{username} ha abandonado el canal.",
+  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} ha actualizado el nombre del canal de: {old} a: {new}",
+  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removió el encabezado del canal (era: {old})",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} ha actualizado el encabezado del canal de: {old} a: {new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} ha actualizado el encabezado del canal a: {new}",
+  "api.channel.remove_member.removed": "{removedUsername} ha sido removido del canal",
+  "app.channel.post_update_channel_purpose_message.removed": "{username} removió el propósito del canal (era: {old})",
+  "app.channel.post_update_channel_purpose_message.updated_from": "{username} ha actualizado el propósito del canal de: {old} a: {new}",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} ha actualizado el propósito del canal a: {new}",
   "audit_table.accountActive": "Cuentas activadas",
   "audit_table.accountInactive": "Cuentas desactivadas",
   "audit_table.action": "Acción",
@@ -1207,7 +1219,7 @@
   "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": "El URL ya está en uso o contiene una palabra reservada",
+  "create_team.team_url.taken": "This URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>starts with a reserved word</a> or is unavailable. Please try another.",
   "create_team.team_url.teamUrl": "URL del Equipo",
   "create_team.team_url.unavailable": "Este URL no está disponible. Por favor intenta con otro.",
   "create_team.team_url.webAddress": "Escoge la dirección web para tu nuevo equipo:",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 miembros} one {miembro} other {miembros}} de {total} total",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 miembros} one {miembro} other {miembros}} de {total} total",
   "filtered_user_list.member": "Miembro",
+  "filtered_user_list.next": "Siguiente",
+  "filtered_user_list.prev": "Previous",
   "filtered_user_list.search": "Buscar usuarios",
   "filtered_user_list.searchButton": "Buscar",
   "filtered_user_list.show": "Filtro:",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "Crear Nuevo Canal",
   "more_channels.createClick": "Haz clic en 'Crear Nuevo Canal' para crear uno nuevo",
   "more_channels.join": "Unirme",
+  "more_channels.next": "Siguiente",
   "more_channels.noMore": "No hay más canales para unirse",
+  "more_channels.prev": "Previous",
   "more_channels.title": "Más Canales",
   "more_direct_channels.close": "Cerrar",
   "more_direct_channels.message": "Mensaje",
@@ -1689,6 +1705,7 @@
   "post_info.mobile.unflag": "Desmarcar",
   "post_info.permalink": "Enlace permanente",
   "post_info.reply": "Responder",
+  "post_info.system": "Sistema",
   "post_message_view.edited": "(editado)",
   "posts_view.loadMore": "Cargar más mensajes",
   "posts_view.newMsg": "Nuevos Mensajes",

webapp/i18n/fr.json

@@ -968,18 +968,18 @@
   "analytics.team.title": "Statistiques d'équipe pour {team}",
   "analytics.team.totalPosts": "Nombre de messages",
   "analytics.team.totalUsers": "Nombre d'utilisateurs",
-  "api.channel.add_member.added": "{addedUsername} a été ajouté au canal par {username}",
+  "api.channel.add_member.added": "{addedUsername} added to the channel by {username}",
-  "api.channel.delete_channel.archived": "{username} a archivé le canal.",
+  "api.channel.delete_channel.archived": "{username} has archived the channel.",
-  "api.channel.join_channel.post_and_forget": "{username} a rejoint le canal.",
+  "api.channel.join_channel.post_and_forget": "{username} has joined the channel.",
-  "api.channel.leave.left": "{username} a quitté le canal.",
+  "api.channel.leave.left": "{username} has left the channel.",
-  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} a mis à jour l'en-tête du canal de : {old} en : {new}",
+  "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} a supprimé le titre du canal (était : {old})",
+  "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} a mis à jour l'en-tête du canal de : {old} en : {new}",
+  "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} a mis à jour l'en-tête du canal en : {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} a été retiré du canal.",
+  "api.channel.remove_member.removed": "{removedUsername} was removed from the channel",
-  "app.channel.post_update_channel_purpose_message.removed": "{username} a supprimé le titre du canal (était : {old})",
+  "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} a mis à jour l'en-tête du canal de : {old} en : {new}",
+  "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} a mis à jour l'en-tête du canal en : {new}",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}",
   "audit_table.accountActive": "Compte activé",
   "audit_table.accountInactive": "Compte désactivé",
   "audit_table.action": "Action",
@@ -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": "Cette URL est déjà prise ou contient un mot réservé",
+  "create_team.team_url.taken": "This URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>starts with a reserved word</a> or is unavailable. Please try another.",
   "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 :",
@@ -1306,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} au total",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} au total",
   "filtered_user_list.member": "Membre",
+  "filtered_user_list.next": "Suivant",
+  "filtered_user_list.prev": "Previous",
   "filtered_user_list.search": "Rechercher des utilisateurs",
   "filtered_user_list.searchButton": "Rechercher",
   "filtered_user_list.show": "Filtre :",
@@ -1625,7 +1627,9 @@
   "more_channels.create": "Créer un nouveau canal",
   "more_channels.createClick": "Veuillez cliquer sur \"Créer un nouveau canal\" pour en créer un nouveau",
   "more_channels.join": "Rejoindre",
+  "more_channels.next": "Suivant",
   "more_channels.noMore": "Il n'y a plus d'autre canal que vous pouvez rejoindre",
+  "more_channels.prev": "Previous",
   "more_channels.title": "Plus de canaux",
   "more_direct_channels.close": "Fermer",
   "more_direct_channels.message": "Message",
@@ -1701,6 +1705,7 @@
   "post_info.mobile.unflag": "Supprimer l'indicateur",
   "post_info.permalink": "Lien permanent",
   "post_info.reply": "Répondre",
+  "post_info.system": "System",
   "post_message_view.edited": "(edited)",
   "posts_view.loadMore": "Charger plus de messages",
   "posts_view.newMsg": "Nouveaux messages",

webapp/i18n/ja.json

@@ -968,6 +968,18 @@
   "analytics.team.title": "{team}チームの使用統計",
   "analytics.team.totalPosts": "総投稿数",
   "analytics.team.totalUsers": "総ユーザー数",
+  "api.channel.add_member.added": "{addedUsername} は {username} によってチャンネルに追加されました",
+  "api.channel.delete_channel.archived": "{username} がチャンネルをアーカイブしました。",
+  "api.channel.join_channel.post_and_forget": "{username} がチャンネルに参加しました。",
+  "api.channel.leave.left": "{username} がチャンネルから脱退しました。",
+  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} がチャンネル表示名を {old} から {new} へ更新しました",
+  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} がチャンネルヘッダー({old})を削除しました",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username}がチャンネルヘッダーを {old} から {new} へ更新しました",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} がチャンネルヘッダーを {new} に更新しました",
+  "api.channel.remove_member.removed": "{removedUsername} がチャンネルから削除されました",
+  "app.channel.post_update_channel_purpose_message.removed": "{username} がチャンネルの目的({old})を削除しました",
+  "app.channel.post_update_channel_purpose_message.updated_from": "{username} がチャンネルの目的を {old} から {new} へ更新しました",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} がチャンネルの目的を {new} へ更新しました",
   "audit_table.accountActive": "アカウントが有効になりました",
   "audit_table.accountInactive": "アカウントが無効になりました",
   "audit_table.action": "アクション",
@@ -1099,7 +1111,7 @@
   "channel_members_dropdown.make_channel_admin": "チャンネル管理者を作成する",
   "channel_members_dropdown.make_channel_member": "チャンネルメンバーを作成する",
   "channel_members_dropdown.remove_from_channel": "チャンネルから削除する",
-  "channel_members_dropdown.remove_member": "メンバーを削除メンバーを削除する",
+  "channel_members_dropdown.remove_member": "メンバーを削除する",
   "channel_members_modal.addNew": " 新しいメンバーを追加する",
   "channel_members_modal.members": " メンバー",
   "channel_modal.cancel": "キャンセル",
@@ -1207,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が取得済みか、予約された単語を含んでいます",
+  "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.teamUrl": "チームURL",
   "create_team.team_url.unavailable": "このURLは使用できません。他のものを試してください。",
   "create_team.team_url.webAddress": "あなたの新しいチームのウェブアドレスを選択してください:",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} 合計",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} 合計",
   "filtered_user_list.member": "メンバー",
+  "filtered_user_list.next": "次へ",
+  "filtered_user_list.prev": "前へ",
   "filtered_user_list.search": "ユーザーを検索する",
   "filtered_user_list.searchButton": "検索",
   "filtered_user_list.show": "フィルター:",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "新しいチャンネルを作成する",
   "more_channels.createClick": "新しいチャンネルを作成するには「新しいチャンネルを作成する」をクリックしてください",
   "more_channels.join": "参加する",
+  "more_channels.next": "次へ",
   "more_channels.noMore": "参加できるチャンネルがありません",
+  "more_channels.prev": "前へ",
   "more_channels.title": "他のチャンネル",
   "more_direct_channels.close": "閉じる",
   "more_direct_channels.message": "メッセージ",
@@ -1689,6 +1705,7 @@
   "post_info.mobile.unflag": "フラグを消す",
   "post_info.permalink": "パーマリンク",
   "post_info.reply": "返信する",
+  "post_info.system": "システム",
   "post_message_view.edited": "(編集済)",
   "posts_view.loadMore": "もっとメッセージを読み込む",
   "posts_view.newMsg": "新しいメッセージ",

webapp/i18n/ko.json

@@ -968,6 +968,18 @@
   "analytics.team.title": "{team} 팀 통계",
   "analytics.team.totalPosts": "전체 글",
   "analytics.team.totalUsers": "전체 사용자",
+  "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}",
   "audit_table.accountActive": "계정이 활성화 됨",
   "audit_table.accountInactive": "계정이 비활성화 됨",
   "audit_table.action": "활동",
@@ -1207,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이 이미 있거나 예약된 단어입니다.",
+  "create_team.team_url.taken": "This URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>starts with a reserved word</a> or is unavailable. Please try another.",
   "create_team.team_url.teamUrl": "팀 URL",
   "create_team.team_url.unavailable": "This URL is unavailable. Please try another.",
   "create_team.team_url.webAddress": "팀의 웹 주소:",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{total}명 중 {count}{count, plural, =0 {0명} one {명} other {명}}",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.member": "회원",
+  "filtered_user_list.next": "다음",
+  "filtered_user_list.prev": "Previous",
   "filtered_user_list.search": "Search users",
   "filtered_user_list.searchButton": "검색",
   "filtered_user_list.show": "필터:",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "새로 만들기",
   "more_channels.createClick": "'새로 만들기'를 클릭하여 새로운 채널을 만드세요",
   "more_channels.join": "가입하기",
+  "more_channels.next": "다음",
   "more_channels.noMore": "가입할 수 있는 채널이 없습니다",
+  "more_channels.prev": "Previous",
   "more_channels.title": "채널 더보기",
   "more_direct_channels.close": "닫기",
   "more_direct_channels.message": "메시지",
@@ -1689,6 +1705,7 @@
   "post_info.mobile.unflag": "중요 해제",
   "post_info.permalink": "링크",
   "post_info.reply": "답글",
+  "post_info.system": "System",
   "post_message_view.edited": "(edited)",
   "posts_view.loadMore": "메시지 더 보기",
   "posts_view.newMsg": "새로운 메시지",

webapp/i18n/nl.json

@@ -968,6 +968,18 @@
   "analytics.team.title": "Team statistieken voor {team}",
   "analytics.team.totalPosts": "Totaal aantal berichten",
   "analytics.team.totalUsers": "Totaal aantal gebruikers",
+  "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}",
   "audit_table.accountActive": "Account is actief gemaakt",
   "audit_table.accountInactive": "Account is inactief gemaakt",
   "audit_table.action": "Actie",
@@ -1207,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": "Deze URL is niet meer beschikbaar of bevat een gereserveerd woord",
+  "create_team.team_url.taken": "This URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>starts with a reserved word</a> or is unavailable. Please try another.",
   "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:",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.member": "Lid",
+  "filtered_user_list.next": "Volgende",
+  "filtered_user_list.prev": "Previous",
   "filtered_user_list.search": "Search users",
   "filtered_user_list.searchButton": "Zoeken",
   "filtered_user_list.show": "Filter:",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "Maak een nieuw kanaal",
   "more_channels.createClick": "Klik 'Maak nieuw kanaal' om een nieuw kanaal te maken",
   "more_channels.join": "Deelnemen",
+  "more_channels.next": "Volgende",
   "more_channels.noMore": "Geen kanalen beschikbaar waar aan deelgenomen kan worden.",
+  "more_channels.prev": "Previous",
   "more_channels.title": "Meer kanalen",
   "more_direct_channels.close": "Afsluiten",
   "more_direct_channels.message": "Bericht",
@@ -1689,6 +1705,7 @@
   "post_info.mobile.unflag": "Demarkeer ",
   "post_info.permalink": "Permanente koppeling",
   "post_info.reply": "Antwoord",
+  "post_info.system": "System",
   "post_message_view.edited": "(edited)",
   "posts_view.loadMore": "Laad meer berichten",
   "posts_view.newMsg": "Nieuwe berichten",

webapp/i18n/pt-BR.json

@@ -936,10 +936,10 @@
   "analytics.chart.meaningful": "Não há dados suficientes para uma representação significativa.",
   "analytics.system.activeUsers": "Usuários Ativos Com Posts",
   "analytics.system.channelTypes": "Tipos de Canal",
-  "analytics.system.dailyActiveUsers": "Daily Active Users",
+  "analytics.system.dailyActiveUsers": "Usuários Diários Ativos",
   "analytics.system.expiredBanner": "A licença Enterprise expirou em {date}. Você tem 15 dias a partir desta data para renovar a licença, por favor contate <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.expiringBanner": "A licença Enterprise termina em {date}. Para renovar sua licença, por favor contate <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
-  "analytics.system.monthlyActiveUsers": "Monthly Active Users",
+  "analytics.system.monthlyActiveUsers": "Usuários Mensais Ativos",
   "analytics.system.postTypes": "Posts, Arquivos e Hashtags",
   "analytics.system.privateGroups": "Grupos Privados",
   "analytics.system.publicChannels": "Canais Públicos",
@@ -968,6 +968,18 @@
   "analytics.team.title": "Estatísticas de Equipe para {team}",
   "analytics.team.totalPosts": "Total Posts",
   "analytics.team.totalUsers": "Total de Usuários",
+  "api.channel.add_member.added": "{addedUsername} foi adicionado ao canal por {username}",
+  "api.channel.delete_channel.archived": "{username} arquivou o canal.",
+  "api.channel.join_channel.post_and_forget": "{username} entrou no canal.",
+  "api.channel.leave.left": "{username} saiu do canal.",
+  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} atualizou o nome de exibição do canal de: {old} para: {new}",
+  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removeu o cabeçalho do canal (era: {old})",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} atualizou o cabeçalho do canal de: {old} para: {new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} atualizou o cabeçalho do canal para: {new}",
+  "api.channel.remove_member.removed": "{removedUsername} foi removido do canal",
+  "app.channel.post_update_channel_purpose_message.removed": "{username} removeu o propósito do canal (era: {old})",
+  "app.channel.post_update_channel_purpose_message.updated_from": "{username} atualizou o propósito do canal de: {old} para: {new}",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} atualizou o propósito do canal para: {new}",
   "audit_table.accountActive": "Conta inativada",
   "audit_table.accountInactive": "Conta inativada",
   "audit_table.action": "Ação",
@@ -1207,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": "URL é usada ou contém uma palavra reservada",
+  "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.teamUrl": "Equipe URL",
-  "create_team.team_url.unavailable": "Está URL está indisponível. Por favor tente outra.",
+  "create_team.team_url.unavailable": "Esta URL já foi utilizada ou 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",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 membros} one {membro} other {membros}} de {total} no total",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 membros} one {membro} other {membros}} de {total} no total",
   "filtered_user_list.member": "Membro",
+  "filtered_user_list.next": "Próximo",
+  "filtered_user_list.prev": "Anterior",
   "filtered_user_list.search": "Buscar usuários",
   "filtered_user_list.searchButton": "Pesquisar",
   "filtered_user_list.show": "Filtro:",
@@ -1506,7 +1520,7 @@
   "intro_messages.channel": "canal",
   "intro_messages.creator": "Este é o início do {name} {type}, criado por {creator} em {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Inicio do {display_name}</h4><p class='channel-intro__content'><strong>Bem-vindo a {display_name}!</strong><br/><br/>Este é o primeiro canal que sua equipe de trabalho vê quando eles se inscrevem - use para postar atualizações que todos precisam saber.</p>",
-  "intro_messages.group": "grupos privados",
+  "intro_messages.group": "grupo privado",
   "intro_messages.invite": "Convidar outras pessoas para este {type}",
   "intro_messages.inviteOthers": "Convide outros para esta equipe",
   "intro_messages.noCreator": "Este é o início do {name} {type}, criado em {date}.",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "Criar Novo Canal",
   "more_channels.createClick": "Clique em 'Criar Novo Canal' para fazer um novo",
   "more_channels.join": "Participar",
+  "more_channels.next": "Próximo",
   "more_channels.noMore": "Não há mais canais para participar",
+  "more_channels.prev": "Anterior",
   "more_channels.title": "Mais Canais",
   "more_direct_channels.close": "Fechar",
   "more_direct_channels.message": "Mensagem",
@@ -1689,6 +1705,7 @@
   "post_info.mobile.unflag": "Desmarcar",
   "post_info.permalink": "Permalink",
   "post_info.reply": "Responder",
+  "post_info.system": "Sistema",
   "post_message_view.edited": "(editado)",
   "posts_view.loadMore": "Carregar mais mensagens",
   "posts_view.newMsg": "Novas Mensagens",
@@ -1924,7 +1941,7 @@
   "update_command.question": "Suas alterações podem fazer parar de funcionar o comando slash existente. Tem a certeza de que pretende atualizá-lo?",
   "update_command.update": "Atualizar",
   "upload_overlay.info": "Soltar um arquivo para enviá-lo.",
-  "user.settings.advance.embed_preview": "For the first web link in a message, display a preview of website content below the message, if available",
+  "user.settings.advance.embed_preview": "Para o primeiro link da web em uma mensagem, exiba uma visualização do conteúdo do site abaixo da mensagem, se disponível",
   "user.settings.advance.embed_toggle": "Exibir mostrar/esconder para todas as pre-visualizações",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Recurso} other {Recursos}} Ativado",
   "user.settings.advance.formattingDesc": "Se ativado, posts serão formatados para criar links, exibir emoji, estilo de texto e adicionar quebra de linhas. Por padrão é definido como ativado. Mudando está configuração será necessário recarregar a página.",
@@ -1969,10 +1986,10 @@
   "user.settings.display.channelDisplayTitle": "Modo de Exibição do Canal",
   "user.settings.display.channeldisplaymode": "Selecione a largura do centro do canal.",
   "user.settings.display.clockDisplay": "Exibição do Relógio",
-  "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.collapseDesc": "Defina se as visualizações de links de imagens serão exibidas como expandidas ou recolhidas por padrão. Esta configuração também pode ser controlada usando os comandos slash /expand e /collapse.",
-  "user.settings.display.collapseDisplay": "Default appearance of image link previews",
+  "user.settings.display.collapseDisplay": "Exibição padrão de visualizações de links de imagens",
-  "user.settings.display.collapseOff": "Collapsed",
+  "user.settings.display.collapseOff": "Recolhido",
-  "user.settings.display.collapseOn": "Expanded",
+  "user.settings.display.collapseOn": "Expandido",
   "user.settings.display.fixedWidthCentered": "Largura fixa, centralizada",
   "user.settings.display.fontDesc": "Selecione a fonte mostrada na interface do usuário no Mattermost.",
   "user.settings.display.fontTitle": "Fonte Exibição",

webapp/i18n/ru.json

@@ -28,7 +28,7 @@
   "activity_log.sessionsDescription": "Сессии создаются когда вы входите через новый браузер на устройстве. Они позволяют использовать Mattermost без необходимости повторного входа на протяжении времени установленого Системным Администратором. Если вы хотите выйти раньше, используйте кнопку 'Выход' ниже, чтобы завершить сессию.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Приложение Android",
-  "activity_log_modal.desktop": "Native Desktop App",
+  "activity_log_modal.desktop": "Нативное приложение для настольного ПК",
   "activity_log_modal.iphoneNativeApp": "Приложение для iPhone",
   "add_command.autocomplete": "Автодополнение",
   "add_command.autocomplete.help": "(Необязательно) Показывать слэш-команду в списке автодополнения.",
@@ -310,20 +310,20 @@
   "admin.general.localization.serverLocaleTitle": "Язык сервера по умолчанию:",
   "admin.general.log": "Ведение журнала",
   "admin.general.policy": "Policy",
-  "admin.general.policy.allowEditPostAlways": "Any time",
+  "admin.general.policy.allowEditPostAlways": "Время не указано",
-  "admin.general.policy.allowEditPostDescription": "Set policy on the length of time authors have to edit their messages after posting.",
+  "admin.general.policy.allowEditPostDescription": "Установить политику продолжительности времени после публикации сообщений, в течение которого авторы могут их редактировать",
   "admin.general.policy.allowEditPostNever": "Никогда",
-  "admin.general.policy.allowEditPostTimeLimit": "seconds after posting",
+  "admin.general.policy.allowEditPostTimeLimit": "секунд после публикации",
-  "admin.general.policy.allowEditPostTitle": "Allow users to edit their messages:",
+  "admin.general.policy.allowEditPostTitle": "Разрешить пользователям редактировать свои сообщения: ",
   "admin.general.policy.permissionsAdmin": "Группа и Администраторы системы",
   "admin.general.policy.permissionsAll": "Все участники команды",
   "admin.general.policy.permissionsAllChannel": "Все участники канала",
-  "admin.general.policy.permissionsDeletePostAdmin": "Группа и Администраторы системы",
+  "admin.general.policy.permissionsDeletePostAdmin": "Администраторы команд и администраторы системы",
-  "admin.general.policy.permissionsDeletePostAll": "Message authors can delete their own messages, and Administrators can delete any message",
+  "admin.general.policy.permissionsDeletePostAll": "Авторы сообщений могут удалять свои сообщения и администраторы могут удалять любые сообщения",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "Администраторы Системы",
   "admin.general.policy.permissionsSystemAdmin": "Администраторы Системы",
-  "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.",
+  "admin.general.policy.restrictPostDeleteDescription": "Установка правил, кто имеет право удалять сообщения.",
-  "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:",
+  "admin.general.policy.restrictPostDeleteTitle": "Каким пользователям позволять удалять сообщения:",
   "admin.general.policy.restrictPrivateChannelCreationDescription": "Установите политики того, кто может создавать приватные группы.",
   "admin.general.policy.restrictPrivateChannelCreationTitle": "Включить возможность создания приватных групп для:",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "командная строка",
@@ -375,7 +375,7 @@
   "admin.image.amazonS3BucketExample": "Например: \"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 Корзина:",
   "admin.image.amazonS3EndpointDescription": "Адрес вашего совместимого хранилища S3 . По умолчанию `s3.amazonaws.com`.",
-  "admin.image.amazonS3EndpointExample": "E.g.: \"s3.amazonaws.com\"",
+  "admin.image.amazonS3EndpointExample": "Например: \"s3.amazonaws.com\"",
   "admin.image.amazonS3EndpointTitle": "Конечная точка Amazon S3:",
   "admin.image.amazonS3IdDescription": "Получите эти учетные данные от своего администратора Amazon EC2.",
   "admin.image.amazonS3IdExample": "Например: \"AKIADTOVBGERKLCBV\"",
@@ -461,7 +461,7 @@
   "admin.ldap.portTitle": "Порт AD/LDAP:",
   "admin.ldap.positionAttrDesc": "(Необязательно) Атрибут на сервере AD/LDAP, который будет использоваться для заполнения поля позиции в Mattermost.",
   "admin.ldap.positionAttrEx": "Пример: \"заголовок\"",
-  "admin.ldap.positionAttrTitle": "Position Attribute:",
+  "admin.ldap.positionAttrTitle": "Расположение атрибута:",
   "admin.ldap.queryDesc": "Значение тайм-аута для запросов к серверу AD/LDAP. Увеличьте, если Вы получаете ошибки при подключении, вызванные медленным сервером AD/LDAP.",
   "admin.ldap.queryEx": "Например: \"60\"",
   "admin.ldap.queryTitle": "Таймаут запроса (секунды):",
@@ -535,7 +535,7 @@
   "admin.nav.logout": "Выйти",
   "admin.nav.report": "Сообщить об ошибке",
   "admin.nav.switch": "Выбор команды",
-  "admin.notifications.email": "Email",
+  "admin.notifications.email": "Эл. почта",
   "admin.notifications.push": "Мобильные оповещения",
   "admin.notifications.title": "Настройки уведомлений",
   "admin.oauth.gitlab": "GitLab",
@@ -589,28 +589,28 @@
   "admin.rate.queriesDescription": "Ограничивать API при таком количество запросов в секунду.",
   "admin.rate.queriesExample": "Например: \"10\"",
   "admin.rate.queriesTitle": "Максимальное количество запросов в секунду:",
-  "admin.rate.remoteDescription": "When true, rate limit API access by IP address.",
+  "admin.rate.remoteDescription": "Когда true, API ограничения скорости доступно по IP адресу.",
   "admin.rate.remoteTitle": "Изменять ограничение скорости по удаленному адресу:  ",
-  "admin.rate.title": "Rate Limit Settings",
+  "admin.rate.title": "Настройки ограничения скорости",
-  "admin.recycle.button": "Recycle Database Connections",
+  "admin.recycle.button": "Обновить подключения баз данных",
   "admin.recycle.loading": " Обработка...",
   "admin.recycle.recycleDescription": "Развертывать без перезапуска сервера Mattermost можно используя несколько баз данных, необходимо переключиться с одной основной базы данных на другую путем обновления \"config.json\" и с помощью функции <a href=\"../general/configuration\"><b>Конфигурация > Обновить конфигурацию с диска</b></a> загрузить новые настройки во время работы сервера. Затем администратору необходимо использовать функцию <b>Сбросить соединения БД</b>, чтобы перезапустить соединения с базой данных для использования другой БД.",
-  "admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
+  "admin.recycle.reloadFail": "Обновление не удалось: {error}",
   "admin.regenerate": "Перегенерировать",
   "admin.reload.button": "Перезагрузить конфигурацию с диска",
   "admin.reload.loading": " Загрузка…",
-  "admin.reload.reloadDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.",
+  "admin.reload.reloadDescription": "Варианты развертывания с использованием нескольких баз данных могут переключаться с одной основной базы данных на другую без перезапуска сервера Mattermost путем обновления файла \"config.json\" для новой требуемой конфигурации с дальнейшим вызовом функции <b>Перезагрузить конфигурацию с диска</b> для загрузки новых настроек во время работы сервера. Затем администратор должен выполнить функцию <a href=\"../advanced/database\"><b>База данных > Обновить подключения баз данных</b></a> для обновления соединения с базой на основе новых настроек.",
   "admin.reload.reloadFail": "Неудачная перезагрузка: {error}",
   "admin.reset_password.close": "Закрыть",
   "admin.reset_password.newPassword": "Новый пароль",
   "admin.reset_password.select": "Выбор",
   "admin.reset_password.submit": "Пожалуйста введите как минимум {chars} символов.",
   "admin.reset_password.titleReset": "Сброс пароля",
-  "admin.reset_password.titleSwitch": "Switch Account to Email/Password",
+  "admin.reset_password.titleSwitch": "Переключить аккаунт на E-Mail/Пароль",
   "admin.saml.assertionConsumerServiceURLDesc": "Введите https://<your-mattermost-url>/login/sso/saml. Убедитесь, используете ли вы HTTP или HTTPS в своем URL-адресе в соответствии с настройками своего сервера. Это поле также известно как URL сервиса обработки утверждений.",
   "admin.saml.assertionConsumerServiceURLEx": "Например: \"https://<your-mattermost-url>/login/sso/saml\"",
   "admin.saml.assertionConsumerServiceURLTitle": "Адрес для входа через поставщика услуг:",
-  "admin.saml.bannerDesc": "User attributes in SAML server, including user deactivation or removal, are updated in Mattermost during user login. Learn more at: <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>",
+  "admin.saml.bannerDesc": "Атрибуты пользователя на SAML сервере, включая деактивацию или удаление пользователя, обновляются в Mattermost во время пользовательского входа в систему. Подробности можно посмотреть тут: <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>",
   "admin.saml.emailAttrDesc": "Атрибута LDAP сервера, который будет использоваться для заполнения фамилия пользователями в Mattermost.",
   "admin.saml.emailAttrEx": "Например: \"Email\" или \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Атрибут эл.почта:",
@@ -682,7 +682,7 @@
   "admin.service.attemptTitle": "Максимальное количество попыток входа:",
   "admin.service.cmdsDesc": "Если истина, пользовательские слэш-команды будут разрешены. Смотрите <a href='http://docs.mattermost.com/developer/slash-commands.html' target='_blank'>документацию</a>, чтобы узнать больше.",
   "admin.service.cmdsTitle": "Включить пользовательские Slash-команды: ",
-  "admin.service.corsDescription": "Enable HTTP Cross origin request from a specific domain. Use \"*\" if you want to allow CORS from any domain or leave it blank to disable it.",
+  "admin.service.corsDescription": "Разрешить кросс-доменные запросы с указанного домена. Укажите \"*\", если Вы хотите разрешить CORS с любого домена, или оставьте поле пустым, что бы отключить эту возможность.",
   "admin.service.corsEx": "http://example.com",
   "admin.service.corsTitle": "Разрешить кроссдоменные запросы от:",
   "admin.service.developerDesc": "Когда включено, на красной панели сверху будут показываться ошибки Javascript. Не рекомендуется включать на боевом сервере. ",
@@ -717,7 +717,7 @@
   "admin.service.readTimeoutDescription": "Maximum time allowed from when the connection is accepted to when the request body is fully read.",
   "admin.service.securityDesc": "Если включено, администратор системы получит уведомление о выходе новых обновлений безопасности анонсированных за 12 часов. Потребует включение email.",
   "admin.service.securityTitle": "Включить оповещения безопасности: ",
-  "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
+  "admin.service.segmentDescription": "Segment.com — онлайн-сервис, который может использоваться опционально для ведения подробной статистики системы. Вы можете получить ключ, зарегистрировав бесплатную  учетную запись на Segment.com.",
   "admin.service.segmentExample": "Например: \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
   "admin.service.segmentTitle": "Segment Write Key:",
   "admin.service.sessionCache": "Кэш сессиий (в минутах):",
@@ -735,7 +735,7 @@
   "admin.service.tlsKeyFile": "Файл ключа TLS:",
   "admin.service.tlsKeyFileDescription": "Приватный ключ для использования.",
   "admin.service.useLetsEncrypt": "Использовать Let's Encrypt:",
-  "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.",
+  "admin.service.useLetsEncryptDescription": "Включить автоматическое получение сертификатов от Let's Encrypt. Сертификат будет получен, когда клиент попытается установить соединение с нового домена. Это будет работать для множества разных доменов.",
   "admin.service.webSessionDays": "Продолжительность сессии AD/LDAP и электронной почты (в днях):",
   "admin.service.webSessionDaysDesc": "Количество дней с последнего ввода пользователем своих учетных данных до истечения срока пользовательской сессии. После изменения этого параметра, новая продолжительность сессии вступит в силу после следующего ввода пользователями своих учетных данных.",
   "admin.service.webhooksDescription": "Если истина, входящие вебхуки будут разрешены. В целях борьбы с фишинговыми атаками, все посты от имени вебхуков будут помечены тэгом БОТ. Смотрите <a href='http://docs.mattermost.com/developer/webhooks-incoming.html' target='_blank'>документацию</a>, чтобы узнать больше.",
@@ -855,7 +855,7 @@
   "admin.team.noBrandImage": "Изображение бренда не загружено",
   "admin.team.openServerDescription": "Если включено, каждый может зарегистрироваться без приглашения.",
   "admin.team.openServerTitle": "Открытый сервер: ",
-  "admin.team.restrictDescription": "Teams and user accounts can only be created from a specific domain (e.g. \"mattermost.org\") or list of comma-separated domains (e.g. \"corp.mattermost.com, mattermost.org\").",
+  "admin.team.restrictDescription": "Команды и аккаунты пользователей могут быть созданы только с указанного домена (например, \"mattermost.org\"), или с доменов, заданных разделённым запятыми списком доменов (например, corp.mattermost.com, mattermost.org\").",
   "admin.team.restrictDirectMessage": "Enable users to open Direct Message channels with:",
   "admin.team.restrictDirectMessageDesc": "'Any user on the Mattermost server' enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. 'Any member of the team' limits the ability to open Direct Message channels to only users who are in the same team.",
   "admin.team.restrictExample": "Например: \"corp.mattermost.com, mattermost.org\"",
@@ -898,7 +898,7 @@
   "admin.user_item.mfaYes": ", <strong>MFA</strong>: Да",
   "admin.user_item.resetMfa": "Удалить MFA",
   "admin.user_item.resetPwd": "Сброс пароля",
-  "admin.user_item.switchToEmail": "Switch to Email/Password",
+  "admin.user_item.switchToEmail": "Переключение на E-Mail/Пароль",
   "admin.user_item.sysAdmin": "Администратор системы",
   "admin.user_item.teamAdmin": "Team Admin",
   "admin.webrtc.enableDescription": "При выборе Mattermost позволяет совершать <strong>тет-а-тет</strong> видеозвонки. WebRTC звонки доступны в браузерах Chrome и Firefox, а так же в приложениях Mattermost.",
@@ -936,14 +936,14 @@
   "analytics.chart.meaningful": "Недостаточно данных для представления.",
   "analytics.system.activeUsers": "Активные пользователи с сообщениями",
   "analytics.system.channelTypes": "Типы канала",
-  "analytics.system.dailyActiveUsers": "Daily Active Users",
+  "analytics.system.dailyActiveUsers": "Активность пользователей за день",
   "analytics.system.expiredBanner": "Лицензия Enterprise истекает {date}. Свяжитесь с <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a> и обновите лицензию в течение 15 дней.",
   "analytics.system.expiringBanner": "Лицензия Enterprise истекает {date}. Для обновления лицензии свяжитесь с <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
-  "analytics.system.monthlyActiveUsers": "Monthly Active Users",
+  "analytics.system.monthlyActiveUsers": "Активность пользователей за месяц",
   "analytics.system.postTypes": "Сообщения, файлы и хештэги",
   "analytics.system.privateGroups": "Приватные Группы",
   "analytics.system.publicChannels": "Публичные Каналы",
-  "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
+  "analytics.system.skippedIntensiveQueries": "Для максимальной производительности некоторая статистика отключена. Вы можете включить её снова в файле конфигурации config.json. Смотрите: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "Только текстовые сообщения",
   "analytics.system.title": "Статистика системы",
   "analytics.system.totalChannels": "Всего каналов",
@@ -968,6 +968,18 @@
   "analytics.team.title": "Статистика команды {team}",
   "analytics.team.totalPosts": "Всего сообщений",
   "analytics.team.totalUsers": "Всего пользователей",
+  "api.channel.add_member.added": "Участник {addedUsername} добавлен на канал участником {username}",
+  "api.channel.delete_channel.archived": "{username} has archived the channel.",
+  "api.channel.join_channel.post_and_forget": "{username} присоединился к каналу.",
+  "api.channel.leave.left": "{username} покинул канал.",
+  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} сменил отображаемое имя канала с {old} на {new}",
+  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} удалил заголовок канала (было: {old})",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} изменил заголовок канала с {old} на {new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} изменил заголовок канала на {new}",
+  "api.channel.remove_member.removed": "{removedUsername} был удалён с канала",
+  "app.channel.post_update_channel_purpose_message.removed": "{username} удалил заголовок канала (было: {old})",
+  "app.channel.post_update_channel_purpose_message.updated_from": "{username} сменил заголовок канала с {old} на {new}",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} установил заголовок канала: {new}",
   "audit_table.accountActive": "Сделать аккаунт активным",
   "audit_table.accountInactive": "Сделать аккаунт неактивным",
   "audit_table.action": "Действие",
@@ -1094,14 +1106,14 @@
   "channel_loader.uploadedFile": " загрузил файл",
   "channel_loader.uploadedImage": " загрузил изображение",
   "channel_loader.wrote": " написал: ",
-  "channel_members_dropdown.channel_admin": "Channel Admin",
+  "channel_members_dropdown.channel_admin": "Администратор канала",
-  "channel_members_dropdown.channel_member": "Участники канала",
+  "channel_members_dropdown.channel_member": "Участник канала",
-  "channel_members_dropdown.make_channel_admin": "Make Channel Admin",
+  "channel_members_dropdown.make_channel_admin": "Сделать администратором канала",
-  "channel_members_dropdown.make_channel_member": "Make Channel Member",
+  "channel_members_dropdown.make_channel_member": "Сделать участником канала",
-  "channel_members_dropdown.remove_from_channel": "Remove From Channel",
+  "channel_members_dropdown.remove_from_channel": "Удалить с канала",
-  "channel_members_dropdown.remove_member": "Remove Member",
+  "channel_members_dropdown.remove_member": "Удалить участника",
   "channel_members_modal.addNew": " Добавить участников",
-  "channel_members_modal.members": " Участники",
+  "channel_members_modal.members": "Участники",
   "channel_modal.cancel": "Отмена",
   "channel_modal.channel": "Канал",
   "channel_modal.createNew": "Создать ",
@@ -1110,7 +1122,7 @@
   "channel_modal.edit": "Редактировать",
   "channel_modal.group": "Группа",
   "channel_modal.header": "Заголовок",
-  "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
+  "channel_modal.headerEx": "Например: \"[Заголовок ссылки](http://example.com)\"",
   "channel_modal.headerHelp": "Задайте текст, который появится в заголовке {term} рядом с названием {term}. К примеру, вы можете включить часто используемые ссылки, введя [Текст ссылки](http://example.com).",
   "channel_modal.modalTitle": "Новый ",
   "channel_modal.name": "Имя",
@@ -1134,14 +1146,14 @@
   "channel_notifications.unreadInfo": "Название канала в боковом меню выделяется жирным, когда есть непрочитанные сообщения. Если выбрано \"Только при упоминаниях\" название канала будет выделяться только если Вас упомянут.",
   "channel_select.placeholder": "--- Выбрать канал ---",
   "channel_switch_modal.dm": "(Личное сообщение)",
-  "channel_switch_modal.failed_to_open": "Failed to open channel.",
+  "channel_switch_modal.failed_to_open": "Не удалось открыть канал.",
   "channel_switch_modal.help": "Напишите название канала. Используйте ↑↓ для перемещения, TAB для выбора, ↵ для подтверждения и ESC для отказа",
   "channel_switch_modal.not_found": "Совпадений не найдено.",
   "channel_switch_modal.submit": "Переключить",
   "channel_switch_modal.title": "Сменить каналы",
   "claim.account.noEmail": "Email не указан",
   "claim.email_to_ldap.enterLdapPwd": "Введите идентификатор и пароль от Вашего AD/LDAP аккаунта",
-  "claim.email_to_ldap.enterPwd": "Enter the password for your {site} email account",
+  "claim.email_to_ldap.enterPwd": "Введите пароль для вашего почтового аккаунта {site}",
   "claim.email_to_ldap.ldapId": "AD/LDAP ID",
   "claim.email_to_ldap.ldapIdError": "Введите свой AD/LDAP идентификатор.",
   "claim.email_to_ldap.ldapPasswordError": "Введите ваш пароль AD/LDAP.",
@@ -1155,30 +1167,30 @@
   "claim.email_to_oauth.enterPwd": "Введите пароль для вашей учетной записи {site}",
   "claim.email_to_oauth.pwd": "Пароль",
   "claim.email_to_oauth.pwdError": "Введите пароль.",
-  "claim.email_to_oauth.ssoNote": "You must already have a valid {type} account",
+  "claim.email_to_oauth.ssoNote": "Вы должны уже иметь корректный {type} аккаунт",
   "claim.email_to_oauth.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
-  "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
+  "claim.email_to_oauth.switchTo": "Переключить аккаунт на {uiType}",
-  "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}",
+  "claim.email_to_oauth.title": "Переключить E-Mail/Пароль аккаунт на {uiType}",
   "claim.ldap_to_email.confirm": "Подтвердить пароль",
-  "claim.ldap_to_email.email": "You will use the email {email} to login",
+  "claim.ldap_to_email.email": "Вы будете использовать E-Mail {email} для входа в систему",
-  "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account",
+  "claim.ldap_to_email.enterLdapPwd": "Введите ваш {ldapPassword} для вашего почтового аккаунта {site}",
-  "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+  "claim.ldap_to_email.enterPwd": "Введите новый пароль для вашего почтового аккаунта",
   "claim.ldap_to_email.ldapPasswordError": "Пожалуйста, введите свой пароль AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Пароль AD/LDAP",
   "claim.ldap_to_email.pwd": "Пароль",
   "claim.ldap_to_email.pwdError": "Введите ваш пароль.",
   "claim.ldap_to_email.pwdNotMatch": "Пароли не совпадают.",
   "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
-  "claim.ldap_to_email.switchTo": "Switch account to email/password",
+  "claim.ldap_to_email.switchTo": "Переключить аккаунт на E-Mail/пароль",
   "claim.ldap_to_email.title": "Переключить AD/LDAP на Email/Password",
   "claim.oauth_to_email.confirm": "Подтвердить пароль",
-  "claim.oauth_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.",
+  "claim.oauth_to_email.description": "При смене типа аккаунта Вы сможете войти в систему только с вашим E-Mail и паролем.",
   "claim.oauth_to_email.enterNewPwd": "Введите новый пароль для вашего аккаунта email {site} ",
   "claim.oauth_to_email.enterPwd": "Пожалуйста, введите пароль.",
   "claim.oauth_to_email.newPwd": "Новый пароль",
   "claim.oauth_to_email.pwdNotMatch": "Пароли не совпадают.",
   "claim.oauth_to_email.switchTo": "Перейти с {type} к использованию e-mail и пароля",
-  "claim.oauth_to_email.title": "Switch {type} Account to Email",
+  "claim.oauth_to_email.title": "Переключить аккаунт {type} на E-Mail",
   "confirm_modal.cancel": "Отмена",
   "connecting_screen": "Подключение",
   "create_comment.addComment": "Добавить комментарий...",
@@ -1207,9 +1219,9 @@
   "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": "Адрес используется или включает зарезервированные слова",
+  "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.teamUrl": "URL команды",
-  "create_team.team_url.unavailable": "Данный URL недоступен, попробуйте другой.",
+  "create_team.team_url.unavailable": "Этот URL занят или недоступен. Пожалуйста, попробуйте другой.",
   "create_team.team_url.webAddress": "Выберите адрес вашей новой команды:",
   "custom_emoji.empty": "Не найдено загруженного  эмодзи",
   "custom_emoji.header": "Пользовательские смайлы",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.member": "Участник",
+  "filtered_user_list.next": "Далее",
+  "filtered_user_list.prev": "Previous",
   "filtered_user_list.search": "Поиск пользователей",
   "filtered_user_list.searchButton": "Поиск",
   "filtered_user_list.show": "Фильтр:",
@@ -1307,13 +1321,13 @@
   "find_team.submitError": "Введите корректный email",
   "flag_post.flag": "Отметить для отслеживания",
   "flag_post.unflag": "Не помечено",
-  "general_tab.chooseDescription": "Введите новое имя для вашей команды",
+  "general_tab.chooseDescription": "Пожалуйста, выберите новое описание для вашей команды",
   "general_tab.chooseName": "Введите новое имя для вашей команды",
   "general_tab.codeDesc": "Нажмите 'Редактировать' для перегенерации кода приглашения.",
   "general_tab.codeLongDesc": "Код приглашения используется как часть URL в ссылке приглашения в команду, созданная в разделе {getTeamInviteLink} в главном меню. Пересоздание создаст новую ссылку для приглашения и сделает предыдущую недействительной.",
   "general_tab.codeTitle": "Код приглашения",
   "general_tab.emptyDescription": "Нажмите 'Редактировать' для добавления описания.",
-  "general_tab.getTeamInviteLink": "Ссылка для приглашения",
+  "general_tab.getTeamInviteLink": "Получить ссылку для приглашения в команду",
   "general_tab.includeDirDesc": "Including this team will display the team name from the Team Directory section of the Home Page, and provide a link to the sign-in page.",
   "general_tab.no": "Нет",
   "general_tab.openInviteDesc": "Если разрешено, ссылка на эту команду будет отображаться на странице входа, позволяя любому пользователю войти в команду.",
@@ -1340,7 +1354,7 @@
   "get_link.copy": "Скопировать ссылку",
   "get_post_link_modal.help": "The link below allows authorized users to see your post.",
   "get_post_link_modal.title": "Скопировать постоянную ссылку",
-  "get_public_link_modal.help": "The link below allows anyone to see this file without being registered on this server.",
+  "get_public_link_modal.help": "Ссылка ниже позволяет видеть этот файл любому, не будучи зарегистрированным на этом сервере.",
   "get_public_link_modal.title": "Получить публичную ссылку",
   "get_team_invite_link_modal.help": "Отправьте товарищам эту ссылку для регистрации в команде. Ссылку можно отправить нескольким людям, т.к. она не меняется и может быть перегенерирована в настройках команды администратором команды.",
   "get_team_invite_link_modal.helpDisabled": "Создание пользователей было отключено для вашей команды. Пожалуйста, обратитесь к администратору команды за подробностями.",
@@ -1571,7 +1585,7 @@
   "login.passwordChanged": " Пароль успешно обновлён",
   "login.session_expired": " Сессия истекла. Пожалуйста, войдите заново",
   "login.signIn": "Войти",
-  "login.signInLoading": "Signing in...",
+  "login.signInLoading": "Выполняется вход...",
   "login.signInWith": "Войти с помощью:",
   "login.userNotFound": "Мы не обнаружили аккаунт по вашим данным для входа.",
   "login.username": "Имя пользователя",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "Создать новый канал",
   "more_channels.createClick": "Нажмите 'Создать Новый Канал' для создания нового канала",
   "more_channels.join": "Присоединиться",
+  "more_channels.next": "Далее",
   "more_channels.noMore": "Больше нет каналов для входа",
+  "more_channels.prev": "Previous",
   "more_channels.title": "Больше каналов",
   "more_direct_channels.close": "Закрыть",
   "more_direct_channels.message": "Сообщение",
@@ -1689,7 +1705,8 @@
   "post_info.mobile.unflag": "Не помечено",
   "post_info.permalink": "Постоянная ссылка",
   "post_info.reply": "Ответить",
-  "post_message_view.edited": "(edited)",
+  "post_info.system": "System",
+  "post_message_view.edited": "(отредактировано)",
   "posts_view.loadMore": "Больше сообщений",
   "posts_view.newMsg": "Новые сообщения",
   "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
@@ -1726,7 +1743,7 @@
   "rhs_comment.mobile.flag": "Флаг",
   "rhs_comment.mobile.unflag": "Не помечено",
   "rhs_comment.permalink": "Постоянная ссылка",
-  "rhs_header.backToCallTooltip": "Back to Call",
+  "rhs_header.backToCallTooltip": "Обратно к вызову",
   "rhs_header.backToFlaggedTooltip": "Вернуться к отмеченным сообщениям",
   "rhs_header.backToResultsTooltip": "Назад к результатам поиска",
   "rhs_header.closeSidebarTooltip": "Закрыть боковую панель",
@@ -1865,11 +1882,11 @@
   "team_import_tab.failure": " Ошибка импорта: ",
   "team_import_tab.import": "Импорт",
   "team_import_tab.importHelpDocsLink": "документация",
-  "team_import_tab.importHelpExportInstructions": "Slack > Team Settings > Import/Export Data > Export > Start Export",
+  "team_import_tab.importHelpExportInstructions": "Slack > Настройки команды > Импорт/Экспорт данных > Экспорт > Начать экспорт",
   "team_import_tab.importHelpExporterLink": "Slack Advanced Exporter",
   "team_import_tab.importHelpLine1": "Slack import to Mattermost supports importing of messages in your Slack team's public channels.",
-  "team_import_tab.importHelpLine2": "To import a team from Slack, go to {exportInstructions}. See {uploadDocsLink} to learn more.",
+  "team_import_tab.importHelpLine2": "Для импорта команды из Slack перейдите сюда: {exportInstructions}. Более подробную информацию смотрите здесь: {uploadDocsLink}",
-  "team_import_tab.importHelpLine3": "To import posts with attached files, see {slackAdvancedExporterLink} for details.",
+  "team_import_tab.importHelpLine3": "Для импорта сообщений с прикреплёнными файлами смотрите {slackAdvancedExporterLink} для подробностей.",
   "team_import_tab.importSlack": "Импортировать из Slack (Beta)",
   "team_import_tab.importing": " Импортирование...",
   "team_import_tab.successful": " Импорт успешно завершён: ",
@@ -1921,13 +1938,13 @@
   "tutorial_tip.seen": "Уже видели? ",
   "update_command.cancel": "Отмена",
   "update_command.confirm": "Редактировать команду",
-  "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
+  "update_command.question": "Ваши изменения могут повредить существующую слэш-команду. Вы уверены, что хотите продолжить?",
   "update_command.update": "Обновить",
   "upload_overlay.info": "Бросьте сюда файл, чтобы загрузить его.",
   "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_toggle": "Показывать переключатель для всех встроенных превью",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
-  "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
+  "user.settings.advance.formattingDesc": "Если включено, сообщения будут отформатированы с созданием ссылок, показом смайликов, стилями текста и переносами. По-умолчанию, эта настройка включена. Изменение этой настройки потребует обновления страницы.",
   "user.settings.advance.formattingTitle": "Разрешить форматирование сообщений",
   "user.settings.advance.joinLeaveDesc": "Если данная опция включена, будут отображаться системные сообщения о входе и выходе пользователей из канала. Если данная опция выключена, системные сообщения о входе и выходе из канала будут скрыты. Сообщения будут отображаться когда вы добавлены в канал, так что вы можете получать уведомления.",
   "user.settings.advance.joinLeaveTitle": "Включить сообщения входа/выхода",
@@ -1938,7 +1955,7 @@
   "user.settings.advance.preReleaseTitle": "Просмотр возможностей предрелиза",
   "user.settings.advance.sendDesc": "Если включено, 'ENTER' вставляет новую строку, а 'CTRL + ENTER' отправляет сообщение.",
   "user.settings.advance.sendTitle": "Отправлять сообщения сочетанием клавиш CTRL + ENTER",
-  "user.settings.advance.slashCmd_autocmp": "Enable external application to offer slash command autocomplete",
+  "user.settings.advance.slashCmd_autocmp": "Включить внешнее приложение для реализации функции автодополнения слэш-команд",
   "user.settings.advance.title": "Дополнительные параметры",
   "user.settings.advance.webrtc_preview": "Включить возможность совершать и принимать WebRTC звонки.",
   "user.settings.custom_theme.awayIndicator": "Индикатор отсутствия",
@@ -1949,13 +1966,13 @@
   "user.settings.custom_theme.centerChannelTitle": "Center Channel Styles",
   "user.settings.custom_theme.codeTheme": "Цветовая схема",
   "user.settings.custom_theme.copyPaste": "Скопируйте и вставьте для того, чтобы поделиться цветовой схемой:",
-  "user.settings.custom_theme.linkButtonTitle": "Link and Button Styles",
+  "user.settings.custom_theme.linkButtonTitle": "Стили ссылки и кнопки",
   "user.settings.custom_theme.linkColor": "Цвет ссылки",
   "user.settings.custom_theme.mentionBj": "Mention Jewel BG",
   "user.settings.custom_theme.mentionColor": "Mention Jewel Text",
   "user.settings.custom_theme.mentionHighlightBg": "Mention Highlight BG",
   "user.settings.custom_theme.mentionHighlightLink": "Mention Highlight Link",
-  "user.settings.custom_theme.newMessageSeparator": "New Message Separator",
+  "user.settings.custom_theme.newMessageSeparator": "Разделитель новых сообщений",
   "user.settings.custom_theme.onlineIndicator": "Статус",
   "user.settings.custom_theme.sidebarBg": "Sidebar BG",
   "user.settings.custom_theme.sidebarHeaderBg": "Sidebar Header BG",
@@ -1969,7 +1986,7 @@
   "user.settings.display.channelDisplayTitle": "Режим отображения канала",
   "user.settings.display.channeldisplaymode": "Выберите ширину центрального канала.",
   "user.settings.display.clockDisplay": "Отображение времени",
-  "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.collapseDesc": "Настраивает, показываются ли предварительные просмотры ссылок на изображения свёрнутыми или развёрнутыми по умолчанию. Этой настройкой можно так же управлять слэш-командами /expand и /collapse.",
   "user.settings.display.collapseDisplay": "Default appearance of image link previews",
   "user.settings.display.collapseOff": "Collapsed",
   "user.settings.display.collapseOn": "Expanded",
@@ -2030,7 +2047,7 @@
   "user.settings.general.loginLdap": "Вход завершен через AD/LDAP ({email})",
   "user.settings.general.loginOffice365": "Вход через Office 365 ({email})",
   "user.settings.general.loginSaml": "Вход выполнен через SAML ({email})",
-  "user.settings.general.newAddress": "New Address: {email}<br />Check your email to verify the above address.",
+  "user.settings.general.newAddress": "Новый адрес: {email}<br />Проверьте ваш E-Mail для подтверждения адреса выше.",
   "user.settings.general.nickname": "Псеводним",
   "user.settings.general.nicknameExtra": "Используйте псевдоним в качестве имени, если Вас можно называть отлично от имени или имени пользователя. Псевдоним полезно использовать, когда два или более человека имеют созвучные имена или имена пользователей.",
   "user.settings.general.notificationsExtra": "По умолчанию Вы получаете уведомления о упоминаниях, когда кто-либо пишет Ваше имя. Для изменения перейдите в настройки {notify}.",
@@ -2044,7 +2061,7 @@
   "user.settings.general.username": "Имя пользователя",
   "user.settings.general.usernameInfo": "Выберите что-нибудь простое для того, чтобы участники команды вас распознали и запомнили.",
   "user.settings.general.usernameReserved": "Это имя зарезервировано, выберите новое, пожалуйста.",
-  "user.settings.general.usernameRestrictions": "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'.",
+  "user.settings.general.usernameRestrictions": "Имя пользователя должно начинаться с буквы и содержать от {min} до {max} символов в нижнем регистре, среди которых могут быть буквы, цифры и символы  '.', '-', и '_'.",
   "user.settings.general.validEmail": "Пожалуйста, введите корректный email",
   "user.settings.general.validImage": "Только JPG или PNG изображения могут быть использованы как изображения профиля",
   "user.settings.import_theme.cancel": "Отмена",
@@ -2055,12 +2072,12 @@
   "user.settings.languages.change": "Сменить язык интерфейса",
   "user.settings.languages.promote": "Выберите язык отображения пользовательского интерфейса Mattermost.<br /><br />Хотите помочь с переводами? Присоединяйтесь к <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> и внесите свой вклад.",
   "user.settings.mfa.add": "Добавить MFA в ваш аккаунт",
-  "user.settings.mfa.addHelp": "Adding multi-factor authentication will make your account more secure by requiring a code from your mobile phone each time you sign in.",
+  "user.settings.mfa.addHelp": "Добавление многофакторной аутентификации позволит сделать Ваш аккаунт ещё более безопасным, требуя ввода кода, присланного на мобильный телефон, при каждом входе.",
   "user.settings.mfa.addHelpQr": "Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app. If you are unable to scan the code, you can manually enter the secret provided.",
   "user.settings.mfa.enterToken": "Token (numbers only)",
   "user.settings.mfa.qrCode": "Штрихкод",
   "user.settings.mfa.remove": "Удалить MFA из вашего аккаунта",
-  "user.settings.mfa.removeHelp": "Removing multi-factor authentication means you will no longer require a phone-based passcode to sign-in to your account.",
+  "user.settings.mfa.removeHelp": "Отключение многофакторной аутентификации означает, что Вам больше не будет требоваться  пароль, высылаемый на телефон, при каждом входе в аккаунт.",
   "user.settings.mfa.requiredHelp": "Multi-factor authentication is required on this server. Resetting is only recommended when you need to switch code generation to a new mobile device. You will be required to set it up again immediately.",
   "user.settings.mfa.reset": "Отключить многофакторную проверку подлинности",
   "user.settings.mfa.secret": "Secret:",
@@ -2111,7 +2128,7 @@
   "user.settings.notifications.emailInfo": "Почтовые уведомления при упоминаниях и личных сообщениях начинают отправляться если вы не в сети или отошли с {siteName} больше чем на 5 минут.",
   "user.settings.notifications.emailNotifications": "Email уведомления",
   "user.settings.notifications.header": "Уведомления",
-  "user.settings.notifications.info": "Desktop notifications are available on Edge, Firefox, Safari, Chrome and Mattermost Desktop Apps.",
+  "user.settings.notifications.info": "Уведомления на рабочем столе доступны для приложений Edge, Firefox, Safari, Chrome и Mattermost Desktop.",
   "user.settings.notifications.never": "Никогда",
   "user.settings.notifications.noWords": "No words configured",
   "user.settings.notifications.off": "Выкл",
@@ -2119,11 +2136,11 @@
   "user.settings.notifications.onlyMentions": "Только при упоминаниях и личных сообщениях",
   "user.settings.notifications.push": "Мобильные push-уведомленя",
   "user.settings.notifications.push_notification.status": "Отправить push-уведомление когда",
-  "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"",
+  "user.settings.notifications.sensitiveName": "Ваше имя с учётом регистра \"{first_name}\"",
   "user.settings.notifications.sensitiveUsername": "Ваше независимое от регистра имя пользователя \"{username}\"",
   "user.settings.notifications.sensitiveWords": "Другие независящие от регистра слова, разделенные запятыми:",
   "user.settings.notifications.soundConfig": "Пожалуйста, настройте звуковые уведомления в настройках браузера",
-  "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari, Chrome and Mattermost Desktop Apps.",
+  "user.settings.notifications.sounds_info": "Звуки уведомлений доступны для приложений IE11, Edge, Safari, Chrome и Mattermost Desktop.",
   "user.settings.notifications.teamWide": "Упоминания команды \"@all\"",
   "user.settings.notifications.title": "Настройки уведомлений",
   "user.settings.notifications.wordsTrigger": "Ключевые слова для упоминаний",
@@ -2155,9 +2172,9 @@
   "user.settings.security.lastUpdated": "Последние изменения: {date} в {time}",
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "Вход выполнен с помощью GitLab",
-  "user.settings.security.loginGoogle": "Login done through Google Apps",
+  "user.settings.security.loginGoogle": "Выполнен вход через Google Apps",
   "user.settings.security.loginLdap": "Вход выполнен через AD/LDAP",
-  "user.settings.security.loginOffice365": "Login done through Office 365",
+  "user.settings.security.loginOffice365": "Выполнен вход через Office 365",
   "user.settings.security.loginSaml": "Вход выполнен с помощью SAML",
   "user.settings.security.logoutActiveSessions": "Просмотр и завершение активных сессий",
   "user.settings.security.method": "Методы входа",
@@ -2203,7 +2220,7 @@
   "user.settings.security.title": "Настройки безопасности",
   "user.settings.security.viewHistory": "Просмотр истории доступа",
   "user_list.notFound": "Пользователи не найдены",
-  "user_profile.send.dm": "Send Message",
+  "user_profile.send.dm": "Отправить сообщение",
   "user_profile.webrtc.call": "Видеовызов",
   "user_profile.webrtc.offline": "Пользователь не в сети",
   "user_profile.webrtc.unavailable": "Новый вызов недоступен до завершения текущего",

webapp/i18n/zh_CN.json

@@ -310,20 +310,20 @@
   "admin.general.localization.serverLocaleTitle": "默认服务器语言：",
   "admin.general.log": "日志",
   "admin.general.policy": "策略",
-  "admin.general.policy.allowEditPostAlways": "Any time",
+  "admin.general.policy.allowEditPostAlways": "任何时间",
   "admin.general.policy.allowEditPostDescription": "Set policy on the length of time authors have to edit their messages after posting.",
   "admin.general.policy.allowEditPostNever": "从不",
-  "admin.general.policy.allowEditPostTimeLimit": "seconds after posting",
+  "admin.general.policy.allowEditPostTimeLimit": "发布后秒数",
-  "admin.general.policy.allowEditPostTitle": "Allow users to edit their messages:",
+  "admin.general.policy.allowEditPostTitle": "允许用户修改他们的消息：",
   "admin.general.policy.permissionsAdmin": "团队和系统管理员",
   "admin.general.policy.permissionsAll": "所有团队成员",
   "admin.general.policy.permissionsAllChannel": "所有频道成员",
   "admin.general.policy.permissionsDeletePostAdmin": "团队和系统管理员",
-  "admin.general.policy.permissionsDeletePostAll": "Message authors can delete their own messages, and Administrators can delete any message",
+  "admin.general.policy.permissionsDeletePostAll": "消息作者可以删除他们自己的消息，同时管理员可以删除任何消息",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "系统管理员",
   "admin.general.policy.permissionsSystemAdmin": "系统管理员",
-  "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.",
+  "admin.general.policy.restrictPostDeleteDescription": "设置谁可以删除消息的策略。",
-  "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:",
+  "admin.general.policy.restrictPostDeleteTitle": "允许哪些用户删除消息：",
   "admin.general.policy.restrictPrivateChannelCreationDescription": "设置谁可以创建私有组的策略。",
   "admin.general.policy.restrictPrivateChannelCreationTitle": "开启创建私有组：",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "命令符工具",
@@ -936,10 +936,10 @@
   "analytics.chart.meaningful": "没有足够的数据进行有意义的表示。",
   "analytics.system.activeUsers": "有发信息的的正常用户",
   "analytics.system.channelTypes": "频道类型",
-  "analytics.system.dailyActiveUsers": "Daily Active Users",
+  "analytics.system.dailyActiveUsers": "每日活动用户",
   "analytics.system.expiredBanner": "企业授权已在 {date} 过期。您在即日起有15天时间更新授权，请联系 <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>。",
   "analytics.system.expiringBanner": "企业授权已在 {date} 过期。请更新授权，详情请联系 <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>。",
-  "analytics.system.monthlyActiveUsers": "Monthly Active Users",
+  "analytics.system.monthlyActiveUsers": "每月活动用户",
   "analytics.system.postTypes": "发文，文件和标签",
   "analytics.system.privateGroups": "私有组",
   "analytics.system.publicChannels": "公共频道",
@@ -968,6 +968,18 @@
   "analytics.team.title": "{team}的团队统计数据",
   "analytics.team.totalPosts": "信息总数",
   "analytics.team.totalUsers": "用户总数",
+  "api.channel.add_member.added": "{addedUsername} 被 {username} 添加到频道",
+  "api.channel.delete_channel.archived": "{username} 归档了频道。",
+  "api.channel.join_channel.post_and_forget": "{username} 加入了频道。",
+  "api.channel.leave.left": "{username} 离开了频道。",
+  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} 更新了频道显示名从：{old} 到：{new}",
+  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} 删除了频道标题 (曾是：{old})",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} 更新了频道标题从：{old} 到：{new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} 更新了频道标题到：{new}",
+  "api.channel.remove_member.removed": "{removedUsername} 被移出频道",
+  "app.channel.post_update_channel_purpose_message.removed": "{username} 移除了频道作用 (曾是：{old})",
+  "app.channel.post_update_channel_purpose_message.updated_from": "{username} 更新了频道作用从：{old} 到：{new}",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} 更新了频道作用到：{new}",
   "audit_table.accountActive": "账户激活",
   "audit_table.accountInactive": "停用帐号",
   "audit_table.action": "操作",
@@ -1096,8 +1108,8 @@
   "channel_loader.wrote": "写到：",
   "channel_members_dropdown.channel_admin": "频道管理员",
   "channel_members_dropdown.channel_member": "频道成员",
-  "channel_members_dropdown.make_channel_admin": "Make Channel Admin",
+  "channel_members_dropdown.make_channel_admin": "成为频道管理员",
-  "channel_members_dropdown.make_channel_member": "Make Channel Member",
+  "channel_members_dropdown.make_channel_member": "成为频道成员",
   "channel_members_dropdown.remove_from_channel": "从频道移除",
   "channel_members_dropdown.remove_member": "移除成员",
   "channel_members_modal.addNew": "添加新成员",
@@ -1134,7 +1146,7 @@
   "channel_notifications.unreadInfo": "有未读消息时，侧边栏的频道名称粗体显示。只有当您被提及时选择“仅对提及”会加粗频道名称。",
   "channel_select.placeholder": "--- 选择一个频道 ---",
   "channel_switch_modal.dm": "(私信)",
-  "channel_switch_modal.failed_to_open": "Failed to open channel.",
+  "channel_switch_modal.failed_to_open": "打开频道失败。",
   "channel_switch_modal.help": "输入频道名。↑↓浏览，TAB选择，↵确认，ESC取消",
   "channel_switch_modal.not_found": "无匹配项。",
   "channel_switch_modal.submit": "切换",
@@ -1207,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已被使用或含有预留词",
+  "create_team.team_url.taken": "This URL <a href='https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url' target='_blank'>starts with a reserved word</a> or is unavailable. Please try another.",
   "create_team.team_url.teamUrl": "团队URL",
   "create_team.team_url.unavailable": "这个URL不可用。请尝试另一个。",
   "create_team.team_url.webAddress": "选择您的新团队网址：",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{count} 位，共 {total} 位成员",
   "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count} 位成员，共 {total} 位",
   "filtered_user_list.member": "成员",
+  "filtered_user_list.next": "下一页",
+  "filtered_user_list.prev": "上一页",
   "filtered_user_list.search": "搜索用户",
   "filtered_user_list.searchButton": "搜索",
   "filtered_user_list.show": "过滤器：",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "创建新频道",
   "more_channels.createClick": "点击'创建新频道'创建一个新的频道",
   "more_channels.join": "加入",
+  "more_channels.next": "下一页",
   "more_channels.noMore": "没有更多可加入的频道",
+  "more_channels.prev": "上一页",
   "more_channels.title": "更多频道",
   "more_direct_channels.close": "关闭",
   "more_direct_channels.message": "消息",
@@ -1689,6 +1705,7 @@
   "post_info.mobile.unflag": "取消标记",
   "post_info.permalink": "永久链接",
   "post_info.reply": "回复",
+  "post_info.system": "系统",
   "post_message_view.edited": "(已编辑)",
   "posts_view.loadMore": "载入更多消息",
   "posts_view.newMsg": "新消息",
@@ -1970,9 +1987,9 @@
   "user.settings.display.channeldisplaymode": "选择中间栏的宽度。",
   "user.settings.display.clockDisplay": "时钟显示",
   "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.collapseDisplay": "图片链接预览默认显示",
-  "user.settings.display.collapseOff": "Collapsed",
+  "user.settings.display.collapseOff": "已折叠",
-  "user.settings.display.collapseOn": "Expanded",
+  "user.settings.display.collapseOn": "已展开",
   "user.settings.display.fixedWidthCentered": "固定宽度，居中",
   "user.settings.display.fontDesc": "选择在Mattermost用户界面显示的字体。",
   "user.settings.display.fontTitle": "显示字体",
@@ -2155,9 +2172,9 @@
   "user.settings.security.lastUpdated": "上次更新时间{date}{time}",
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "用 GitLab 登录",
-  "user.settings.security.loginGoogle": "Login done through Google Apps",
+  "user.settings.security.loginGoogle": "从 Google Apps 登入",
   "user.settings.security.loginLdap": "用 AD/LDAP 登录",
-  "user.settings.security.loginOffice365": "Login done through Office 365",
+  "user.settings.security.loginOffice365": "从 Office 365 登入",
   "user.settings.security.loginSaml": "用 SAML 登录",
   "user.settings.security.logoutActiveSessions": "查看并退出正在执行的会话",
   "user.settings.security.method": "登录方式",

webapp/i18n/zh_TW.json

@@ -28,7 +28,7 @@
   "activity_log.sessionsDescription": "當使用新的瀏覽器登入時工作階段會被建立。工作階段讓您可以在系統管理員設定的時間內不用重複登入。如果想先行登出，請使用下方的 '登出' 按鈕以結束工作階段。",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android 原生應用程式",
-  "activity_log_modal.desktop": "Native Desktop App",
+  "activity_log_modal.desktop": "原生桌面應用程式",
   "activity_log_modal.iphoneNativeApp": "iPhone 原生應用程式",
   "add_command.autocomplete": "自動完成",
   "add_command.autocomplete.help": "在自動完成列表上顯示斜線命令(非必須)。",
@@ -310,20 +310,20 @@
   "admin.general.localization.serverLocaleTitle": "預設的伺服器語言：",
   "admin.general.log": "記錄",
   "admin.general.policy": "政策",
-  "admin.general.policy.allowEditPostAlways": "Any time",
+  "admin.general.policy.allowEditPostAlways": "任何時間",
-  "admin.general.policy.allowEditPostDescription": "Set policy on the length of time authors have to edit their messages after posting.",
+  "admin.general.policy.allowEditPostDescription": "設定作者在發出訊息後有多少時間可以編輯。",
   "admin.general.policy.allowEditPostNever": "永不",
-  "admin.general.policy.allowEditPostTimeLimit": "seconds after posting",
+  "admin.general.policy.allowEditPostTimeLimit": "發出訊息後幾秒內",
-  "admin.general.policy.allowEditPostTitle": "Allow users to edit their messages:",
+  "admin.general.policy.allowEditPostTitle": "允許使用者編輯訊息：",
   "admin.general.policy.permissionsAdmin": "團隊跟系統管理員",
   "admin.general.policy.permissionsAll": "團隊全員",
   "admin.general.policy.permissionsAllChannel": "所有頻道成員",
   "admin.general.policy.permissionsDeletePostAdmin": "團隊跟系統管理員",
-  "admin.general.policy.permissionsDeletePostAll": "Message authors can delete their own messages, and Administrators can delete any message",
+  "admin.general.policy.permissionsDeletePostAll": "訊息作者可以刪除自己的訊息，管理者可以刪除任意訊息",
   "admin.general.policy.permissionsDeletePostSystemAdmin": "系統管理員",
   "admin.general.policy.permissionsSystemAdmin": "系統管理員",
-  "admin.general.policy.restrictPostDeleteDescription": "Set policy on who has permission to delete messages.",
+  "admin.general.policy.restrictPostDeleteDescription": "設定誰擁有刪除訊息的權限",
-  "admin.general.policy.restrictPostDeleteTitle": "Allow which users to delete messages:",
+  "admin.general.policy.restrictPostDeleteTitle": "允許哪個使用者刪除訊息：",
   "admin.general.policy.restrictPrivateChannelCreationDescription": "設定誰能建立私人群組的政策。",
   "admin.general.policy.restrictPrivateChannelCreationTitle": "允許建立私人群組：",
   "admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "命令列工具",
@@ -375,7 +375,7 @@
   "admin.image.amazonS3BucketExample": "如：\"mattermost-media\"",
   "admin.image.amazonS3BucketTitle": "Amazon S3 儲存貯體：",
   "admin.image.amazonS3EndpointDescription": "相容於 S3 的儲存提供者的主機名稱。預設為`s3.amazonaws.com`。",
-  "admin.image.amazonS3EndpointExample": "E.g.: \"s3.amazonaws.com\"",
+  "admin.image.amazonS3EndpointExample": "如：\"s3.amazonaws.com\"",
   "admin.image.amazonS3EndpointTitle": "Amazon S3 端點：",
   "admin.image.amazonS3IdDescription": "從 Amazon EC2 管理員取得認證。",
   "admin.image.amazonS3IdExample": "如：\"AKIADTOVBGERKLCBV\"",
@@ -480,7 +480,7 @@
   "admin.ldap.testSuccess": "AD/LDAP Test Successful",
   "admin.ldap.uernameAttrDesc": "用於設定 Mattermost 使用者名稱的 AD/LDAP 伺服器屬性。這有可能跟 ID 為同一個屬性。",
   "admin.ldap.userFilterDisc": "(非必須)輸入 AD/LDAP 過濾條件用來搜尋使用者。只有該條件找出來的用戶可以存取 Mattermost。對 Active Directory，排除被關閉的使用者的條件為 (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2)))。",
-  "admin.ldap.userFilterEx": "例如 \"(objectClass=user)\"",
+  "admin.ldap.userFilterEx": "例如：\"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "使用者過濾條件：",
   "admin.ldap.usernameAttrEx": "如：\"sAMAccountName\"",
   "admin.ldap.usernameAttrTitle": "使用者名稱的屬性：",
@@ -577,7 +577,7 @@
   "admin.rate.enableLimiterTitle": "啟用張貼頻率限制：",
   "admin.rate.httpHeaderDescription": "當有內容的時候，會根據內容指定的 HTTP 標頭欄位(如 NGINX的情況設定 \"X-Real-IP\"、AmazonELB的情況設定\"X-Forwarded-For\")改變張貼頻率限制。",
   "admin.rate.httpHeaderExample": "如：\"X-Real-IP\", \"X-Forwarded-For\"",
-  "admin.rate.httpHeaderTitle": "根據 HTTP 標頭改變張貼頻率限制",
+  "admin.rate.httpHeaderTitle": "根據 HTTP 標頭改變張貼頻率限制：",
   "admin.rate.maxBurst": "最大高載值：",
   "admin.rate.maxBurstDescription": "允許暫時超過每秒查詢限制的最大要求數量。",
   "admin.rate.maxBurstExample": "如：\"100\"",
@@ -610,7 +610,7 @@
   "admin.saml.assertionConsumerServiceURLDesc": "輸入 https://<您的 mattermost 網址>/login/sso/saml。請根據伺服器設定選擇 HTTP 或 HTTPS。此欄位又被稱為宣告取用者服務網址。",
   "admin.saml.assertionConsumerServiceURLEx": "如：\"https://<您的 mattermost 網址>/login/sso/saml\"",
   "admin.saml.assertionConsumerServiceURLTitle": "服務提供者登入網址：",
-  "admin.saml.bannerDesc": "User attributes in SAML server, including user deactivation or removal, are updated in Mattermost during user login. Learn more at: <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>",
+  "admin.saml.bannerDesc": "SAML 伺服器中的使用者屬性將在使用者登入時於 Mattermost 更新，包括移除或停用使用者。詳請參閱 <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>",
   "admin.saml.emailAttrDesc": "用於設定 Mattermost 使用者電子郵件位址的 SAML 宣告屬性。",
   "admin.saml.emailAttrEx": "如：\"Email\"或\"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "電子郵件位址屬性：",
@@ -847,7 +847,7 @@
   "admin.team.maxChannelsExample": "如：\"100\"",
   "admin.team.maxChannelsTitle": "團隊最大頻道數：",
   "admin.team.maxNotificationsPerChannelDescription": "頻道使用者人數在超過此數量後，由於效能考量，使用者輸入訊息、@all、@here 以及 @channel 將不再發送通知。",
-  "admin.team.maxNotificationsPerChannelExample": "如：\"10000\"",
+  "admin.team.maxNotificationsPerChannelExample": "如：\"1000\"",
   "admin.team.maxNotificationsPerChannelTitle": "單一頻道最大通知數：",
   "admin.team.maxUsersDescription": "每個團隊最大人數，包含活躍與不活躍的使用者。",
   "admin.team.maxUsersExample": "如：\"25\"",
@@ -914,13 +914,13 @@
   "admin.webrtc.gatewayWebsocketUrlTitle": "閘道 Websocket 網址：",
   "admin.webrtc.stunUriDescription": "輸入 stun:<your-stun-url>:<port> 作為 STUN URI。STUN 是個讓位於 NAT 後方的裝置取得公開 IP 位置的標準網路協定。",
   "admin.webrtc.stunUriExample": "如：\"stun:webrtc.mattermost.com:5349\"",
-  "admin.webrtc.stunUriTitle": "STUN URI",
+  "admin.webrtc.stunUriTitle": "STUN URI：",
   "admin.webrtc.turnSharedKeyDescription": "輸入 TURN 伺服器共用金鑰。這將用來產生動態密碼以建立連線。每個密碼只在短期內有效。",
   "admin.webrtc.turnSharedKeyExample": "如：\"bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg=\"",
   "admin.webrtc.turnSharedKeyTitle": "TURN 共用金鑰：",
   "admin.webrtc.turnUriDescription": "輸入 turn:<your-turn-url>:<port> 作為 TURN URI。TURN 是個讓位於對稱性 NAT 後方的裝置透過公開 IP 轉發以建立連線的標準網路協定。",
   "admin.webrtc.turnUriExample": "如：\"turn:webrtc.mattermost.com:5349\"",
-  "admin.webrtc.turnUriTitle": "TURN URI",
+  "admin.webrtc.turnUriTitle": "TURN URI：",
   "admin.webrtc.turnUsernameDescription": "如入 TURN 伺服器使用者名稱。",
   "admin.webrtc.turnUsernameExample": "如：\"myusername\"",
   "admin.webrtc.turnUsernameTitle": "TURN 使用者名稱：",
@@ -936,14 +936,14 @@
   "analytics.chart.meaningful": "沒有足夠有意義的資料可顯示。",
   "analytics.system.activeUsers": "有發文的活躍使用者",
   "analytics.system.channelTypes": "頻道類型",
-  "analytics.system.dailyActiveUsers": "Daily Active Users",
+  "analytics.system.dailyActiveUsers": "每日活躍使用者",
   "analytics.system.expiredBanner": "企業版授權將在{date}過期。請在該日起15天內更新授權。詳情請洽<a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>。",
   "analytics.system.expiringBanner": "企業版授權將在{date}過期。請洽<a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>以更新授權。",
-  "analytics.system.monthlyActiveUsers": "Monthly Active Users",
+  "analytics.system.monthlyActiveUsers": "每月活躍使用者",
   "analytics.system.postTypes": "發文,檔案與#標籤",
   "analytics.system.privateGroups": "私人群組",
   "analytics.system.publicChannels": "公開頻道",
-  "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
+  "analytics.system.skippedIntensiveQueries": "部份統計已被停用以獲得最大的效能。可以在 config.json 中重新啟用它們。詳請參閱 <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
   "analytics.system.textPosts": "以純文字發文",
   "analytics.system.title": "系統統計",
   "analytics.system.totalChannels": "全部頻道",
@@ -968,6 +968,18 @@
   "analytics.team.title": "{team}的團隊統計",
   "analytics.team.totalPosts": "全部發文",
   "analytics.team.totalUsers": "全部使用者",
+  "api.channel.add_member.added": "{username} 已將 {addedUsername} 加入頻道",
+  "api.channel.delete_channel.archived": "{username} 已封存頻道。",
+  "api.channel.join_channel.post_and_forget": "{username} 已加入頻道。",
+  "api.channel.leave.left": "{username} 已離開頻道。",
+  "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} 已更新頻道顯示名稱：從 {old} 改為 {new}",
+  "api.channel.post_update_channel_header_message_and_forget.removed": "{username} 已移除頻道標題(原為：{old})",
+  "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} 已更新頻道標題：從 {old} 改為 {new}",
+  "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} 已更新頻道標題為：{new}",
+  "api.channel.remove_member.removed": "{removedUsername} 已被從頻道中移除",
+  "app.channel.post_update_channel_purpose_message.removed": "{username} 已移除頻道用途(原為：{old})",
+  "app.channel.post_update_channel_purpose_message.updated_from": "{username} 已更新頻道用途：從 {old} 改為 {new}",
+  "app.channel.post_update_channel_purpose_message.updated_to": "{username} 已更新頻道用途為：{new}",
   "audit_table.accountActive": "啟用帳號",
   "audit_table.accountInactive": "停用帳號",
   "audit_table.action": "動作",
@@ -1094,12 +1106,12 @@
   "channel_loader.uploadedFile": " 已上傳一個檔案",
   "channel_loader.uploadedImage": " 已上傳一張圖片",
   "channel_loader.wrote": " 寫下： ",
-  "channel_members_dropdown.channel_admin": "Channel Admin",
+  "channel_members_dropdown.channel_admin": "頻道管理員",
   "channel_members_dropdown.channel_member": "頻道成員",
-  "channel_members_dropdown.make_channel_admin": "Make Channel Admin",
+  "channel_members_dropdown.make_channel_admin": "成為頻道管理員",
-  "channel_members_dropdown.make_channel_member": "Make Channel Member",
+  "channel_members_dropdown.make_channel_member": "成為頻道成員",
-  "channel_members_dropdown.remove_from_channel": "Remove From Channel",
+  "channel_members_dropdown.remove_from_channel": "從頻道中移除",
-  "channel_members_dropdown.remove_member": "Remove Member",
+  "channel_members_dropdown.remove_member": "移除成員",
   "channel_members_modal.addNew": " 增加新成員",
   "channel_members_modal.members": " 成員",
   "channel_modal.cancel": "取消",
@@ -1110,7 +1122,7 @@
   "channel_modal.edit": "編輯",
   "channel_modal.group": "群組",
   "channel_modal.header": "標題",
-  "channel_modal.headerEx": "E.g.: \"[Link Title](http://example.com)\"",
+  "channel_modal.headerEx": "如：\"[連結標題](http://example.com)\"",
   "channel_modal.headerHelp": "設定除了{term}名字以外還會顯示在{term}標題的文字。舉例來說，可以輸入 [Link Title](http://example.com) 以顯示常用連結。",
   "channel_modal.modalTitle": "新增",
   "channel_modal.name": "名字",
@@ -1121,7 +1133,7 @@
   "channel_modal.publicChannel1": "建立公開頻道",
   "channel_modal.publicChannel2": "建立一個人人可加入的頻道。 ",
   "channel_modal.purpose": "用途",
-  "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
+  "channel_modal.purposeEx": "如：\"用於歸檔錯誤跟改善的頻道\"",
   "channel_notifications.allActivity": "所有的活動所有的活動",
   "channel_notifications.allUnread": "全部的未讀訊息",
   "channel_notifications.globalDefault": "系統預設({notifyLevel})",
@@ -1134,7 +1146,7 @@
   "channel_notifications.unreadInfo": "當有未讀訊息時，側邊欄的頻道名字會用粗體表示。選擇\"僅限於提及您的\"將只有您被提及的頻道會用粗體。",
   "channel_select.placeholder": "--- 選擇頻道 ---",
   "channel_switch_modal.dm": "(直接傳訊)",
-  "channel_switch_modal.failed_to_open": "Failed to open channel.",
+  "channel_switch_modal.failed_to_open": "開啟頻道失敗。",
   "channel_switch_modal.help": "請輸入頻道名。↑↓可以瀏覽、TAB 選擇、↵ 確認、ESC 取消",
   "channel_switch_modal.not_found": "找不到符合的。",
   "channel_switch_modal.submit": "切換",
@@ -1207,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": "網址已被使用或是含有保留字",
+  "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.teamUrl": "團隊網址",
   "create_team.team_url.unavailable": "不能使用這網址。請嘗試其他的。",
   "create_team.team_url.webAddress": "為新團隊選取網址：",
@@ -1294,6 +1306,8 @@
   "filtered_user_list.countTotal": "{total}位中{count}位成員",
   "filtered_user_list.countTotalPage": "{total}位中{startCount, number} - {endCount, number}位成員",
   "filtered_user_list.member": "成員",
+  "filtered_user_list.next": "下一頁",
+  "filtered_user_list.prev": "上一頁",
   "filtered_user_list.search": "搜尋使用者",
   "filtered_user_list.searchButton": "搜尋",
   "filtered_user_list.show": "過濾條件：",
@@ -1307,10 +1321,10 @@
   "find_team.submitError": "請輸入一個有效的電子郵件位址",
   "flag_post.flag": "標記以追蹤",
   "flag_post.unflag": "取消標記",
-  "general_tab.chooseDescription": "為團隊取名",
+  "general_tab.chooseDescription": "為團隊寫新的敘述",
   "general_tab.chooseName": "為團隊取名",
   "general_tab.codeDesc": "按下'修改'來重新產生邀請碼。",
-  "general_tab.codeLongDesc": "邀請碼用來當作主選單中<strong>取得團隊邀請連結</strong>所產生的團隊邀請連結的一部分。重新產生會建立一個新的招待連結並且讓舊的連結失效。",
+  "general_tab.codeLongDesc": "邀請碼用來當作主選單中{getTeamInviteLink}所產生的團隊邀請連結的一部分。重新產生會建立一個新的招待連結並且讓舊的連結失效。",
   "general_tab.codeTitle": "邀請碼",
   "general_tab.emptyDescription": "按下'編輯'以增加團隊敘述。",
   "general_tab.getTeamInviteLink": "取得團隊邀請連結",
@@ -1571,7 +1585,7 @@
   "login.passwordChanged": " 已成功更新密碼",
   "login.session_expired": " 工作階段已逾期，請重新登入。",
   "login.signIn": "登入",
-  "login.signInLoading": "Signing in...",
+  "login.signInLoading": "登入中...",
   "login.signInWith": "登入方法：",
   "login.userNotFound": "無法找到與您輸入的認證相符的帳號。",
   "login.username": "使用者名稱",
@@ -1613,7 +1627,9 @@
   "more_channels.create": "建立頻道",
   "more_channels.createClick": "按下'建立頻道'來建立新頻道",
   "more_channels.join": "加入",
+  "more_channels.next": "下一頁",
   "more_channels.noMore": "沒有可參加的頻道",
+  "more_channels.prev": "上一頁",
   "more_channels.title": "更多頻道",
   "more_direct_channels.close": "關閉",
   "more_direct_channels.message": "訊息",
@@ -1689,7 +1705,8 @@
   "post_info.mobile.unflag": "取消標記",
   "post_info.permalink": "永久網址",
   "post_info.reply": "回覆",
-  "post_message_view.edited": "(edited)",
+  "post_info.system": "系統",
+  "post_message_view.edited": "(被編輯過)",
   "posts_view.loadMore": "載入更多訊息",
   "posts_view.newMsg": "新訊息",
   "posts_view.newMsgBelow": "下面還有 {count} 個新訊息",
@@ -1924,7 +1941,7 @@
   "update_command.question": "變更可能會導致現有的斜線命令無法使用。您確定要更新嘛？",
   "update_command.update": "更新",
   "upload_overlay.info": "將檔案拖曳到這裡上傳。",
-  "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": "訊息中第一個網站連結，嘗試顯示網站內容預覽於訊息下方",
   "user.settings.advance.embed_toggle": "內嵌預覽顯示開關",
   "user.settings.advance.enabledFeatures": "已啟用 {count, number} 項功能",
   "user.settings.advance.formattingDesc": "啟用時，文章會顯示連結、顯示繪文字、套用樣式到文字上並自動斷行。此設定預設為開啟。修改此設定後需要重新讀取頁面以生效。",
@@ -1969,10 +1986,10 @@
   "user.settings.display.channelDisplayTitle": "頻道顯示模式",
   "user.settings.display.channeldisplaymode": "選擇中央頻道的寬度。",
   "user.settings.display.clockDisplay": "顯示時間",
-  "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.collapseDesc": "設定圖片預覽預設為收折或是展開。此設定也可以經由斜線命令 /expand 與 /collapse 控制。",
-  "user.settings.display.collapseDisplay": "Default appearance of image link previews",
+  "user.settings.display.collapseDisplay": "圖片連結預覽的預設顯示",
-  "user.settings.display.collapseOff": "Collapsed",
+  "user.settings.display.collapseOff": "已收摺",
-  "user.settings.display.collapseOn": "Expanded",
+  "user.settings.display.collapseOn": "已展開",
   "user.settings.display.fixedWidthCentered": "固定寬度，置中對齊",
   "user.settings.display.fontDesc": "選擇 Mattermost 使用者介面的字型。",
   "user.settings.display.fontTitle": "顯示字型",
@@ -2155,9 +2172,9 @@
   "user.settings.security.lastUpdated": "最後一次更新於 {date} {time}",
   "user.settings.security.ldap": "AD/LDAP",
   "user.settings.security.loginGitlab": "已經由 GitLab 登入",
-  "user.settings.security.loginGoogle": "Login done through Google Apps",
+  "user.settings.security.loginGoogle": "經由 Gooel Apps 登入",
   "user.settings.security.loginLdap": "已經由 AD/LDAP 登入",
-  "user.settings.security.loginOffice365": "Login done through Office 365",
+  "user.settings.security.loginOffice365": "經由 Office 365 登入",
   "user.settings.security.loginSaml": "已經由 SAML 登入",
   "user.settings.security.logoutActiveSessions": "觀看並登出使用中的工作階段",
   "user.settings.security.method": "登入方式",
@@ -2186,11 +2203,11 @@
   "user.settings.security.passwordErrorUppercaseNumberSymbol": "密碼最短必須有{min}個字元且至少有一個大寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。",
   "user.settings.security.passwordErrorUppercaseSymbol": "密碼最短必須有{min}個字元且至少有一個大寫英文字母和一個符號(\"~!@#$%^&*()\")。",
   "user.settings.security.passwordGitlabCantUpdate": "經由 GitLab 登入。無法變更密碼。",
-  "user.settings.security.passwordGoogleCantUpdate": "經由 GitLab 登入。無法變更密碼。",
+  "user.settings.security.passwordGoogleCantUpdate": "經由 Gooel Apps 登入。無法變更密碼。",
   "user.settings.security.passwordLdapCantUpdate": "經由 AD/LDAP 登入。無法變更密碼。",
   "user.settings.security.passwordMatchError": "輸入的新密碼不一致。",
   "user.settings.security.passwordMinLength": "無效的最短長度，無法顯示預覽。",
-  "user.settings.security.passwordOffice365CantUpdate": "經由 GitLab 登入。無法變更密碼。",
+  "user.settings.security.passwordOffice365CantUpdate": "經由 Office 365 登入。無法變更密碼。",
   "user.settings.security.passwordSamlCantUpdate": "此欄位由您的登入提供者決定。如果想變更它，得經由登入提供者變更。",
   "user.settings.security.retypePassword": "再次輸入新密碼",
   "user.settings.security.saml": "SAML",