translations PR 20180604 (#8909)

14 files changed, 2723 insertions, 643 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 314fbfdfb..17ca3b5af 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -412,10 +412,26 @@
     "translation": "Versuch einer ungültigen Änderung am Standardkanal {{.Channel}} durchzuführen"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Konnte den Ungelesen-Zähler für user_id=%v und channel_id=%v nicht abrufen, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Initialisiere Cluster-API-Routen"
   },
@@ -1273,10 +1289,6 @@
     "translation": "Konnte Reaktionen nicht löschen während Emoji mit dem Namen %v gelöscht wurde"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Ungültige Berechtigungen, um Emoji zu löschen."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Benutzerdefinierte Emoji wurden durch den Systemadministrator deaktiviert."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Konnte Profil für Kanalmitglied nicht laden, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "Nachrichtenersteller nicht im Kanal für die Nachricht, keine Benachrichtigung versendet post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Neue Erwähnung"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " hat eine oder mehrere Dateien hochgeladen in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " hat eine oder mehrere Dateien in einer Direktnachricht hochgeladen"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " hat eine oder mehrere Dateien hochgeladen"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " hat Sie erwähnt in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " hat Sie erwähnt"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " hat dir eine Nachricht gesendet"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " hat einen Beitrag geschrieben"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " geschrieben in "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " hat einen Beitrag geschrieben"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "Das Zertifikat konnte nicht korrekt gespeichert werden."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Server wird initialisiert..."
   },
@@ -2511,6 +2523,14 @@
     "translation": "Sie haben nicht die erforderlichen Berechtigungen"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Gruppennachricht"
   },
@@ -3939,6 +3959,10 @@
     "translation": "Die angegebene Rolle existiert nicht."
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Dieses Team hat die maximale Anzahl erlaubter Konten erreicht. Kontaktieren Sie Ihren Systemadministrator, um eine höhere Begrenzung setzen zu lassen."
   },
@@ -4607,6 +4631,14 @@
     "translation": "Aktuelles Arbeitsverzeichnis ist %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Ungültiges Zugriffstoken"
   },
@@ -4951,6 +4983,10 @@
     "translation": "Nachrichtenaufbewahrung muss ein Tag oder länger sein."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays-Einstellung muss eine Zahl sein, die größer als oder gleich 1 ist"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "Seiten-URL muss eine gültige URL sein und mit http:// oder https:// beginnen"
+    "translation": "Icon-URL muss eine gültige URL sein und mit http:// oder https:// beginnen."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Kanal existiert nicht"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "Der Kanalanzahl konnte nicht gefunden werden"
   },
@@ -6083,6 +6123,26 @@
     "translation": "Konnte Erwähnungenanzahl nicht erhöhen"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Konnte Direktkanalüberschrift nicht aktualisieren"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Der Kanal konnte nicht gelöscht werden"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Die Kanalmitglieder konnten nicht entfernt werden"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Konnte die Transaktion nicht ausführen"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Konnte Reaktion nicht speichern"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Konnte die Rolle nicht abrufen"
   },
@@ -6763,10 +6831,74 @@
     "translation": "Die Rolle war ungültig"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "Die Rolle war ungültig"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Konnte die Rolle nicht aktualisieren"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "Es konnten nicht alle Rollen permanent gelöscht werden"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Die Anzahl der Sitzungen konnten nicht gezählt werden"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Das existierende Team konnte nicht gefunden werden"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "Das Teammitglied konnte nicht abgerufen werden"
   },
@@ -6943,6 +7079,26 @@
     "translation": "Die ungelesenen Nachrichten des Teams konnten nicht abgerufen werden"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Konnte Direktkanalüberschrift nicht aktualisieren"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Das existierende Team konnte nicht gelöscht werden"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Das Teammitglied konnte nicht entfernt werden"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Das Team konnte nicht gespeichert werden"
   },
diff --git a/i18n/en.json b/i18n/en.json
index ac3cb4110..4df698294 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,54 +48,6 @@
     "translation": "September"
   },
   {
-    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
-    "translation": "Migration failed due to invalid progress data."
-  },
-  {
-    "id": "migrations.worker.run_migration.unknown_key",
-    "translation": "Cannot run migration job due to unknown migration key."
-  },
-  {
-    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
-    "translation": "Failed to open the database transaction"
-  },
-  {
-    "id": "store.sql_channel.migrate_channel_members.select.app_error",
-    "translation": "Failed to select the batch of channel members"
-  },
-  {
-    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
-    "translation": "Failed to roll back the database transaction"
-  },
-  {
-    "id": "store.sql_channel.migrate_channel_members.update.app_error",
-    "translation": "Failed to update the channel member"
-  },
-  {
-    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
-    "translation": "Failed to commit the database transaction"
-  },
-  {
-    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
-    "translation": "Failed to open the database transaction"
-  },
-  {
-    "id": "store.sql_team.migrate_team_members.select.app_error",
-    "translation": " Failed to select the batch of team members"
-  },
-  {
-    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
-    "translation": "Failed to roll back the database transaction"
-  },
-  {
-    "id": "store.sql_team.migrate_team_members.update.app_error",
-    "translation": "Failed to update the team member"
-  },
-  {
-    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
-    "translation": "Failed to commit the database transaction"
-  },
-  {
     "id": "api.admin.add_certificate.no_file.app_error",
     "translation": "No file under 'certificate' in request."
   },
@@ -244,10 +196,6 @@
     "translation": "Private Channel management and creation is restricted to System Administrators."
   },
   {
-    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
-    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
-  },
-  {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
     "translation": "Private Channel management and creation is restricted to Team and System Administrators."
   },
@@ -276,18 +224,6 @@
     "translation": "The channel requested to convert is already a private channel."
   },
   {
-    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
-    "translation": "We could not reset the channel schemes"
-  },
-  {
-    "id": "store.sql_scheme.permanent_delete_all.app_error",
-    "translation": "We could not permanently delete the schemes"
-  },
-  {
-    "id": "store.sql_team.reset_all_team_schemes.app_error",
-    "translation": "We could not reset the team schemes"
-  },
-  {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Must use createDirectChannel API service for direct message channel creation"
   },
@@ -476,10 +412,26 @@
     "translation": "Tried to perform an invalid update of the default channel {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Initializing cluster API routes"
   },
@@ -1955,6 +1907,18 @@
     "translation": "Unable to get profile for channel member, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "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"
   },
@@ -1975,34 +1939,22 @@
     "translation": "New Mention"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " attached a file."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " mentioned you."
   },
   {
-    "id": "api.post.send_notification_and_forget.push_channel_mention",
-    "translation": " notified the channel."
-  },
-  {
-    "id": "api.post.send_notification_and_forget.push_comment_on_post",
-    "translation": " commented on your post."
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " posted a message."
   },
   {
-    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
-    "translation": " commented on a thread you participated in."
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": "sent you a message."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_general_message",
-    "translation": " posted a message."
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
   },
@@ -2099,6 +2051,14 @@
     "translation": "Certificate did not save properly."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Server is initializing..."
   },
@@ -3999,6 +3959,10 @@
     "translation": "The provided role does not exist"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit."
   },
@@ -4667,6 +4631,14 @@
     "translation": "Current working directory is %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Invalid access token"
   },
@@ -6071,6 +6043,10 @@
     "translation": "Channel does not exist"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "We couldn't get the channel counts"
   },
@@ -6147,6 +6123,26 @@
     "translation": "We couldn't increment the mention count"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Failed to update the channel member"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "We couldn't delete the channel"
   },
@@ -6167,6 +6163,10 @@
     "translation": "We couldn't remove the channel member"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Unable to commit transaction"
   },
@@ -6771,14 +6771,6 @@
     "translation": "Unable to delete reaction"
   },
   {
-    "id": "api.scheme.get_teams_for_scheme.scope.error",
-    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
-  },
-  {
-    "id": "api.scheme.get_channels_for_scheme.scope.error",
-    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
-  },
-  {
     "id": "store.sql_reaction.delete_all_with_emoj_name.delete_reactions.app_error",
     "translation": "Unable to delete reactions with the given emoji name"
   },
@@ -6811,6 +6803,10 @@
     "translation": "Unable to save reaction"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Unable to get role"
   },
@@ -6819,112 +6815,88 @@
     "translation": "Unable to get role"
   },
   {
-    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
-    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
-  },
-  {
-    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
-    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
-  },
-  {
-    "id": "api.channel.update_channel_scheme.license.error",
-    "translation": "License does not support updating a channel's scheme"
-  },
-  {
-    "id": "api.channel.update_channel_scheme.scheme_scope.error",
-    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
-  },
-  {
-    "id": "store.sql_channel.get_by_scheme.app_error",
-    "translation": "Unable to get the channels for the provided scheme"
-  },
-  {
-    "id": "store.sql_team.get_by_scheme.app_error",
-    "translation": "Unable to get the channels for the provided scheme"
+    "id": "store.sql_role.get_by_names.app_error",
+    "translation": "Unable to get roles"
   },
   {
-    "id": "store.sql_role.save.open_transaction.app_error",
-    "translation": "Failed to open the transaction to save the role"
+    "id": "store.sql_role.permanent_delete_all.app_error",
+    "translation": "We could not permanently delete all the roles"
   },
   {
-    "id": "store.sql_role.save_role.commit_transaction.app_error",
-    "translation": "Failed to commit the transaction to save the role"
+    "id": "store.sql_role.save.insert.app_error",
+    "translation": "Unable to save new role"
   },
   {
     "id": "store.sql_role.save.invalid_role.app_error",
     "translation": "The provided role is invalid"
   },
   {
-    "id": "store.sql_role.delete.update.app_error",
-    "translation": "Unable to delete the role"
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "The role was not valid"
   },
   {
-    "id": "store.sql_scheme.save.open_transaction.app_error",
-    "translation": "Failed to open the transaction to save the scheme"
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
   },
   {
-    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
-    "translation": "Failed to commit the transaction to save the scheme"
+    "id": "store.sql_role.save.update.app_error",
+    "translation": "Unable to update role"
   },
   {
-    "id": "store.sql_scheme.save.invalid_scheme.app_error",
-    "translation": "The provided scheme is invalid"
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
   },
   {
-    "id": "store.sql_scheme.save.update.app_error",
-    "translation": "Unable to update the scheme"
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
   },
   {
-    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
-    "translation": "Unable to retrieve the default scheme roles"
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
   },
   {
-    "id": "store.sql_scheme.save.insert.app_error",
-    "translation": "Unable to create the scheme"
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
   },
   {
     "id": "store.sql_scheme.get.app_error",
     "translation": "Unable to get the scheme"
   },
   {
-    "id": "store.sql_scheme.reset_teams.app_error",
-    "translation": "Unable to reset all teams using this scheme to the default scheme"
-  },
-  {
-    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
-    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "We could not permanently delete the schemes"
   },
   {
     "id": "store.sql_scheme.reset_channels.app_error",
     "translation": "Unable to reset all channels using this scheme to the default scheme"
   },
   {
-    "id": "store.sql_scheme.delete.role_update.app_error",
-    "translation": "Unable to delete the roles belonging to this scheme"
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
   },
   {
-    "id": "store.sql_scheme.delete.update.app_error",
-    "translation": "Unable to delete the scheme"
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
   },
   {
-    "id": "store.sql_role.get_by_names.app_error",
-    "translation": "Unable to get roles"
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
   },
   {
-    "id": "store.sql_role.permanent_delete_all.app_error",
-    "translation": "We could not permanently delete all the roles"
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
   },
   {
-    "id": "store.sql_role.save.insert.app_error",
-    "translation": "Unable to save new role"
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
   },
   {
-    "id": "store.sql_role.save.invalid_role.app_error",
-    "translation": "The role was not valid"
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
   },
   {
-    "id": "store.sql_role.save.update.app_error",
-    "translation": "Unable to update role"
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
   },
   {
     "id": "store.sql_session.analytics_session_count.app_error",
@@ -7075,6 +7047,10 @@
     "translation": "We couldn't find the existing team"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "We couldn't get the team member"
   },
@@ -7103,6 +7079,26 @@
     "translation": "We couldn't get the teams unread messages"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Failed to update the team member"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "We couldn't delete the existing team"
   },
@@ -7111,6 +7107,10 @@
     "translation": "We couldn't remove the team member"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "We couldn't save the team"
   },
diff --git a/i18n/es.json b/i18n/es.json
index d88651d15..a84c4cea4 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -412,10 +412,26 @@
     "translation": "Intento de realizar una actualización inválida al canal predeterminado {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "No se puede obtener el número de mensajes no leídos para user_id=%v y channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Inicializando rutas del API para el agrupamiento de servidores"
   },
@@ -1273,10 +1289,6 @@
     "translation": "No se puede eliminar las reacciones al eliminar el emoticon con el nombre %v"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Permisos inapropiados para eliminar el emoticon."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Los emoticones personalizados han sido inhabilitados por el administrador del sistema."
   },
@@ -1895,6 +1907,18 @@
     "translation": "No se puede obtener el perfil del miembro del canal, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "El creador del mensaje no es parte del canal donde se publicó el mensaje, no se envió la notificación post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Nueva Mención"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Subió uno o más archivos en "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " subió uno o más archivos en un mensaje directo"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " subió uno o más archivos"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " en "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " te mencionó en "
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
-    "translation": " te mencionó en "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " te envió un mensaje directo"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " publicó un mensaje"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " publicado en "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " publicó un mensaje"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "El certificado no se ha guardado correctamente."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Inicializando el Servidor..."
   },
@@ -2511,20 +2523,28 @@
     "translation": "No tienes los permisos apropiados"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Mensaje de Grupo"
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "Desactivaste tu cuenta en {{ .SiteURL }}.<br>Si este cambio no fue originado por ti o sí quieres reactivar tu cuenta, contacta a tu administrador de sistema."
   },
   {
     "id": "api.templates.deactivate_body.title",
-    "translation": "Your account has been deactivated at {{ .ServerURL }}"
+    "translation": "Tu cuenta ha sido desactivada en {{ .ServerURL }}"
   },
   {
     "id": "api.templates.deactivate_subject",
-    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
+    "translation": "[{{ .SiteName }}] Tu cuenta en {{ .ServerURL }} ha sido desactivada"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -3036,7 +3056,7 @@
   },
   {
     "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
+    "translation": "Ocurrió un error al enviar el correo electrónico de desactivación de cuenta"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3088,7 +3108,7 @@
   },
   {
     "id": "api.user.update_active.not_enable.app_error",
-    "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator."
+    "translation": "No puedes desactivar a tu propio usuario porque está funcionalidad no está habilitada. Por favor contacta al Administrador de Sistema."
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3872,7 +3892,7 @@
   },
   {
     "id": "app.plugin.delete_plugin_status_state.app_error",
-    "translation": "Unable to delete plugin status state."
+    "translation": "No se puede eliminar el complemento de estado."
   },
   {
     "id": "app.plugin.disabled.app_error",
@@ -3920,7 +3940,7 @@
   },
   {
     "id": "app.plugin.prepackaged.app_error",
-    "translation": "Cannot install prepackaged plugin"
+    "translation": "No se puede instalar el complemento pre-empaquetado"
   },
   {
     "id": "app.plugin.remove.app_error",
@@ -3928,7 +3948,7 @@
   },
   {
     "id": "app.plugin.set_plugin_status_state.app_error",
-    "translation": "Unable to set plugin status state."
+    "translation": "No se pudo configurar el complemento de estado."
   },
   {
     "id": "app.plugin.upload_disabled.app_error",
@@ -3939,6 +3959,10 @@
     "translation": "El rol suministrado no existe"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Este equipo ha alcanzado el número máximo de cuentas permitidas. Contacta a un administrador de sistema para que asigne un límite mayor."
   },
@@ -4607,6 +4631,14 @@
     "translation": "El directorio de trabajo actual es %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Token de acceso inválido"
   },
@@ -4951,6 +4983,10 @@
     "translation": "La retención de mensajes debe ser de un día o más."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "El valor AggregatePostsAfterDays de Elasticsearch debe ser un número mayor que o igual a 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "URL del Sitio debe estar asignado, ser una URL válida y empezar con http:// o https://."
+    "translation": "URL del Icono debe ser una URL válida y empezar con http:// o https://."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "El canal no existe"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "No pudimos obtener la cantidad de canales"
   },
@@ -6083,6 +6123,26 @@
     "translation": "No pudimos incrementar la cantidad de menciones"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Error al actualizar el encabezado del canal directo"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "No pudimos eliminar el canal"
   },
@@ -6103,6 +6163,10 @@
     "translation": "No pudimos remover al miembro del canal"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "No se puede perpetrar la transacción"
   },
@@ -6739,6 +6803,10 @@
     "translation": "No se puede guardar la reacción"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "No se pudo obtener el rol"
   },
@@ -6763,10 +6831,74 @@
     "translation": "El rol no es válido"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "El rol no es válido"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "No se pudo actualizar el rol"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "No se pudo eliminar permanentemente todos los roles"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "No pudimos contar las sesiones"
   },
@@ -6915,6 +7047,10 @@
     "translation": "No encontramos el equipo al que perteneces"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "No pudimos obtener los miembros del equipo"
   },
@@ -6943,6 +7079,26 @@
     "translation": "No pudimos obtener los mensajes sin leer de tus equipos"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Error al actualizar el encabezado del canal directo"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "No pudimos eliminar el equipo"
   },
@@ -6951,6 +7107,10 @@
     "translation": "No pudimos remover el miembro del equipo"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "No pudimos guardar el equipo"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 49a43b342..7c0eb211c 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -412,10 +412,26 @@
     "translation": "Échec de la tentative de mise à jour du canal par défaut {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Impossible de récupérer le nombre de messages non lus pour l'user_id=%v et le channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Initialisation des routes de l'API de cluster"
   },
@@ -1273,10 +1289,6 @@
     "translation": "Impossible de supprimer les réactions lors de la suppression de l'émotiĉone portant le nom %v"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Permissions insuffisantes pour supprimer des émoticônes."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Les émoticônes ont été désactivées par l'administrateur."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Impossible d'obtenir le profil pour le membre du canal, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "Le créateur du message n'est pas dans le même canal que le message, aucune notification n'a été envoyée post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Nouvelle mention"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " a envoyé un ou plusieurs fichiers dans "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " a envoyé un ou plusieurs fichiers dans un message personnel"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " a envoyé un ou plusieurs fichiers"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " dans "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " vous a mentionné sur "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " vous a mentionné"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " vous a envoyé un message personnel"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " a envoyé un message"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " envoyé dans "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " a envoyé un message"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "Le certificat ne s'est pas enregistré correctement."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Le serveur démarre..."
   },
@@ -2511,6 +2523,14 @@
     "translation": "Vous n'avez pas les permissions requises"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Message de groupe"
   },
@@ -3939,6 +3959,10 @@
     "translation": "Le rôle spécifié n'existe pas"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Cette équipe a atteint la limite du nombre maximum de comptes autorisés. Contactez votre administrateur système pour augmenter cette limite."
   },
@@ -4607,6 +4631,14 @@
     "translation": "Le dossier de travail actuel est %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Jeton d'accès invalide"
   },
@@ -4951,6 +4983,10 @@
     "translation": "La politique de rétention de message doit être un jour ou plus."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Le paramètre Elasticsearch AggregatePostsAfterDays doit être un nombre plus grand ou égal à 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "URL de site invalide. Il doit s'agir d'une URL valide et commencer par http:// ou https://."
+    "translation": "URL de l'icône invalide. Il doit s'agir d'une URL valide et commencer par http:// ou https://."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Le canal n'existe pas"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "Impossible de récupérer le nombre de canaux"
   },
@@ -6083,6 +6123,26 @@
     "translation": "Impossible d'incrémenter le nombre de mentions"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Impossible de mettre à jour l'entête du canal de messages privés"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Impossible de supprimer le canal"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Impossible de retirer le membre du canal"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Impossible de valider la transaction"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Impossible de sauvegarder cette réaction"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Impossible de récupérer le rôle"
   },
@@ -6763,10 +6831,74 @@
     "translation": "Le rôle est invalide"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "Le rôle est invalide"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Impossible de modifier le rôle"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "Impossible de supprimer définitivement tous les rôles"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Impossible de compter les sessions"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Impossible de trouver l'équipe existante"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "Impossible de récupérer le membre de l'équipe"
   },
@@ -6943,6 +7079,26 @@
     "translation": "Impossible de récupérer la liste des messages non lus des équipes"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Impossible de mettre à jour l'entête du canal de messages privés"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Impossible de supprimer l'équipe existante"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Impossible de retirer le membre de l'équipe"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Impossible d'enregistrer l'équipe"
   },
diff --git a/i18n/it.json b/i18n/it.json
index 977580691..29de3a836 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -412,10 +412,26 @@
     "translation": "Tentativo di esecuzione di un aggiornamento non valido per il canale predefinito {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Impossibile calcolare il numero di messaggi non letti per user_id %v e channel_id %v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Inizializzazione cluster API routes"
   },
@@ -1273,10 +1289,6 @@
     "translation": "Impossibile cancellare le reazioni durante la cancellazione dell'emoji %v"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Premessi insufficienti per eliminare l'emoji."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Le emoji personalizzate sono state disabilitate dall'amministratore di sistema."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Impossibile caricare il profilo del membro del canale, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " ha notificato il canale."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " ha commentato la tua pubblicazione."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " ha commentato una conversazione a cui hai partecipato."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "Il creatore della pubblicazione non è nel canale della pubblicazione, nessuna notifica inviata post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Nuova citazione"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " ha caricato uno o più file in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " ha caricato uno o più file in un messaggio diretto"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " ha caricato uno o più file"
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
+    "translation": " ti ha citato."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " in "
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " ha pubblicato un messaggio."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " ti ha citato in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
-    "translation": " ti ha citato"
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " ha allegato un file."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " ti ha inviato un messaggio diretto"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " pubblicato in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " ha pubblicato un messaggio"
+    "translation": "ti ha inviato un messaggio."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "Il certificato non è stato salvato correttamente."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Inizializzazione del server..."
   },
@@ -2511,20 +2523,28 @@
     "translation": "Non si dispone dei permessi necessari"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Messaggio di gruppo"
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "Hai disattivato il tuo account in {{ .SiteURL }}.<br>Se questa operazione non è stata fatta da te o desideri riattivare il tuo account, contatta l'amministratore di sistema."
   },
   {
     "id": "api.templates.deactivate_body.title",
-    "translation": "Your account has been deactivated at {{ .ServerURL }}"
+    "translation": "Il tuo account è stato disattivato in  {{ .ServerURL }}"
   },
   {
     "id": "api.templates.deactivate_subject",
-    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
+    "translation": "[{{ .SiteName }}] Il tuo account in {{ .ServerURL }} è stato disattivato"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -3036,7 +3056,7 @@
   },
   {
     "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
+    "translation": "Impossibile inviare la notifica di disattivazione account"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3088,7 +3108,7 @@
   },
   {
     "id": "api.user.update_active.not_enable.app_error",
-    "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator."
+    "translation": "Non puoi disattivare il tuo account perché questa operazione non è abilitata. Contatta l'Amministratore di Sistema."
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3939,6 +3959,10 @@
     "translation": "Il ruolo fornito non esiste"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Questo gruppo ha raggiunto il limite massimo di utenti ammessi. Contatta il tuo amministratore di sistema per innalzare il limite."
   },
@@ -4607,6 +4631,14 @@
     "translation": "La cartella di lavoro corrente è %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Token di accesso invalido"
   },
@@ -4951,6 +4983,10 @@
     "translation": "Il tempo di ritenzione del messaggio deve essere di almeno un giorno."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "Lo schema URL personalizzato {{.Scheme}} non è valido. Gli schemi URL personalizzati devono iniziare con una lettera e contenere solo lettere, numeri, più (+), punti, (.) e trattini (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "L'impostazione AggregatePostsAfterDays di Elasticsearch deve essere un numero maggiore o uguale a 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "L'URL sito deve essere un URL valido ed iniziare con http:// o https://"
+    "translation": "L'URL del sito deve essere un URL valido ed iniziare con http:// o https://."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Il canale non esiste"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "Impossibile recuperare il conteggio dei canali"
   },
@@ -6083,6 +6123,26 @@
     "translation": "Impossibile aumentare il conteggio delle citazioni"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Errore durante l'aggiornamento del titolo del canale diretto"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Non è stato possibile cancellare il canale"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Non è possibile rimuovere il membro del canale"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Errore durante l'esecuzione della transazione (commit)"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Impossibile salvare la reazione"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Impossibile recuperare il ruolo"
   },
@@ -6763,10 +6831,74 @@
     "translation": "Il ruolo non è valido"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "Il ruolo non è valido"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Impossibile aggiornare il ruolo"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "Impossibile eliminare definitivamente tutti i ruoli"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Impossibile effettuare il conteggio delle sessioni"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Non è stato possibile trovare il gruppo esistente"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "Impossibile recuperare il membro del gruppo"
   },
@@ -6943,6 +7079,26 @@
     "translation": "Non è stato possibile recuperare i messaggi non letti dei gruppi"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Errore durante l'aggiornamento del titolo del canale diretto"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Non è stato possibile eliminare il gruppo esistente"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Non è stato possibile rimuovere il membro del gruppo"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Non è stato possibile salvare il gruppo"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index a70d7437e..9faf0bd3b 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -412,10 +412,26 @@
     "translation": "デフォルトのチャンネル{{.Channel}}に不正な更新をしようとしました"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "与えられた役割はスキームによって管理されているため、チャンネルメンバーへ直接適用することはできません。"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "ライセンスがチャンネルスキームの更新をサポートしていません"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "与えられたスキームがチャンネルスキーマでないため、チャンネルへスキームを設定できません。"
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "未読数を取得できませんでした user_id=%v and channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "与えられた役割はスキームによって管理されているため、チームメンバーへ直接適用することはできません。"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "クラスターAPIルートを初期化しています"
   },
@@ -1273,10 +1289,6 @@
     "translation": "絵文字名 %v の絵文字を削除する際にリアクションを削除できません"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "絵文字の削除に必要な権限が付与されていません"
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "カスタム絵文字はシステム管理者によって無効化されています。"
   },
@@ -1895,6 +1907,18 @@
     "translation": "チャンネルメンバーのプロフィールを取得できませんでした user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " がチャンネルへ通知しました。"
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " があなたの投稿へのコメントしました。"
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " があなたが参加しているスレッドへのコメントしました。"
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "その投稿の作成者がチャンネルにいないため、通知は送信されませんでした post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "あなたについての新しい投稿"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " ファイルをアップロードしました "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " ファイルをダイレクトメッセージにアップロードしました"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " ファイルをアップロードしました"
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
+    "translation": " があなたについての投稿を行いました。"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": "があなたについて話しました:"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " がメッセージを投稿しました"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
-    "translation": " があなたについて話しました"
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " がファイルを添付しました。"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": "があなたにダイレクトメッセージを送りました"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " posted in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " がメッセージを投稿しました"
+    "translation": "あなたへメッセージを送信しました。"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "証明書が正常に保存されませんでした。"
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "与えられたスキームがチャンネルスキームではないため、チャンネルを取得できませんでした。"
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "与えられたスキームがチームスキームではないため、チームを取得できませんでした。"
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "サーバーを初期化しています…"
   },
@@ -2511,20 +2523,28 @@
     "translation": "あなたには必要な権限が付与されていません"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "ライセンスがチームのスキームの更新をサポートしていません"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "与えられたスキームがチームスキームではないため、チームへスキームを設定できません。"
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "グループメッセージ"
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "{{ .SiteURL }}のアカウントを無効化しました。<br>あなたが変更したのでなければ、システム管理者に問い合わせてください。"
   },
   {
     "id": "api.templates.deactivate_body.title",
-    "translation": "Your account has been deactivated at {{ .ServerURL }}"
+    "translation": "{{ .ServerURL }} のあなたのアカウントは無効化されています"
   },
   {
     "id": "api.templates.deactivate_subject",
-    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
+    "translation": "[{{ .SiteName }}] {{ .ServerURL }} のあなたのアカウントは無効化されています"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -3036,7 +3056,7 @@
   },
   {
     "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
+    "translation": "無効化されたアカウントへ電子メールを送信できませんでした"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3088,7 +3108,7 @@
   },
   {
     "id": "api.user.update_active.not_enable.app_error",
-    "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator."
+    "translation": "この機能は有効でないため、あなた自身を無効化することはできません。システム管理者に連絡してください。"
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3928,7 +3948,7 @@
   },
   {
     "id": "app.plugin.set_plugin_status_state.app_error",
-    "translation": "プラスインステータスの状態を設定できませんでした。"
+    "translation": "プラグインステータスの状態を設定できませんでした。"
   },
   {
     "id": "app.plugin.upload_disabled.app_error",
@@ -3939,6 +3959,10 @@
     "translation": "指定された役割は存在しません。"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "要求された移行処理が完了していないため、このAPIエンドポイントにアクセスできません。"
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "このチームは登録ユーザー数の上限に達しました。システム管理者に上限値を上げるよう依頼してください。"
   },
@@ -4360,7 +4384,7 @@
   },
   {
     "id": "ent.ldap.sync.index_job_failed.error",
-    "translation": "同期ジョブが失敗したためにLDAP同期ワーカーが失敗しました"
+    "translation": "同期ジョブが失敗したためLDAP同期ワーカーが失敗しました"
   },
   {
     "id": "ent.ldap.sync_worker.create_index_job.error",
@@ -4607,6 +4631,14 @@
     "translation": "現在のワーキングディレクトリーは%vです"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "不正な進捗データのため移行に失敗しました。"
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "不明な移行キーのため移行ジョブを実行できません。"
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "不正なアクセストークンです"
   },
@@ -4951,6 +4983,10 @@
     "translation": "メッセージ保持期間は１日以上でなくてはなりません。"
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "カスタムURLスキーム {{.Scheme}} は無効です。カスタムURLスキームは文字で始まり、文字、数字、プラス(+)、ピリオド(.)、ハイフン(-)のみが使用できます。"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "ElasticsearchのAggregatePostsAfterDays設定は1以上でなくてはなりません"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "サイトURLにhttp://またはhttps://で始まるURLを設定する必要があります"
+    "translation": "サイトURLを正しく設定してください。URLは http:// または https:// で始まります。"
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "チャンネルが存在しません"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "与えられたスキームにおけるチャンネルを取得できませんでした"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "チャンネル数を取得できませんでした"
   },
@@ -6083,6 +6123,26 @@
     "translation": "あなたについての投稿数を集計できませんでした"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "データベーストランザクションをコミットできませんでした"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "データベーストランザクションを開ませんでした"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "データベーストランザクションをロールバックできませんでした"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "チャンネルメンバーを選択できませんでした"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "チャンネルメンバーを更新できませんでした"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "チャンネルを削除できませんでした"
   },
@@ -6103,6 +6163,10 @@
     "translation": "チャンネルのメンバーを削除できません"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "チャンネルスキームをリセットできませんでした"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "トランザクションをコミットできません"
   },
@@ -6739,6 +6803,10 @@
     "translation": "リアクションを保存できません"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "役割を削除できませんでした"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "役割を取得できませんでした"
   },
@@ -6763,10 +6831,74 @@
     "translation": "役割が不正です。"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "役割が不正です。"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "役割を保存するためのトランザクションを開ませんでした"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "役割を更新できませんでした"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "役割を保存するためのトランザクションをコミットできませんでした"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "このスキームに属する役割を削除できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "一つ以上のチームもしくはチャンネルから使用されているため、スキームを削除できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "スキームを削除できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "スキームを取得できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "スキームを完全に削除できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "このスキームを使用しているすべてのチャンネルをデフォルトのスキームへリセットできませんでした"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "このスキームを使用している全てのチームをデフォルトのスキームへリセットできませんでした"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "スキームを作成できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "与えられたスキームが不正です"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "スキームを保存するためのトランザクションを開ませんでした"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "デフォルトのスキームの役割を抽出できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "スキームを更新できませんでした"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "スキームを保存するためのトランザクションをコミットできませんでした"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "セッション数を取得できませんでした"
   },
@@ -6915,6 +7047,10 @@
     "translation": "チームが保存できませんでした"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "与えられたスキームにおけるチャンネルを取得できませんでした"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "チームのメンバーが取得できませんでした"
   },
@@ -6943,6 +7079,26 @@
     "translation": "チームの未読メッセージを取得できませんでした"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "データベーストランザクションをコミットできませんでした"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "データベーストランザクションを開ませんでした"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "データベーストランザクションをロールバックできませんでした"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " チームメンバーを選択できませんでした"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "チームメンバーを更新できませんでした"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "既存のチームを削除できませんでした"
   },
@@ -6951,6 +7107,10 @@
     "translation": "チャンネルのメンバーを削除できませんでした"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "チームスキームをリセットできませんでした"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "チームが保存できませんでした"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index b790c9945..4fbf54d37 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -412,10 +412,26 @@
     "translation": "기본 채널 {{.Channel}}에 적절하지 않은 갱신을 시도했습니다"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "읽지 않은 메시지 갯수를 가져오지 못했습니다. user_id=%v and channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "클러스터 API 경로 초기화 중"
   },
@@ -824,7 +840,7 @@
   },
   {
     "id": "api.command_invite.private_channel.app_error",
-    "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels."
+    "translation": "{{.Channel}} 채널을 찾을 수 없습니다. 채널을 식별하려면 채널 핸들을 사용하십시오."
   },
   {
     "id": "api.command_invite.success",
@@ -1273,10 +1289,6 @@
     "translation": "%v 이모티콘을 지우는 중에는 리액션을 삭제할 수 없음"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "이모티콘을 삭제할 권한이 없습니다."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "시스템 관리자에 의해 사용자 이모티콘 기능이 비활성화 되어 있습니다."
   },
@@ -1895,6 +1907,18 @@
     "translation": "채널 회원의 프로필 사진을 불러올 수 없습니다. user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "포스트 작성자가 해당 포스트를 게시한 채널에 존재하지 않습니다, 알림을 보내지 않았습니다 post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "신규 메시지"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": "하나 이상의 파일이 업로드 되었습니다."
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " 다이렉트 메시지에 하나 이상의 파일 업로드"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": "하나 이상의 파일 업로드"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": "~에서 메시지 전송~"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": "~에서 메시지 전송"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " 에게 받은 개인 메시지 "
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": "메세지 게시"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": "~에서 게시"
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": "메세지 게시"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "증명서가 정상적으로 저장되지 않았습니다."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "서버를 초기화 중입니다."
   },
@@ -2511,6 +2523,14 @@
     "translation": "작업을 할 수 있는 권한이 없습니다"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "그룹 메세지"
   },
@@ -3939,6 +3959,10 @@
     "translation": "The provided role does not exist"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit."
   },
@@ -4607,6 +4631,14 @@
     "translation": "현재 작업 디렉토리는 %v입니다."
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "잘못된 접근 토큰입니다."
   },
@@ -4951,6 +4983,10 @@
     "translation": "Message retention must be one day or longer."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "사이트 URL은 반드시 올바른 URL이어야 하며, http:// 또는 https://로 시작해야 합니다."
+    "translation": "아이콘 URL은 반드시 올바른 URL이어야 하며, http:// 또는 https://로 시작해야 합니다."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Channel does not exist"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -6083,6 +6123,26 @@
     "translation": "We couldn't increment the mention count"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Failed to update the channel member"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "채널을 삭제하지 못했습니다."
   },
@@ -6103,6 +6163,10 @@
     "translation": "채널을 찾을 수 없습니다"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Unable to commit transaction"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Unable to save reaction"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "내용을 가져올수 없습니다."
   },
@@ -6763,10 +6831,74 @@
     "translation": "The role was not valid"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "The role was not valid"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "내용을 가져올수 없습니다."
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "We could not permanently delete the schemes"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -6915,6 +7047,10 @@
     "translation": "채널을 찾을 수 없습니다"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -6943,6 +7079,26 @@
     "translation": "We couldn't get the teams unread messages"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Failed to update the team member"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
@@ -6951,6 +7107,10 @@
     "translation": "채널을 찾을 수 없습니다"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index b1b6961e9..bbac107af 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -412,10 +412,26 @@
     "translation": "Een ongeldige bijwerkings-poging van het standaard kanaal {{.Channel}} is geprobeerd"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Onmogelijk om het aantal ongelezen bericht op te halen voor user_id=%v en channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Initialisatie van de gebruikers api"
   },
@@ -1273,10 +1289,6 @@
     "translation": "Unable to delete reactions when deleting emoji with emoji name %v"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Onjuiste rechten voor het wissen van emoji"
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Aangepaste emoji zijn uitgeschakeld door de beheerder."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Niet mogelijk om profiel voor kanaal lid op te halen, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "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"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Nieuwe notificatie"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " uploaded one or more files in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " uploaded one or more files in a direct message"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " uploaded one or more files"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " vermeld u in "
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
-    "translation": " vermeld u in "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " stuurde u een direct bericht"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " posted a message."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " geschreven in "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " posted a message"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "Certificaat is niet correct opgeslagen."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Server is aan het initialiseren..."
   },
@@ -2511,6 +2523,14 @@
     "translation": "U beschikt niet over de juiste rechten"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Group Message"
   },
@@ -3939,6 +3959,10 @@
     "translation": "The provided role does not exist"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Het maximaal aantal leden voor dit team is bereikt. Neem contact op met de beheerder voor een hoger limiet."
   },
@@ -4607,6 +4631,14 @@
     "translation": "Huidige werk directory is %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Ongeldig toegangs token"
   },
@@ -4951,6 +4983,10 @@
     "translation": "Message retention must be one day or longer."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "Ongeldige URL. Een geldige URl begint met http:// of https://"
+    "translation": "Ikoon URL moet een geldige URl zijn, die begint met http:// of https://"
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Kanaal bestaat niet"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "We kunnen de kanalen niet tellen"
   },
@@ -6083,6 +6123,26 @@
     "translation": "We kunnen de vermeldingen niet ophogen"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Failed to update the channel member"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Het kanaal kan niet verwijderd worden"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Het kanaal lid kan niet verwijderd worden"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "De transactie kan niet worden vastgelegt"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Unable to save reaction"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Bericht kan niet opgehaald worden"
   },
@@ -6763,10 +6831,74 @@
     "translation": "The role was not valid"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "The role was not valid"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Bericht kan niet opgehaald worden"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "We could not permanently delete the schemes"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Het aantal sessies kan niet geteld worden"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Het bestaande team kan niet gevonden worden"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "We kunnen het teamlid niet ophalen"
   },
@@ -6943,6 +7079,26 @@
     "translation": "We couldn't get the teams unread messages"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Failed to update the team member"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Het team kan niet verwijderd worden"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Het teamlid kan niet verwijderd worden"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Het team kan niet opgeslagen worden"
   },
diff --git a/i18n/pl.json b/i18n/pl.json
index 01f3f47c4..6ae0391ce 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -412,10 +412,26 @@
     "translation": "Próbowano wykonać nieprawidłową aktualizację domyślnego kanału {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Nie można pobrać liczby nieprzeczytanych wiadomości dla użytkownika o id=%v i kanału=%v, błąd=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Inicjowanie klastra tras API"
   },
@@ -1273,10 +1289,6 @@
     "translation": "Nie można usunąć reakcji podczas usuwania emoji o nazwie %v"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Brak uprawnień do usunięcia emoji"
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Niestandardowe emoji zostały wyłączone przez administratora systemu."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Nie można uzyskać profilu dla członka kanału, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "Autor wiadomości nie znajduje się w kanale dla tej wiadomości. Powiadomienie nie zostało wysłane post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Wspomniano o Tobie"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Wyślij jeden albo więcej plików w "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Wysłał jeden lub więcej plików w bezpośredniej wiadomości"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " Wyślij jeden albo więcej plików w "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": "w"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " wspomniał o Tobie w "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": "wspomniał cię"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": "  wysłał Ci bezpośrednią wiadomość"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " wysłał wiadomość"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": "opublikował w"
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " wysłał wiadomość"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "Certyfikat nie zapisał się poprawnie."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Inicjalizowanie serwera..."
   },
@@ -2511,6 +2523,14 @@
     "translation": "Brak wymaganych uprawnień"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Wiadomość grupowa"
   },
@@ -3939,6 +3959,10 @@
     "translation": "The provided role does not exist"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Ten zespół osiągnął limit kont. Skontaktuj się z administratorem aby ustanowić wyższy pułap."
   },
@@ -4607,6 +4631,14 @@
     "translation": "Bieżący katalog roboczy to %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Nieprawidłowy token dostępu"
   },
@@ -4951,6 +4983,10 @@
     "translation": "Message retention must be one day or longer."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "Adres URL strony musi być prawidłowy i zaczynać się od http:// lub https://"
+    "translation": "URL ikony musi być prawidłowym URL i zaczynać się od http:// lub https://."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Kanał nie istnieje"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "Nie mogliśmy pobrać liczby kanałów"
   },
@@ -6083,6 +6123,26 @@
     "translation": "Nie mogliśmy zwiększyć wspomnianego licznika"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Nie udało się zaktualizować tytułu bezpośredniego kanału"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Nie mogliśmy usunąć kanału"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Nie mogliśmy usunąć uczestnika kanału"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Nie można zatwierdzić transakcji"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Nie udało się zapisać reakcji"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Nie można pobrać wiadomości"
   },
@@ -6763,10 +6831,74 @@
     "translation": "The role was not valid"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "The role was not valid"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Nie można pobrać wiadomości"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "We could not permanently delete the schemes"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Nie udało się policzyć sesji"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Nie mogliśmy znaleźć istniejącego zespołu"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "Nie udało się pobrać danych członka zespołu"
   },
@@ -6943,6 +7079,26 @@
     "translation": "Nie można pobrać nieprzeczytanych wiadomości zespołu"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Nie udało się zaktualizować tytułu bezpośredniego kanału"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Nie można usunąć istniejącego zespołu"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Nie można usunąć członka zespołu"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Nie można zapisać zespołu"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 53725c4a2..75a578d1c 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -412,10 +412,26 @@
     "translation": "Tentou executar uma atualização inválida para o canal padrão {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Não foi possível obter o número de não lidos para o user_id=%v e channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Inicializando as rotas de API de cluster"
   },
@@ -1273,10 +1289,6 @@
     "translation": "Não é possível excluir as reações ao excluir o emoji com nome %v"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Permissões inadequadas para deletar emoji."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Emoji personalizado foi desabilitados pelo o administrador do sistema."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Não foi possível obter o perfil do membro do canal, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "O criador da postagem não está no canal onde a postagem foi criada post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Nova Menção"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " enviado um ou mais arquivos em "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " enviado um ou mais arquivos em uma mensagem direta"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " enviado um ou mais arquivos"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " em "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " você foi mencionado no "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " mencionou você"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " enviado a você uma mensagem direta"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " postou uma mensagem"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " postado em "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " postou uma mensagem"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "O certificado não foi salvo corretamente."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "O servidor está inicializando..."
   },
@@ -2511,6 +2523,14 @@
     "translation": "Você não tem a permissão apropriada"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Grupo de mensagem"
   },
@@ -3939,6 +3959,10 @@
     "translation": "A função fornecida não existe"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Esta equipe alcançou o número máximo de contas permitidas. Contate o administrador do sistema para ajustar um limite maior."
   },
@@ -4607,6 +4631,14 @@
     "translation": "Diretório atual é %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Token de acesso inválido"
   },
@@ -4951,6 +4983,10 @@
     "translation": "Retenção de mensagens deve ser pelo menos um dia ou mais."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays a configuração deve ser um número maior ou igual a 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "Site URL deve ser uma URL válida e começar com http:// ou https://"
+    "translation": "URL do ícone deve ser uma URL válida e começar com http:// ou https://."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Canal não existe"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "Não foi possível obter o número de canais"
   },
@@ -6083,6 +6123,26 @@
     "translation": "Não foi possível incrementar o número de menções"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Falha ao atualizar o cabeçalho do canal direto"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Não foi possível excluir o canal"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Não foi possível remover o membro do canal"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Não é possível confirmar a transação"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Não é possível salvar a reação"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Não foi possível obter a função"
   },
@@ -6763,10 +6831,74 @@
     "translation": "A função não é válida"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "A função não é válida"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Não foi possível atualizar a função"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "Não podemos apagar permanentemente todas as funções"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Não foi possível contar a sessão"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Não foi possível encontrar a equipe existente"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "Não foi possível obter os membros da equipe"
   },
@@ -6943,6 +7079,26 @@
     "translation": "Não foi possível obter as mensagens não lidas da equipe"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Falha ao atualizar o cabeçalho do canal direto"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Não foi possível deletar a equipe existente"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Não foi possível remover o membro da equipe"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Não foi possível salvar a equipe"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 6d3570b9d..f20ec2c3f 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -412,10 +412,26 @@
     "translation": "Попытка выполнения недопустимого обновления канала по умолчанию {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "License does not support updating a channel's scheme"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the channel because the supplied scheme is not a channel scheme."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "Невозможно получить количество непрочитанных сообщений для пользователя user_id=%v и канала channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Инициализация маршрутов кластерного API"
   },
@@ -1273,10 +1289,6 @@
     "translation": "Не удалось удалить реакции при удалении эмодзи с именем %v"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Отсутствуют права на удаление эмодзи."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Дополнительные эмодзи были отключены системным администратором."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Невозможно получить профиль участников канала, user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " notified the channel."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "Создатель сообщения отсутствует в канале, уведомление не отправлено post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Новое упоминание"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " Загружено один или несколько файлов в "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " Загружены один или несколько файлов для текущего сообщения"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " Загружено один или несколько файлов в "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " в "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " упомянул вас в "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " упомянул вас"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " отправил вам личное сообщение"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " отправил сообщение"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " опубликовано в "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " attached a file."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " отправил сообщение"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "sent you a message."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "Сертификат не сохранен корректно."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Unable to get the channels for scheme because the supplied scheme is not a channel scheme."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Unable to get the teams for scheme because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Инициализация сервера..."
   },
@@ -2511,6 +2523,14 @@
     "translation": "У Вас нет соответствующих разрешений"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "License does not support updating a team's scheme"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Unable to set the scheme to the team because the supplied scheme is not a team scheme."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Групповые сообщения"
   },
@@ -3939,6 +3959,10 @@
     "translation": "The provided role does not exist"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Эта команда достигла максимального количества разрешенных учетных записей. Свяжитесь с системным администратором для установки большего предела."
   },
@@ -4607,6 +4631,14 @@
     "translation": "Текущий рабочий каталог %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "Migration failed due to invalid progress data."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Недопустимый маркер доступа"
   },
@@ -4951,6 +4983,10 @@
     "translation": "Message retention must be one day or longer."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "URL сайта должен быть корректным и начинаться с http:// или https://"
+    "translation": "Адрес иконки должен быть корректным URL-адресом и начинаться с http:// или https://."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Канал не существует"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "Не удалось получить счетчики канала"
   },
@@ -6083,6 +6123,26 @@
     "translation": "Не удалось увеличить счетчик упоминаний"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Не удалось обновить заголовок канала"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Не удалось удалить канал"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Безуспешная попытка удалить участника канала"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "We could not reset the channel schemes"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "Не удалось зафиксировать транзакцию"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Не удалось сохранить реакцию"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Unable to delete the role"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Не удалось получить post"
   },
@@ -6763,10 +6831,74 @@
     "translation": "The role was not valid"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "The role was not valid"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Не удалось получить post"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Unable to delete the roles belonging to this scheme"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "Unable to delete the scheme as it in use by 1 or more teams or channels"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Unable to delete the scheme"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Unable to get the scheme"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "We could not permanently delete the schemes"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Unable to reset all channels using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Unable to reset all teams using this scheme to the default scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Unable to create the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "The provided scheme is invalid"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Unable to retrieve the default scheme roles"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Unable to update the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Не удалось подсчитать сессии"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Не удалось найти существующую команду"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Unable to get the channels for the provided scheme"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "Не удалось получить участника команды"
   },
@@ -6943,6 +7079,26 @@
     "translation": "Не удалось получить список непрочтённых сообщений для команды"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Failed to commit the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Failed to open the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Failed to roll back the database transaction"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Не удалось обновить заголовок канала"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Неудачная попытка удалить существующую команду"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Мы не можем удалить участника команды"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "We could not reset the team schemes"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Не удалось сохранить команду"
   },
diff --git a/i18n/tr.json b/i18n/tr.json
index c6b52ab8c..4a57ba193 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -412,10 +412,26 @@
     "translation": "{{.Channel}} varsayılan kanalı için geçersiz bir güncelleme denendi"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "Belirtilen rol bir şema tarafından yönetildiğinden doğrudan bir kanal üyesine uygulanamaz"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "Bu lisans sürümünde kanal şemalarını güncelleme özelliği bulunmuyor"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "Belirtilen şema bir kanal şeması olmadığından kanal şeması ayarlanamadı."
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "%v kullanıcı kodu ve %v kanal kodu için okunmamış ileti sayısı alınamadı. Hata: %v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "Belirtilen rol bir şema tarafından yönetildiğinden doğrudan bir takım üyesine uygulanamaz"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "Küme API rotaları hazırlanıyor"
   },
@@ -1273,10 +1289,6 @@
     "translation": "%v emoji adı için emoji silinirken tepkiler silinemedi"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Emoji silmek için izinleriniz yeterli değil."
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "Özel emoji özelliği sistem yöneticisi tarafından devre dışı bırakılmış."
   },
@@ -1895,6 +1907,18 @@
     "translation": "Kanal üyesinin profili alınamadı. Kullanıcı Kodu: %v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " kanala bildirim gönderdi."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " iletinize yorum yaptı."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " katıldığınız bir konuya yorum yaptı."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "İletiyi oluşturan ileti için kanalda olmadığından bildirim gönderilmedi. İleti Kodu: %v, Kanal Kodu: %v, Kullanıcı Kodu: %v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "Yeni Anma"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " şuraya bir ya da bir kaç dosya yükledi "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " bir doğrudan ileti içine bir ya da bir kaç dosya yükledi"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " bir ya da bir kaç dosya yükledi "
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
+    "translation": " sizi andı."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " içinde "
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " bir ileti gönderdi."
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " sizi şurada andı "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
-    "translation": " sizi andı "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " bir dosya ekledi."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " size doğrudan ileti gönderdi"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " şuraya gönderildi "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " bir ileti gönderdi"
+    "translation": "size bir ileti gönderdi."
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "Sertifika doğru şekilde kaydedilemedi."
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "Belirtilen şema bir kanal şeması olmadığından, şemanın uygulanabileceği kanallar alınamadı."
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "Belirtilen şema bir takım şeması olmadığından, şemanın uygulanabileceği takımlar alınamadı."
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "Sunucu hazırlanıyor..."
   },
@@ -2511,20 +2523,28 @@
     "translation": "İzinleriniz yeterli değil"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "Bu lisans sürümünde takım şemalarını güncelleme özelliği bulunmuyor"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "Belirtilen şema bir takım şeması olmadığından takım şeması ayarlanamadı."
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "Grup İletisi"
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "{{ .SiteURL }} üzerindeki hesabınızı devre dışı bıraktınız.<br>Bu işlemi siz yapmadıysanız ya da hesabınızı yeniden etkinleştirmek istiyorsanız, sistem yöneticisi ile görüşün."
   },
   {
     "id": "api.templates.deactivate_body.title",
-    "translation": "Your account has been deactivated at {{ .ServerURL }}"
+    "translation": "{{ .ServerURL }} üzerindeki hesabınız devre dışı bırakıldı"
   },
   {
     "id": "api.templates.deactivate_subject",
-    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
+    "translation": "[{{ .SiteName }}] {{ .ServerURL }} üzerindeki hesabınız devre dışı bırakıldı"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -3036,7 +3056,7 @@
   },
   {
     "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
+    "translation": "Hesabı devre dışı bırakma bildirimi e-postası gönderilemedi"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3088,7 +3108,7 @@
   },
   {
     "id": "api.user.update_active.not_enable.app_error",
-    "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator."
+    "translation": "Bu özellik etkinleştirilmemiş olduğundan kendi hesabınızı devre dışı bırakamazsınız. Lütfen sistem yöneticisi ile görüşün."
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3939,6 +3959,10 @@
     "translation": "Belirtilen rol bulunamadı"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "API bağlantı noktasına erişilemediğinden istenilen aktarımlar yapılamadı."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "Bu takım izin verilen en fazla hesap sayısına ulaşmış. Sınırı yükseltmesi için sistem yöneticinizle görüşün."
   },
@@ -4607,6 +4631,14 @@
     "translation": "Geçerli çalışma klasörü: %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "İşlenen verilerin geçersiz olması nedeniyle aktarım tamamlanamadı."
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Aktarım anahtarı bilinmediğinden aktarım görevi çalıştırılamadı."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "Erişim kodu geçersiz"
   },
@@ -4951,6 +4983,10 @@
     "translation": "İleti saklama değeri bir ya da daha fazla gün olmalıdır."
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "{{.Scheme}} özel adres biçimi geçersiz. Özel adres biçimleri bir harf ile başlamalı ve yalnız harf, rakam artı (+), nokta (.) ve tire (-) karakterlerini içermelidir."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch toplayıcı AggregatePostsAfterDays ayarının değeri 1 ya da daha büyük bir sayı olmalıdır"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "Site adresi http:// ya da https:// ile başlayan geçerli bir adres olmalıdır"
+    "translation": "Site adresi http:// yada https:// ile başlayan geçerli bir adres olmalıdır."
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "Kanal bulunamadı"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "Belirtilen şemanın uygulanabileceği kanallar alınamadı"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "Kanal sayıları alınamadı"
   },
@@ -6083,6 +6123,26 @@
     "translation": "Anma sayısı arttırılamadı"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "Veritabanı hareketi işlenemedi"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "Veritabanı hareketi açılamadı"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "Veritabanı hareketi geri alınamadı"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Kanal üyeleri topluluğu seçilemedi"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "Kanal üyesi güncellenemedi"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "Kanal silinemedi"
   },
@@ -6103,6 +6163,10 @@
     "translation": "Üye kanaldan çıkarılamadı"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "Kanal şemaları sıfırlanamadı"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "İşlem tamamlanamadı"
   },
@@ -6739,6 +6803,10 @@
     "translation": "Tepki kaydedilemedi"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "Rol silinemedi"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "Rol alınamadı"
   },
@@ -6763,10 +6831,74 @@
     "translation": "Rol geçersiz"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "Rol geçersiz"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Rolü kaydedecek hareket açılamadı"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "Rol güncellenemedi"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Rolü kaydedecek hareket işlenemedi"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "Bu şemaya ait roller silinemedi"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "1 ya da daha fazla takım ya da kanal tarafından kullanılmakta olduğundan bu şema silinemedi"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "Şema silinemedi"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "Şema alınamadı"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "Şemalar kalıcı olarak silinemedi"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "Bu şemayı kullanan tüm kanallara varsayılan tema atanamadı"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "Bu şemayı kullanan tüm takımlara varsayılan tema atanamadı"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "Şema oluşturulamadı"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "Belirtilen şema geçersiz"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Şemayı kaydedecek hareket açılamadı"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "Varsayılan şema rolleri alınamadı"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "Şema güncellenemedi"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Şemayı kaydedecek hareket işlenemedi"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "Oturumlar sayılamadı"
   },
@@ -6915,6 +7047,10 @@
     "translation": "Var olan takım bulunamadı"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "Belirtilen şemanın uygulanabileceği kanallar alınamadı"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "Takım üyesi alınamadı"
   },
@@ -6943,6 +7079,26 @@
     "translation": "Takımların okunmamış iletileri alınamadı"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "Veritabanı hareketi işlenemedi"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "Veritabanı hareketi açılamadı"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "Veritabanı hareketi geri alınamadı"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Takım üyeleri topluluğu seçilemedi"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "Takım üyesi güncellenemedi"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "Var olan takım silinemedi"
   },
@@ -6951,6 +7107,10 @@
     "translation": "Üye takımdan çıkarılamadı"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "Takım şemaları sıfırlanamadı"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "Takım kaydedilemedi"
   },
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 6c90253a4..172f1bcf7 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -412,10 +412,26 @@
     "translation": "对默认频道试图执行一个无效的更新 {{.Channel}}"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "许可证不支持更新团队方案"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "无法设定频道方案因为提供的方案不是频道方案。"
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "无法获取未读数量：user_id=%v, channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Team Member"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "正在初始化机群 API 路由"
   },
@@ -1273,10 +1289,6 @@
     "translation": "无法删除表情符 %v 时删除互动"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "无效删除表情符权限。"
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "自定义表情符号已被系统管理员禁用。"
   },
@@ -1895,6 +1907,18 @@
     "translation": "无法获取频道成员个人资料，user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " 通知了频道。"
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " commented on your post."
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " commented on a thread you participated in."
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "消息创建者不在频道中，未发送推送 post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "新的提及"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": " 已上传一个或更多个文件在 "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": " 在私信里上传一个或更多个文件"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": " 已上传一个或更多个文件"
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
+    "translation": " 提及了您。"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " 在 "
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " 发布了消息。"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " 提到你在 "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
-    "translation": " 提及您 "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " 附加了文件。"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " 发送给你一个私信"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": "发布在"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " 发布消息"
+    "translation": "给您发送了消息。"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "证书没有正确保存。"
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "无法获取方案的频道因为提供的方案不是频道方案。"
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "无法获取方案的团队因为提供的方案不是团队方案。"
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "服务正在初始化..."
   },
@@ -2511,6 +2523,14 @@
     "translation": "您没有对应的权限"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "许可证不支持更新团队方案"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "无法设定团队方案因为提供的方案不是团队方案。"
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "团体消息"
   },
@@ -2520,11 +2540,11 @@
   },
   {
     "id": "api.templates.deactivate_body.title",
-    "translation": "Your account has been deactivated at {{ .ServerURL }}"
+    "translation": "您的帐号已在 {{ .ServerURL }} 注销"
   },
   {
     "id": "api.templates.deactivate_subject",
-    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
+    "translation": "[{{ .SiteName }}] 您的帐号已在 {{ .ServerURL }} 注销"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -3036,7 +3056,7 @@
   },
   {
     "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
+    "translation": "无法发送帐号注销邮件"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3088,7 +3108,7 @@
   },
   {
     "id": "api.user.update_active.not_enable.app_error",
-    "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator."
+    "translation": "您不能注销自己因为此功能未开启。请联系您的系统管理员。"
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3939,6 +3959,10 @@
     "translation": "提供的角色不存在"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "This API endpoint is not accessible as required migrations have not yet completed."
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "这个团队已经达到允许的最大帐号数量。请与系统管理员联系以设置更高的限制。"
   },
@@ -4607,6 +4631,14 @@
     "translation": "当前工作目录是 %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "迁移因无效进度数据失败。"
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "Cannot run migration job due to unknown migration key."
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "无效的访问令牌"
   },
@@ -4951,6 +4983,10 @@
     "translation": "消息保留至少一天。"
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays 设定必须为大于或等于 1 的数字"
   },
@@ -5260,7 +5296,7 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "站点网址必须为有效的 URL 并以 http:// 或 https:// 开头"
+    "translation": "网址必须为有效 URL 并且以 http:// 或 https:// 开头"
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "频道不存在"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "无法用提供的方案获取频道"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "我们无法获取频道数"
   },
@@ -6083,6 +6123,26 @@
     "translation": "我们不能增加提及数"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "无法提交数据库事务"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "打开数据库事务失败。"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "打开数据库事务失败。"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "Failed to select the batch of channel members"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "无法更新频道成员"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "我们无法删除这个频道"
   },
@@ -6103,6 +6163,10 @@
     "translation": "我们无法删除频道成员"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "我们无法重置频道方案"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "不能提交事务"
   },
@@ -6739,6 +6803,10 @@
     "translation": "无法保存互动"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "无法删除角色"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "无法获取角色"
   },
@@ -6763,10 +6831,74 @@
     "translation": "无效的角色"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "无效的角色"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the role"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "无法更新角色"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the role"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "无法删除此方案的角色"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "无法删除此方案因为正被团队或频道使用。"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "无法删除方案"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "无法获取方案"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "我们无法永久删除方案"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "无法将此方案做为默认方案重置到所有频道"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "无法将此方案做为默认方案重置到所有团队"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "无法创建方案"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "无效的方案"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "Failed to open the transaction to save the scheme"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "无法获取默认方案角色"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "无法更新方案"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "Failed to commit the transaction to save the scheme"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "我们无法计算会话数量"
   },
@@ -6915,6 +7047,10 @@
     "translation": "我们无法查找这个存在的团队"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "无法用提供的方案获取频道"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "我们无法获得频道成员"
   },
@@ -6943,6 +7079,26 @@
     "translation": "我们无法获取团队未读消息"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "提交数据库事务失败"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "无法打开数据库事务"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "打开数据库事务失败。"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " Failed to select the batch of team members"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "无法更新团队成员"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "我们不能删除现有的团队"
   },
@@ -6951,6 +7107,10 @@
     "translation": "我们无法删除频道成员"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "我们无法重置团队方案"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "我们无法保存团队"
   },
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index ad4259e65..e1578540a 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -277,11 +277,11 @@
   },
   {
     "id": "api.channel.delete_channel.incoming_webhook.error",
-    "translation": "刪除傳入的 Webhook 遇到錯誤 id=%v"
+    "translation": "刪除內送 Webhook 遇到錯誤 id=%v"
   },
   {
     "id": "api.channel.delete_channel.outgoing_webhook.error",
-    "translation": "刪除傳出的 Webhook 遇到錯誤 id=%v"
+    "translation": "刪除外寄 Webhook 遇到錯誤 id=%v"
   },
   {
     "id": "api.channel.delete_channel.permissions.app_error",
@@ -412,10 +412,26 @@
     "translation": "已對預設頻道 {{.Channel}} 嘗試執行無效的更新"
   },
   {
+    "id": "api.channel.update_channel_member_roles.scheme_role.app_error",
+    "translation": "提供的角色受配置管理，無法直接套用於頻道成員"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.license.error",
+    "translation": "授權不支援更新頻道的配置"
+  },
+  {
+    "id": "api.channel.update_channel_scheme.scheme_scope.error",
+    "translation": "由於提供的配置不是頻道配置，無法設定頻道配置。"
+  },
+  {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error",
     "translation": "無法取得未讀訊息數量：user_id=%v, channel_id=%v, err=%v"
   },
   {
+    "id": "api.channel.update_team_member_roles.scheme_role.app_error",
+    "translation": "提供的角色受配置管理，無法直接套用於團隊成員"
+  },
+  {
     "id": "api.cluster.init.debug",
     "translation": "正在初始化叢集 API 路徑"
   },
@@ -824,7 +840,7 @@
   },
   {
     "id": "api.command_invite.private_channel.app_error",
-    "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels."
+    "translation": "找不到頻道 {{.Channel}}。請用頻道識別以識別頻道。"
   },
   {
     "id": "api.command_invite.success",
@@ -1273,10 +1289,6 @@
     "translation": "刪除名為 %v 的繪文字時無法刪除互動"
   },
   {
-    "id": "api.emoji.delete.permissions.app_error",
-    "translation": "沒有適當的權限刪除繪文字。"
-  },
-  {
     "id": "api.emoji.disabled.app_error",
     "translation": "自訂繪文字已被系統管理員停用。"
   },
@@ -1542,7 +1554,7 @@
   },
   {
     "id": "api.incoming_webhook.disabled.app_error",
-    "translation": "傳入的 Webhook 已被系統管理員停用。"
+    "translation": "內送 Webhook 已被系統管理員停用。"
   },
   {
     "id": "api.incoming_webhook.invalid_username.app_error",
@@ -1895,6 +1907,18 @@
     "translation": "無法取得頻道成員資訊 user_id=%v"
   },
   {
+    "id": "api.post.send_notification_and_forget.push_channel_mention",
+    "translation": " 頻道已通知。"
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_post",
+    "translation": " 已在您的訊息上註記。"
+  },
+  {
+    "id": "api.post.send_notification_and_forget.push_comment_on_thread",
+    "translation": " 已在您參與的討論串註記。"
+  },
+  {
     "id": "api.post.send_notifications.user_id.debug",
     "translation": "此訊息的發起人不在頻道，將不發送通知 post_id=%v channel_id=%v user_id=%v"
   },
@@ -1915,40 +1939,20 @@
     "translation": "新的提及"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_image_only",
-    "translation": "已上傳一個或更多檔案至"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_dm",
-    "translation": "在直接傳訊中已上傳一個或更多檔案"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_image_only_no_channel",
-    "translation": "已上傳一個或更多檔案"
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " 於 "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " 提及您於 "
-  },
-  {
-    "id": "api.post.send_notifications_and_forget.push_mention_no_channel",
+    "id": "api.post.send_notifications_and_forget.push_explicit_mention",
     "translation": " 提及您 "
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " 已傳送直接訊息給您"
+    "id": "api.post.send_notifications_and_forget.push_general_message",
+    "translation": " 發布了訊息"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " 張貼於 "
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " 檔案已附加。"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention_no_channel",
-    "translation": " 發布了訊息"
+    "id": "api.post.send_notifications_and_forget.push_message",
+    "translation": "送出一個訊息給您"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
@@ -2047,6 +2051,14 @@
     "translation": "憑證沒有正確的儲存。"
   },
   {
+    "id": "api.scheme.get_channels_for_scheme.scope.error",
+    "translation": "由於提供的配置不是頻道配置，無法取得配置的頻道。"
+  },
+  {
+    "id": "api.scheme.get_teams_for_scheme.scope.error",
+    "translation": "由於提供的配置不是團隊配置，無法取得配置的團隊。"
+  },
+  {
     "id": "api.server.new_server.init.info",
     "translation": "伺服器正在初始化..."
   },
@@ -2511,20 +2523,28 @@
     "translation": "您沒有適當的權限"
   },
   {
+    "id": "api.team.update_team_scheme.license.error",
+    "translation": "授權不支援更新團隊的配置"
+  },
+  {
+    "id": "api.team.update_team_scheme.scheme_scope.error",
+    "translation": "由於提供的配置不是團隊配置，無法設定團隊配置。"
+  },
+  {
     "id": "api.templates.channel_name.group",
     "translation": "群組訊息"
   },
   {
     "id": "api.templates.deactivate_body.info",
-    "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator."
+    "translation": "您在 {{.SiteURL}} 的帳號已被您所停用。<br>如果此變更不是由您所發起或是想要重新啟用帳號，請聯絡系統管理員。"
   },
   {
     "id": "api.templates.deactivate_body.title",
-    "translation": "Your account has been deactivated at {{ .ServerURL }}"
+    "translation": "您在 {{.ServerURL }} 的帳號已被停用"
   },
   {
     "id": "api.templates.deactivate_subject",
-    "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated"
+    "translation": "[{{ .SiteName }}] 您在 {{.ServerURL }} 的帳號已被停用"
   },
   {
     "id": "api.templates.email_change_body.info",
@@ -3036,7 +3056,7 @@
   },
   {
     "id": "api.user.send_deactivate_email_and_forget.failed.error",
-    "translation": "Failed to send the deactivate account email successfully"
+    "translation": "發送停用帳號郵件時失敗"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3088,7 +3108,7 @@
   },
   {
     "id": "api.user.update_active.not_enable.app_error",
-    "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator."
+    "translation": "由於此功能沒有啟用，無法停用您的帳號。請聯絡系統管理員。"
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3224,19 +3244,19 @@
   },
   {
     "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "傳出的 Webhook 已被系統管理員停用。"
+    "translation": "外寄 Webhook 已被系統管理員停用。"
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "同一頻道的傳出的 Webhook 不可以使用相同的觸發關鍵字/回呼網址。"
+    "translation": "同一頻道的外寄 Webhook 不可以使用相同的觸發關鍵字/回呼網址。"
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
-    "translation": "只有公開頻道可以建立傳出的 Webhook。"
+    "translation": "只有公開頻道可以建立外寄 Webhook。"
   },
   {
     "id": "api.webhook.create_outgoing.permissions.app_error",
-    "translation": "沒有適當的權限建立傳出的 Webhook。"
+    "translation": "沒有適當的權限建立外寄 Webhook。"
   },
   {
     "id": "api.webhook.create_outgoing.triggers.app_error",
@@ -3244,31 +3264,31 @@
   },
   {
     "id": "api.webhook.delete_incoming.disabled.app_error",
-    "translation": "傳入的 Webhook 已被系統管理員停用。"
+    "translation": "內送 Webhook 已被系統管理員停用。"
   },
   {
     "id": "api.webhook.delete_incoming.permissions.app_error",
-    "translation": "沒有權限刪除傳入的 Webhook"
+    "translation": "沒有權限刪除內送 Webhook"
   },
   {
     "id": "api.webhook.delete_outgoing.disabled.app_error",
-    "translation": "傳出的 Webhook 已被系統管理員停用"
+    "translation": "外寄 Webhook 已被系統管理員停用"
   },
   {
     "id": "api.webhook.delete_outgoing.permissions.app_error",
-    "translation": "沒有適當的權限刪除傳出的 Webhook"
+    "translation": "沒有適當的權限刪除外寄 Webhook"
   },
   {
     "id": "api.webhook.incoming.debug",
-    "translation": "收到傳入的 Webhook。內容="
+    "translation": "收到內送 Webhook。內容="
   },
   {
     "id": "api.webhook.incoming.debug.error",
-    "translation": "無法讀取傳入的 Webhook 的內容。"
+    "translation": "無法讀取內送 Webhook 的內容。"
   },
   {
     "id": "api.webhook.incoming.error",
-    "translation": "無法解碼 Incoming Webhook 的 multipart 內容。"
+    "translation": "無法解碼內送 Webhook 的 multipart 內容。"
   },
   {
     "id": "api.webhook.init.debug",
@@ -3276,7 +3296,7 @@
   },
   {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
-    "translation": "沒有適當的權限重新產生傳出的 Webhook Token"
+    "translation": "沒有適當的權限重新產生外寄 Webhook Token"
   },
   {
     "id": "api.webhook.team_mismatch.app_error",
@@ -3284,27 +3304,27 @@
   },
   {
     "id": "api.webhook.update_incoming.disabled.app_error",
-    "translation": "傳入的 Webhook 已被系統管理員停用。"
+    "translation": "內送 Webhook 已被系統管理員停用。"
   },
   {
     "id": "api.webhook.update_incoming.permissions.app_error",
-    "translation": "沒有適當的權限更新傳入的 Webhook"
+    "translation": "沒有適當的權限更新內送 Webhook"
   },
   {
     "id": "api.webhook.update_outgoing.disabled.app_error",
-    "translation": "傳出的 Webhook 已被系統管理員停用。"
+    "translation": "外寄 Webhook 已被系統管理員停用。"
   },
   {
     "id": "api.webhook.update_outgoing.intersect.app_error",
-    "translation": "同一頻道的傳出的 Webhook 不可以使用相同的觸發關鍵字/回呼網址。"
+    "translation": "同一頻道的外寄 Webhook 不可以使用相同的觸發關鍵字/回呼網址。"
   },
   {
     "id": "api.webhook.update_outgoing.not_open.app_error",
-    "translation": "只有公開頻道可以更新傳出的 Webhook。"
+    "translation": "只有公開頻道可以更新外寄 Webhook。"
   },
   {
     "id": "api.webhook.update_outgoing.permissions.app_error",
-    "translation": "沒有適當的權限更新傳出的 Webhook。"
+    "translation": "沒有適當的權限更新外寄 Webhook。"
   },
   {
     "id": "api.webhook.update_outgoing.triggers.app_error",
@@ -3796,15 +3816,15 @@
   },
   {
     "id": "app.notification.body.intro.direct.generic",
-    "translation": "您有 1 筆新的直接傳訊，來自{{.SenderName}}。"
+    "translation": "您有 1 筆新的直接傳訊，來自@{{.SenderName}}。"
   },
   {
     "id": "app.notification.body.intro.group_message.full",
-    "translation": "您有 1 筆新的直接傳訊。"
+    "translation": "您有 1 筆新的群組訊息。"
   },
   {
     "id": "app.notification.body.intro.group_message.generic",
-    "translation": "您有 1 筆新的直接傳訊，來自{{.SenderName}}。"
+    "translation": "您有 1 筆新的群組訊息，來自@{{.SenderName}}。"
   },
   {
     "id": "app.notification.body.intro.notification.full",
@@ -3812,11 +3832,11 @@
   },
   {
     "id": "app.notification.body.intro.notification.generic",
-    "translation": "您有一筆新通知，來自 {{.SenderName}}。"
+    "translation": "您有一筆新通知，來自 @{{.SenderName}}。"
   },
   {
     "id": "app.notification.body.text.direct.full",
-    "translation": "{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+    "translation": "@{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
   },
   {
     "id": "app.notification.body.text.direct.generic",
@@ -3824,7 +3844,7 @@
   },
   {
     "id": "app.notification.body.text.group_message.full",
-    "translation": "頻道：{{.ChannelName}}<br>{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+    "translation": "頻道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
   },
   {
     "id": "app.notification.body.text.group_message.generic",
@@ -3832,7 +3852,7 @@
   },
   {
     "id": "app.notification.body.text.notification.full",
-    "translation": "頻道：{{.ChannelName}}<br>{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+    "translation": "頻道：{{.ChannelName}}<br>@{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
   },
   {
     "id": "app.notification.body.text.notification.generic",
@@ -3840,15 +3860,15 @@
   },
   {
     "id": "app.notification.subject.direct.full",
-    "translation": "[{{.SiteName}}] 來自 {{.SenderDisplayName}} 的直接傳訊，發於 {{.Year}} {{.Month}} {{.Day}}"
+    "translation": "[{{.SiteName}}] 來自 @{{.SenderDisplayName}} 的新直接傳訊，發於 {{.Year}} {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.subject.group_message.full",
-    "translation": "[{{.SiteName}}] 來自 {{.TeamName}} 的通知，發於 {{.Year}} {{.Month}} {{.Day}}"
+    "translation": "[{{.SiteName}}] {{.ChannelName}} 的新群組訊息，發於 {{.Year}} {{.Month}} {{.Day}}"
   },
   {
     "id": "app.notification.subject.group_message.generic",
-    "translation": "[{{.SiteName}}] {{.Year}} {{.Month}} {{.Day}} 的新通知[{{.SiteName}}] {{.Year}} {{.Month}} {{.Day}} 的新通知"
+    "translation": "[{{.SiteName}}] 發於 {{.Year}} {{.Month}} {{.Day}} 的新群組訊息"
   },
   {
     "id": "app.notification.subject.notification.full",
@@ -3872,7 +3892,7 @@
   },
   {
     "id": "app.plugin.delete_plugin_status_state.app_error",
-    "translation": "Unable to delete plugin status state."
+    "translation": "無法刪除模組狀態。"
   },
   {
     "id": "app.plugin.disabled.app_error",
@@ -3920,7 +3940,7 @@
   },
   {
     "id": "app.plugin.prepackaged.app_error",
-    "translation": "Cannot install prepackaged plugin"
+    "translation": "無法安裝預先包裝好的模組"
   },
   {
     "id": "app.plugin.remove.app_error",
@@ -3928,7 +3948,7 @@
   },
   {
     "id": "app.plugin.set_plugin_status_state.app_error",
-    "translation": "Unable to set plugin status state."
+    "translation": "無法設定模組狀態。"
   },
   {
     "id": "app.plugin.upload_disabled.app_error",
@@ -3939,6 +3959,10 @@
     "translation": "提供的角色不存在"
   },
   {
+    "id": "app.schemes.is_phase_2_migration_completed.not_completed.app_error",
+    "translation": "必須執行的資料移轉尚未完成，無法存取此 API 端點。"
+  },
+  {
     "id": "app.team.join_user_to_team.max_accounts.app_error",
     "translation": "此團隊已達最大使用者數量上限。請聯絡系統管理員調大數量限制。"
   },
@@ -4607,6 +4631,14 @@
     "translation": "目前的工作目錄為 %v"
   },
   {
+    "id": "migrations.worker.run_advanced_permissions_phase_2_migration.invalid_progress",
+    "translation": "由於無效的進度資料，移轉失敗"
+  },
+  {
+    "id": "migrations.worker.run_migration.unknown_key",
+    "translation": "由於未知的移轉索引碼，無法執行移轉工作。"
+  },
+  {
     "id": "model.access.is_valid.access_token.app_error",
     "translation": "無效的存取 Token"
   },
@@ -4951,6 +4983,10 @@
     "translation": "訊息保留需至少一天。"
   },
   {
+    "id": "model.config.is_valid.display.custom_url_schemes.app_error",
+    "translation": "自訂網址配置 {{.Scheme}} 無效。自訂網址配置必須以字母起始且只帶有字母、數字、\"+\"、\".\"跟\"-\"。"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch 設定 AggregatePostsAfterDays 必須為大於或等於 1 的數字"
   },
@@ -5084,7 +5120,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_login_id",
-    "translation": "AD/LDAP 欄位 \"ID 的屬性\" 為必須欄位。"
+    "translation": "AD/LDAP 欄位 \"登入 ID 的屬性\" 為必須欄位。"
   },
   {
     "id": "model.config.is_valid.ldap_max_page_size.app_error",
@@ -6007,6 +6043,10 @@
     "translation": "頻道不存在"
   },
   {
+    "id": "store.sql_channel.get_by_scheme.app_error",
+    "translation": "無法取得提供的配置當中的頻道"
+  },
+  {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
     "translation": "無法取得頻道數"
   },
@@ -6083,6 +6123,26 @@
     "translation": "無法遞增提及計數"
   },
   {
+    "id": "store.sql_channel.migrate_channel_members.commit_transaction.app_error",
+    "translation": "認可資料庫交易時失敗"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.open_transaction.app_error",
+    "translation": "開啟資料庫交易時失敗"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.rollback_transaction.app_error",
+    "translation": "復原資料庫交易時失敗"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.select.app_error",
+    "translation": "批次選取頻道成員時失敗"
+  },
+  {
+    "id": "store.sql_channel.migrate_channel_members.update.app_error",
+    "translation": "更新頻道成員時失敗"
+  },
+  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "無法刪除頻道"
   },
@@ -6103,6 +6163,10 @@
     "translation": "無法移除頻道成員"
   },
   {
+    "id": "store.sql_channel.reset_all_channel_schemes.app_error",
+    "translation": "無法重置頻道配置"
+  },
+  {
     "id": "store.sql_channel.save.commit_transaction.app_error",
     "translation": "無法提交交易"
   },
@@ -6739,6 +6803,10 @@
     "translation": "無法儲存互動"
   },
   {
+    "id": "store.sql_role.delete.update.app_error",
+    "translation": "無法刪除角色"
+  },
+  {
     "id": "store.sql_role.get.app_error",
     "translation": "無法取得角色"
   },
@@ -6763,10 +6831,74 @@
     "translation": "該角色無效"
   },
   {
+    "id": "store.sql_role.save.invalid_role.app_error",
+    "translation": "該角色無效"
+  },
+  {
+    "id": "store.sql_role.save.open_transaction.app_error",
+    "translation": "開啟交易以儲存角色時失敗"
+  },
+  {
     "id": "store.sql_role.save.update.app_error",
     "translation": "無法更新角色"
   },
   {
+    "id": "store.sql_role.save_role.commit_transaction.app_error",
+    "translation": "認可交易以儲存角色時失敗"
+  },
+  {
+    "id": "store.sql_scheme.delete.role_update.app_error",
+    "translation": "無法刪除屬於此配置的角色"
+  },
+  {
+    "id": "store.sql_scheme.delete.scheme_in_use.app_error",
+    "translation": "無法刪除配置，有團隊或頻道正在使用中"
+  },
+  {
+    "id": "store.sql_scheme.delete.update.app_error",
+    "translation": "無法刪除配置"
+  },
+  {
+    "id": "store.sql_scheme.get.app_error",
+    "translation": "無法取得配置"
+  },
+  {
+    "id": "store.sql_scheme.permanent_delete_all.app_error",
+    "translation": "無法永久刪除配置"
+  },
+  {
+    "id": "store.sql_scheme.reset_channels.app_error",
+    "translation": "無法將使用此配置的所有頻道重置成預設配置"
+  },
+  {
+    "id": "store.sql_scheme.reset_teams.app_error",
+    "translation": "無法將使用此配置的所有團隊重置成預設配置"
+  },
+  {
+    "id": "store.sql_scheme.save.insert.app_error",
+    "translation": "無法建立配置"
+  },
+  {
+    "id": "store.sql_scheme.save.invalid_scheme.app_error",
+    "translation": "提供的配置無效"
+  },
+  {
+    "id": "store.sql_scheme.save.open_transaction.app_error",
+    "translation": "開啟交易以儲存配置時失敗"
+  },
+  {
+    "id": "store.sql_scheme.save.retrieve_default_scheme_roles.app_error",
+    "translation": "無法取得預設配置角色"
+  },
+  {
+    "id": "store.sql_scheme.save.update.app_error",
+    "translation": "無法更新配置"
+  },
+  {
+    "id": "store.sql_scheme.save_scheme.commit_transaction.app_error",
+    "translation": "認可交易以儲存配置時失敗"
+  },
+  {
     "id": "store.sql_session.analytics_session_count.app_error",
     "translation": "無法計算有多少工作階段"
   },
@@ -6915,6 +7047,10 @@
     "translation": "找不到已存在的團隊"
   },
   {
+    "id": "store.sql_team.get_by_scheme.app_error",
+    "translation": "無法取得提供的配置當中的頻道"
+  },
+  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "無法取得團隊成員"
   },
@@ -6943,6 +7079,26 @@
     "translation": "無法取得團隊未讀訊息"
   },
   {
+    "id": "store.sql_team.migrate_team_members.commit_transaction.app_error",
+    "translation": "認可資料庫交易時失敗"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.open_transaction.app_error",
+    "translation": "開啟資料庫交易時失敗"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.rollback_transaction.app_error",
+    "translation": "復原資料庫交易時失敗"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.select.app_error",
+    "translation": " 批次選取頻道成員時失敗"
+  },
+  {
+    "id": "store.sql_team.migrate_team_members.update.app_error",
+    "translation": "更新團隊成員時失敗"
+  },
+  {
     "id": "store.sql_team.permanent_delete.app_error",
     "translation": "無法刪除已存在的團隊"
   },
@@ -6951,6 +7107,10 @@
     "translation": "無法移除團隊成員"
   },
   {
+    "id": "store.sql_team.reset_all_team_schemes.app_error",
+    "translation": "無法重置團隊配置"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "無法儲存團隊"
   },
@@ -7216,11 +7376,11 @@
   },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
-    "translation": "無法計算傳入的 Webhook"
+    "translation": "無法計算內送 Webhook"
   },
   {
     "id": "store.sql_webhooks.analytics_outgoing_count.app_error",
-    "translation": "無法計算傳出的 Webhook"
+    "translation": "無法計算外寄 Webhook"
   },
   {
     "id": "store.sql_webhooks.delete_incoming.app_error",
@@ -7272,23 +7432,23 @@
   },
   {
     "id": "store.sql_webhooks.save_incoming.app_error",
-    "translation": "無法儲存傳入的 Webhook"
+    "translation": "無法儲存內送 Webhook"
   },
   {
     "id": "store.sql_webhooks.save_incoming.existing.app_error",
-    "translation": "無法覆蓋一個已存在的傳入的 Webhook"
+    "translation": "無法覆蓋一個已存在的內送 Webhook"
   },
   {
     "id": "store.sql_webhooks.save_outgoing.app_error",
-    "translation": "無法儲存傳出的 Webhook"
+    "translation": "無法儲存外寄 Webhook"
   },
   {
     "id": "store.sql_webhooks.save_outgoing.override.app_error",
-    "translation": "無法複蓋一個已存在的傳出的 Webhook"
+    "translation": "無法複蓋一個已存在的外寄 Webhook"
   },
   {
     "id": "store.sql_webhooks.update_incoming.app_error",
-    "translation": "無法更新傳入的 Webhook"
+    "translation": "無法更新內送 Webhook"
   },
   {
     "id": "store.sql_webhooks.update_outgoing.app_error",
@@ -7560,11 +7720,11 @@
   },
   {
     "id": "web.incoming_webhook.channel_locked.app_error",
-    "translation": "This webhook is not permitted to post to the requested channel"
+    "translation": "此 Webhook 不被允許發布消息至指定的頻道"
   },
   {
     "id": "web.incoming_webhook.disabled.app_error",
-    "translation": "傳入的 Webhook已被系統管理員停用"
+    "translation": "內送 Webhook已被系統管理員停用"
   },
   {
     "id": "web.incoming_webhook.invalid.app_error",