From 8d66523ba7d9a77129844be476732ebfd5272d64 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 26 Jan 2018 13:35:50 -0500
Subject: Used a consistent tense for system messages (#8079)

---
 i18n/en.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 88df06f37..2cfb16de5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -153,7 +153,7 @@
   },
   {
     "id": "api.channel.add_member.added",
-    "translation": "%v added to the channel by %v"
+    "translation": "%v added to the channel by %v."
   },
   {
     "id": "api.channel.add_member.find_channel.app_error",
@@ -233,7 +233,7 @@
   },
   {
     "id": "api.channel.delete_channel.archived",
-    "translation": "%v has archived the channel."
+    "translation": "%v archived the channel."
   },
   {
     "id": "api.channel.delete_channel.cannot.app_error",
@@ -297,7 +297,7 @@
   },
   {
     "id": "api.channel.join_channel.post_and_forget",
-    "translation": "%v has joined the channel."
+    "translation": "%v joined the channel."
   },
   {
     "id": "api.channel.leave.default.app_error",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.channel.leave.left",
-    "translation": "%v has left the channel."
+    "translation": "%v left the channel."
   },
   {
     "id": "api.channel.change_channel_privacy.private_to_public",
@@ -369,7 +369,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v was removed from the channel."
+    "translation": "%v removed from the channel."
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -2184,7 +2184,7 @@
   },
   {
     "id": "api.team.add_user_to_team.added",
-    "translation": "%v added to the team by %v"
+    "translation": "%v added to the team by %v."
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
@@ -2320,7 +2320,7 @@
   },
   {
     "id": "api.team.remove_user_from_team.removed",
-    "translation": "%v was removed from the team."
+    "translation": "%v removed from the team."
   },
   {
     "id": "api.team.signup_team.email_disabled.app_error",
-- 
cgit v1.2.3-1-g7c22


From 8ca8e71fddf6027672938a26f9cc0494bbc5a2bd Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 30 Jan 2018 10:07:05 -0300
Subject: translations PR 20180129 (#8164)

---
 i18n/de.json    |  78 ++++++++++++++++++++++++++-
 i18n/en.json    | 132 ++++++++++++++++++++++-----------------------
 i18n/es.json    |  90 ++++++++++++++++++++++++++++---
 i18n/fr.json    |  76 ++++++++++++++++++++++++++
 i18n/it.json    |  82 ++++++++++++++++++++++++++--
 i18n/ja.json    |  86 +++++++++++++++++++++++++++--
 i18n/ko.json    |  82 ++++++++++++++++++++++++++--
 i18n/nl.json    |  82 ++++++++++++++++++++++++++--
 i18n/pl.json    | 164 +++++++++++++++++++++++++++++++++++++++++---------------
 i18n/pt-BR.json |  78 ++++++++++++++++++++++++++-
 i18n/ru.json    |  80 ++++++++++++++++++++++++++-
 i18n/tr.json    |  78 ++++++++++++++++++++++++++-
 i18n/zh-CN.json |  86 +++++++++++++++++++++++++++--
 i18n/zh-TW.json |  76 ++++++++++++++++++++++++++
 14 files changed, 1129 insertions(+), 141 deletions(-)

(limited to 'i18n')

diff --git a/i18n/de.json b/i18n/de.json
index 3c8e41934..0f326e221 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "Verwaltung und Erstellung von öffentlichen Kanälen ist auf Team- und Systemadministratoren begrenzt."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "Dieser Kanal wurde in einen öffentlichen Kanal umgewandelt und kann von jedem Teammitglied betreten werden."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "Dieser Kanal wurde in einen privaten Kanal umgewandelt."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Für die Erstellung eines Direktnachrichtenkanals muss der createDirectChannel-API-Service verwendet werden"
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post-Eigenschaft CreateAt darf nicht Null sein, wenn angegeben."
+    "translation": "Nachrichteigenschaft CreateAt darf nicht Null sein."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Fehlende erforderliche Nachrichteigenschaft: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaktionseigenschaft CreateAt muss größer als CreateAt der übergeordneten Nachricht sein."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Fehlende erforderliche Reaktionseigenschaft: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "Reaktionseigenschaft CreateAt darf nicht Null sein."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "EmojiName-Eigenschaft der Reaktion ist länger als die maximal erlaubte Länge."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Fehlende erforderliche Reaktionseigenschaft: EmojiName."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Fehlende erforderliche Reaktionseigenschaft: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Antworteigenschaft CreateAt muss größer als CreateAt der übergeordneten Nachricht sein."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Fehlende erforderliche Antworteigenschaft: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "Antworteigenschaft CreateAt darf nicht Null sein."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "Message-Eigenschaft der Antwort ist länger als die maximal erlaubte Länge."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Fehlende erforderliche Antworteigenschaft: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Fehlende erforderliche Antworteigenschaft: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains ist zu lang."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "Benutzer Position ist zu lang."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Ungültiges Profilbild."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "Benutzer roles sind nicht gültig."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "Bis muss größer als von sein"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "E-Mail-Stapelverarbeitung lässt sich bei aktiviertem Clustering nicht aktivieren."
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Ungültige Thumbnauilbreite in Dateieinstellungen.  Muss eine positive Zahl sein."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Ungültiger Bild-Proxy-Typ für Diensteinstellungen."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "AD/LDAP-Feld \"BaseDN\" ist erforderlich."
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Das persönliche Zugriffs-Token konnte nicht abgerufen werden"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Es konnten nicht alle persönlichen Zugriffs-Token abgerufen werden"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Das persönliche Zugriffs-Token konnte nicht über Token abgerufen werden"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Das persönliche Zugriffs-Token konnte nicht gespeichert werden"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Beim Suchen von Zugangs-Tokens wurde ein Fehler festgestellt"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Die Anzahl der eingehenden Webhooks konnte nicht gezählt werden"
diff --git a/i18n/en.json b/i18n/en.json
index 2cfb16de5..d3bc69d0a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "Public Channel management and creation is restricted to Team and System Administrators."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "This channel has been converted to a Private Channel."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Must use createDirectChannel API service for direct message channel creation"
@@ -315,14 +323,6 @@
     "id": "api.channel.leave.left",
     "translation": "%v left the channel."
   },
-  {
-    "id": "api.channel.change_channel_privacy.private_to_public",
-    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
-  },
-  {
-    "id": "api.channel.change_channel_privacy.public_to_private",
-    "translation": "This channel has been converted to a Private Channel."
-  },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
     "translation": "Failed to post displayname update message"
@@ -3351,80 +3351,80 @@
     "translation": "Missing required direct post property: user"
   },
   {
-    "id": "app.import.validate_reaction_import_data.user_missing.error",
-    "translation": "Missing required Reaction property: User."
+    "id": "app.import.validate_post_import_data.channel_missing.error",
+    "translation": "Missing required Post property: Channel."
   },
   {
-    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
-    "translation": "Missing required Reaction property: EmojiName."
+    "id": "app.import.validate_post_import_data.create_at_missing.error",
+    "translation": "Missing required Post property: create_at."
   },
   {
-    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
-    "translation": "Reaction EmojiName property is longer than the maximum permitted length."
+    "id": "app.import.validate_post_import_data.create_at_zero.error",
+    "translation": "Post CreateAt property must not be zero."
   },
   {
-    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
-    "translation": "Missing required Reaction property: create_at."
+    "id": "app.import.validate_post_import_data.message_length.error",
+    "translation": "Post Message property is longer than the maximum permitted length."
   },
   {
-    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
-    "translation": "Reaction CreateAt property must not be zero."
+    "id": "app.import.validate_post_import_data.message_missing.error",
+    "translation": "Missing required Post property: Message."
   },
   {
-    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
-    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
+    "id": "app.import.validate_post_import_data.team_missing.error",
+    "translation": "Missing required Post property: Team."
   },
   {
-    "id": "app.import.validate_reply_import_data.user_missing.error",
-    "translation": "Missing required Reply property: User."
+    "id": "app.import.validate_post_import_data.user_missing.error",
+    "translation": "Missing required Post property: User."
   },
   {
-    "id": "app.import.validate_reply_import_data.message_missing.error",
-    "translation": "Missing required Reply property: Message."
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
   },
   {
-    "id": "app.import.validate_reply_import_data.message_length.error",
-    "translation": "Reply Message property is longer than the maximum permitted length."
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Missing required Reaction property: create_at."
   },
   {
-    "id": "app.import.validate_reply_import_data.create_at_missing.error",
-    "translation": "Missing required Reply property: create_at."
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "Reaction CreateAt property must not be zero."
   },
   {
-    "id": "app.import.validate_reply_import_data.create_at_zero.error",
-    "translation": "Reply CreateAt property must not be zero."
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "Reaction EmojiName property is longer than the maximum permitted length."
   },
   {
-    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
-    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Missing required Reaction property: EmojiName."
   },
   {
-    "id": "app.import.validate_post_import_data.channel_missing.error",
-    "translation": "Missing required Post property: Channel."
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Missing required Reaction property: User."
   },
   {
-    "id": "app.import.validate_post_import_data.create_at_missing.error",
-    "translation": "Missing required Post property: create_at."
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
   },
   {
-    "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt property must not be zero."
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Missing required Reply property: create_at."
   },
   {
-    "id": "app.import.validate_post_import_data.message_length.error",
-    "translation": "Post Message property is longer than the maximum permitted length."
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "Reply CreateAt property must not be zero."
   },
   {
-    "id": "app.import.validate_post_import_data.message_missing.error",
-    "translation": "Missing required Post property: Message."
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "Reply Message property is longer than the maximum permitted length."
   },
   {
-    "id": "app.import.validate_post_import_data.team_missing.error",
-    "translation": "Missing required Post property: Team."
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Missing required Reply property: Message."
   },
   {
-    "id": "app.import.validate_post_import_data.user_missing.error",
-    "translation": "Missing required Post property: User."
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Missing required Reply property: User."
   },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
@@ -3562,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "User Position is too long."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Invalid profile image."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "User roles are not valid."
@@ -3574,10 +3578,6 @@
     "id": "app.import.validate_user_import_data.username_missing.error",
     "translation": "Missing require user property: username."
   },
-  {
-    "id": "app.import.validate_user_import_data.profile_image.error",
-    "translation": "Invalid profile image."
-  },
   {
     "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Team Membership."
@@ -4642,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "To must be greater than From"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Unable to enable email batching when clustering is enabled."
@@ -4754,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Invalid thumbnail width for file settings.  Must be a positive number."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "AD/LDAP field \"BaseDN\" is required."
@@ -4814,14 +4822,6 @@
     "id": "model.config.is_valid.listen_address.app_error",
     "translation": "Invalid listen address for service settings Must be set."
   },
-  {
-    "id": "model.config.is_valid.image_proxy_type.app_error",
-    "translation": "Invalid image proxy type for service settings."
-  },
-  {
-    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
-    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
-  },
   {
     "id": "model.config.is_valid.localization.available_locales.app_error",
     "translation": "Available Languages must contain Default Client Language"
@@ -6846,26 +6846,26 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "We couldn't get the personal access token"
   },
-  {
-    "id": "store.sql_user_access_token.get_by_token.app_error",
-    "translation": "We couldn't get the personal access token by token"
-  },
   {
     "id": "store.sql_user_access_token.get_all.app_error",
     "translation": "We couldn't get all personal access tokens"
   },
   {
-    "id": "store.sql_user_access_token.get_by_user.app_error",
-    "translation": "We couldn't get the personal access tokens by user"
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "We couldn't get the personal access token by token"
   },
   {
-    "id": "store.sql_user_access_token.search.app_error",
-    "translation": "We encountered an error searching user access tokens"
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "We couldn't get the personal access tokens by user"
   },
   {
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "We couldn't save the personal access token"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "We encountered an error searching user access tokens"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "We couldn't count the incoming webhooks"
diff --git a/i18n/es.json b/i18n/es.json
index b8d4c2f6a..c96674885 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "La gestión y creación de Canales Públicos está restringida a los Administradores de Equipo y Sistema."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "Este canal ha sido convertido a un Canal Público y cualquier miembro del equipo puede unirse."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "Este canal ha sido convertido a un Canal Privado."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Debe usar el servicio del api createDirectChannel para crear un canal de mensajes directos"
@@ -233,7 +241,7 @@
   },
   {
     "id": "api.channel.delete_channel.archived",
-    "translation": "%v ha archivado el canal."
+    "translation": "%v archivó el canal."
   },
   {
     "id": "api.channel.delete_channel.cannot.app_error",
@@ -297,7 +305,7 @@
   },
   {
     "id": "api.channel.join_channel.post_and_forget",
-    "translation": "%v se ha unido al canal."
+    "translation": "%v se unió al canal."
   },
   {
     "id": "api.channel.leave.default.app_error",
@@ -313,7 +321,7 @@
   },
   {
     "id": "api.channel.leave.left",
-    "translation": "%v ha abandonado el canal."
+    "translation": "%v abandonó el canal."
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
@@ -361,7 +369,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v fue removido del canal."
+    "translation": "%v removido del canal."
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -2312,7 +2320,7 @@
   },
   {
     "id": "api.team.remove_user_from_team.removed",
-    "translation": "%v fue removido del equipo."
+    "translation": "%v removido del equipo."
   },
   {
     "id": "api.team.signup_team.email_disabled.app_error",
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "La propiedad CreateAt del Mensaje no debe ser cero si se proporciona."
+    "translation": "La propiedad CreateAt del Mensaje no debe ser cero."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Falta la propiedad obligatoria del mensaje: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "La propiedad CreateAt de la Reacción debe ser mayor a la propiedad CreateAt del mensaje al que pertenece."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Falta la propiedad de la Reacción: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "La propiedad CreateAt de la Reacción no debe ser cero."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "La propiedad EmojiName de la reacción supera la longitud máxima permitida."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Falta la propiedad obligatoria de la Reacción: EmojiName."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Falta la propiedad obligatoria de la Reacción: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "La propiedad CreateAt debe ser mayor al CreateAt del mensaje padre."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Falta la propiedad de la respuesta: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "La propiedad CreateAt de la respuesta no debe ser cero."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "La propiedad Message de la respuesta supera la longitud máxima permitida."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Falta la propiedad obligatoria de la respuesta: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Falta la propiedad obligatoria de la respuesta: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "La propiedad del equipo allowed_domains es demasiado larga."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "La propiedad Position del usuario es demasiado larga."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Imagen de perfil no válida."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "Los roles del usuario no son válidos."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "Desde debe ser mayor que Hasta"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Opción atmos/camo del proxy de imágenes no es válida en la configuración del servicio.  Se debe establecer con la clave compartida."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "No se puede habilitar el correo electrónico por lotes cuando la agrupación de servidores está habilitada"
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "El ancho para la imagen de miniatura es inválido en la configuración de archivos.  Debe ser un número positivo."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Tipo de proxy para las imágenes no válido en la configuración del servicio."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "El campo AD/LDAP \"BaseDN\" es obligatorio."
@@ -5336,7 +5404,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "Cargo no válido: no debe ser más de 35 caracteres."
+    "translation": "Cargo no válido: no debe ser más de 128 caracteres."
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "No pudimos obtener el token de acceso personal"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "No pudimos obtener todos los tokens de acceso personal"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "No pudimos obtener el token de acceso personal por token"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "No pudimos guardar el token de acceso personal"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Encontramos un error buscando los tokens de acceso"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "No pudimos contar la cantidad de webhooks entrantes"
diff --git a/i18n/fr.json b/i18n/fr.json
index d0a27dcee..f2c20c29f 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "La gestion et la création de canaux publics sont réservés aux administrateurs système et administrateurs d'équipe."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "This channel has been converted to a Private Channel."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Vous devez utiliser le service d'API createDirectChannel pour la création d'un canal de messages personnels"
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "La propriété requise du message est manquante : User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "La propriété requise pour un message est manquante : create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "La propriété de message CreateAt ne doit pas être 0 si ce champ est défini."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "La propriété Message du message est plus longue que la longueur maximale autorisée."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "La propriété requise du message est manquante : User."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "La propriété requise du message est manquante : User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "La propriété requise pour un message est manquante : create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "La propriété de message CreateAt ne doit pas être 0 si ce champ est défini."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "La propriété Message du message est plus longue que la longueur maximale autorisée."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "La propriété requise du message est manquante : Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "La propriété requise du message est manquante : User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "La propriété d'équipe allowed_domains is trop longue."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "Le rôle de l'utilisateur est trop long."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Invalid profile image."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "Les rôles de l'utilisateur sont invalides."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "Jusqu'à doit être supérieur à De"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Impossible d'activer l'envoi d'e-mails par lot lorsque le clustering est activé"
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Largeur des miniatures invalide dans les paramètres de fichiers. Doit être un entier positif."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "Le champ AD/LDAP \"BaseDN\" est requis."
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Impossible de récupérer le jeton d'accès personnel"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Impossible de récupérer le jeton d'accès personnel"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Impossible de récupérer le jeton d'accès personnel par jeton"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Impossible d'enregistrer le jeton d'accès personnel"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Nous avons rencontré une erreur lors de la recherche du jeton d'accès"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Impossible de compter les webhooks entrants"
diff --git a/i18n/it.json b/i18n/it.json
index cd5c53b4c..a58dfa15a 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "La creazione e amministrazione di Canali Pubblici è limitata all'Amministratore di Sistema e di gruppo."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "Questo canale è stato convertito in un Canale Pubblico e ogni membro del gruppo può farne parte."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "Questo canale è stato convertito in un Canale Privato."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Bisogna usare il servizio createDirectChannel API per la creazione dei messaggi diretti nel canale"
@@ -2176,7 +2184,7 @@
   },
   {
     "id": "api.team.add_user_to_team.added",
-    "translation": "%v aggiunto al gruppo da parte di %v"
+    "translation": "%v aggiunto al gruppo da parte di %v."
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "L'attributo della pubblicazione CreateAt, se presente, non deve essere zero."
+    "translation": "La proprietà CreateAt della pubblicazione non può essere zero."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Proprietà della pubblicazione mancante: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "La proprietà della reazione CreateAt deve evvere maggiore della proprietà CreateAt della pubblicazione principale."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Proprietà della reazione mancante: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "La proprietà della reazione CreateAt non può essere zero."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "La lunghezza della proprietà EmojiName della reazione è maggiore della lunghezza ammessa."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Proprietà della reazione mancante: EmojiName."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Proprietà della reazione mancante: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "La proprietà CreateAt della risposta deve essere maggiore della proprietà CreateAt della pubblicazione principale."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Proprietà della risposta mancante: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "La proprietà CreateAt della risposta non può essere zero."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "La lunghezza della proprietà Message della risposta è maggiore della lunghezza ammessa."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Proprietà della risposta mancante: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Proprietà della risposta mancante: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Il campo allowed_domains del gruppo è troppo lungo."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "Il campo Posizione dell'utente è troppo lungo."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Immagine profilo non valida."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "I ruoli utente non sono validi."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "A deve essere più grand di Da"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Opzioni proxy immagine atmos/camo non valide nelle impostazione del servizio. Dev'essere una chiave condivisa."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Impossibile abilitare la spedizione email programmata quando il supporto cluster è abilitato."
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Larghezza antemprima non valida per le impostazioni file.  Deve essere un numero positivo."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Tipo proxy immagine non valido nelle impostazioni del servizio."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "Il campo AD/LDAP \"BaseDN\" è richiesto."
@@ -5336,7 +5404,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "Posizione non valida: non deve essere maggiore di 35 caratteri."
+    "translation": "Posizione non valida: non deve essere maggiore di 128 caratteri."
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Impossibile trovare il Token di accesso personale"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Impossibile trovare tutti i token di accesso personale"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Impossibile trovare il token di accesso personale per token"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Impossibile salvare il Token di accesso personale"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Si è verificato un errore durante la ricerca dei token di accesso personali"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Non è stato possibile effettuare il conteggio dei webhook in ingresso"
diff --git a/i18n/ja.json b/i18n/ja.json
index d35f2b08f..19a88fda2 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -153,7 +153,7 @@
   },
   {
     "id": "api.channel.add_member.added",
-    "translation": "%vは、%vによってチャンネルに追加されました"
+    "translation": "%v は %v によってチャンネルに追加されました。"
   },
   {
     "id": "api.channel.add_member.find_channel.app_error",
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "公開チャンネルの作成と管理は、チーム管理者かシステム管理者しかできません。"
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "このチャンネルは公開チャンネルに変更されたため、全てのチームメンバーが参加できるようになりました。"
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "このチャンネルは非公開チャンネルに変更されました。"
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "ダイレクトメッセージチャンネルを作成するにはcreateDirectChannel APIを使用してください"
@@ -233,7 +241,7 @@
   },
   {
     "id": "api.channel.delete_channel.archived",
-    "translation": "%vがチャンネルをアーカイブしました。"
+    "translation": "%v がチャンネルをアーカイブしました。"
   },
   {
     "id": "api.channel.delete_channel.cannot.app_error",
@@ -361,7 +369,7 @@
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%vはチャンネルから削除されました。"
+    "translation": "%v はチャンネルから削除されました。"
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
@@ -2312,7 +2320,7 @@
   },
   {
     "id": "api.team.remove_user_from_team.removed",
-    "translation": "%v はチャンネルから削除されました。"
+    "translation": "%v はチームから削除されました。"
   },
   {
     "id": "api.team.signup_team.email_disabled.app_error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "必須の投稿設定値 User が存在しません。"
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "リアクション作成日時の設定値は親に当たる投稿の作成日時よりも大きくなくてはなりません。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "必須のリアクション設定値 create_at が存在しません。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "リアクションの作成日時には0を設定できません。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "リアクション絵文字名の設定値が許可された最大長を超えています。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "必須のリアクション設定値 EmojiName が存在しません。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "必須のリアクション設定値 User が存在しません。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "返信作成日時の設定値は親に当たる投稿の作成日時よりも大きくなくてはなりません。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "必須の返信設定値 create_at が存在しません。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "返信の作成日時には0を設定できません。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "返信メッセージの設定値が許可された最大長を超えています。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "必須の返信設定値 Message が存在しません。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "必須の返信設定値 User が存在しません。"
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "チームの許可されたドメインが長すぎます。"
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "ユーザーの役職が長すぎます。"
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "不正なプロフィール画像です。"
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "ユーザーの役割が正しくありません。"
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "有効終了は有効開始の後でなくてはいけません"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "atmos/camo 画像プロキシの設定が不正です。共有キーを設定する必要があります。"
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "クラスタリングが有効化されている場合、電子メールバッチ処理は有効化できません。"
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "ファイル設定のサムネイルの幅が不正です。ゼロ以上の数を指定してください。"
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "画像プロキシタイプの設定が不正です。"
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "AD/LDAP項目 \"ベースDN\" は必須です。"
@@ -5336,7 +5404,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "不正な役職: 35文字以上にはできません"
+    "translation": "不正な役職: 128文字以上にはできません"
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "パーソナルアクセストークンを取得できませんでした"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "パーソナルアクセストークンを取得できませんでした"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "トークンによってパーソナルアクセストークンを取得することができませんでした"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "パーソナルアクセストークンを保存できませんでした。"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "アクセストークンを探す際にエラーが発生しました"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "内向きのウェブフック数を取得できませんでした"
diff --git a/i18n/ko.json b/i18n/ko.json
index 599a52013..bdd2935a4 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "공개 채널 생성, 관리는 팀 관리자 또는 시스템 관리자 권한이 필요합니다."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "This channel has been converted to a Private Channel."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "개인 메시지 채널을 만들기 위해서는 반드시 createDirectChannel API 서비스를 이용해야 함"
@@ -812,7 +820,7 @@
   },
   {
     "id": "api.command_leave.success",
-    "translation": "Left the channel."
+    "translation": "%v 가 채널을 떠났습니다."
   },
   {
     "id": "api.command_logout.desc",
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt property must not be zero if provided."
+    "translation": "Post CreateAt property must not be zero."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Missing required Post property: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Missing required Reaction property: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "Reaction CreateAt property must not be zero."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "Reaction EmojiName property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Missing required Reaction property: EmojiName."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Missing required Reaction property: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Missing required Reply property: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "Reply CreateAt property must not be zero."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "Reply Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Missing required Reply property: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Missing required Reply property: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains is too long."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "User Position is too long."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Invalid profile image."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "User roles are not valid."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "To must be greater than From"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Unable to enable email batching when clustering is enabled"
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "파일 세팅에 대한 잘못된 썸네일 너비값입니다. 0보다 큰 값이여야 합니다."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "AD/LDAP의 \"BaseDN\" 항목이 필요합니다."
@@ -5336,7 +5404,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "Invalid position: must not be longer than 35 characters."
+    "translation": "Invalid position: must not be longer than 128 characters."
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "채널을 찾을 수 없습니다"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "채널을 찾을 수 없습니다"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "We encountered an error finding the access token"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Incoming webhook 갯수를 셀 수 없었습니다"
diff --git a/i18n/nl.json b/i18n/nl.json
index a6fa05b5a..2e0f54ee4 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "Alleen team- en systeembeheerders mogen publieke kanalen beheren en aanmaken."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "This channel has been converted to a Private Channel."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "U moet de 'createDirectChannel' API service gebruiken om een direct kanaal aan te maken"
@@ -812,7 +820,7 @@
   },
   {
     "id": "api.command_leave.success",
-    "translation": "Left the channel."
+    "translation": "%v heeft het kanaal verlaten."
   },
   {
     "id": "api.command_logout.desc",
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt property must not be zero if provided."
+    "translation": "Post CreateAt property must not be zero."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Missing required Post property: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Missing required Reaction property: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "Reaction CreateAt property must not be zero."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "Reaction EmojiName property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Missing required Reaction property: EmojiName."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Missing required Reaction property: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Missing required Reply property: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "Reply CreateAt property must not be zero."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "Reply Message property is longer than the maximum permitted length."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Missing required Reply property: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Missing required Reply property: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Team allowed_domains is too long."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "User Position is too long."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Invalid profile image."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "User roles are not valid."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "Tot en met, moet later zijn dan Vanaf"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Niet mogelijk om bulk email aan te zetten als clustering aan staat."
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Ongeldige voorvertonings breedte bij bestands instellingen. Moet een getal groter dan 0 zijn."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "AD/LDAP veld \"BaseDN\" is verplicht."
@@ -5336,7 +5404,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "Invalid position: must not be longer than 35 characters."
+    "translation": "Invalid position: must not be longer than 128 characters."
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Het access token kan niet verwijderd worden"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Het access token kan niet verwijderd worden"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Het access token kan niet verwijderd worden"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Het access token kan niet opgeslagen worden."
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Er is een probleem opgetreden bij het ophalen van het access token"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Het aantal binnenkomende webhooks kan niet geteld worden"
diff --git a/i18n/pl.json b/i18n/pl.json
index dae215db8..ccf9fed39 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "Zarządzanie i tworzenie kanałów publicznych jest dostępne tylko dla administratorów systemu i zespołów."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "This channel has been converted to a Private Channel."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Do tworzenia kanału wiadomości bezpośrednich należy użyć usługi API createDirectChannel"
@@ -637,15 +645,15 @@
   },
   {
     "id": "api.command_dnd.desc",
-    "translation": "Do not disturb disables desktop and mobile push notifications."
+    "translation": "Tryb \"Nie przeszkadzać\" wyłącza powiadomienia desktopowe oraz mobilne powiadomienia push."
   },
   {
     "id": "api.command_dnd.disabled",
-    "translation": "Do Not Disturb is disabled."
+    "translation": "Tryb \"Nie przeszkadzać\" jest wyłączony."
   },
   {
     "id": "api.command_dnd.error",
-    "translation": "Error to retrieve the user status."
+    "translation": "Nie można odczytać statusu użytkownika."
   },
   {
     "id": "api.command_dnd.name",
@@ -653,7 +661,7 @@
   },
   {
     "id": "api.command_dnd.success",
-    "translation": "Do Not Disturb is enabled. You will not receive desktop or mobile push notifications until Do Not Disturb is turned off."
+    "translation": "Tryb \"Nie przeszkadzać\" jest włączony. Nie będziesz otrzymywać powiadomień na komputerze ani powiadomień push na urządzeniach mobilnych do czasu jego wyłączenia."
   },
   {
     "id": "api.command_echo.create.app_error",
@@ -701,25 +709,25 @@
   },
   {
     "id": "api.command_groupmsg.desc",
-    "translation": "Sends a Group Message to the specified users"
+    "translation": "Wysyła wiadomość grupową do wybranych użytkowników."
   },
   {
     "id": "api.command_groupmsg.fail.app_error",
-    "translation": "Wystąpił błąd podczas wysyłania wiadomości do użytkownika."
+    "translation": "Wystąpił błąd podczas wysyłania wiadomości do użytkowników."
   },
   {
     "id": "api.command_groupmsg.group_fail.app_error",
-    "translation": "Wystąpił błąd podczas tworzenia wiadomości bezpośredniej."
+    "translation": "Wystąpił błąd podczas tworzenia wiadomości grupowej."
   },
   {
     "id": "api.command_groupmsg.hint",
-    "translation": "@[username1],@[username2] 'message'"
+    "translation": "@[username1],@[username2] 'wiadomość'"
   },
   {
     "id": "api.command_groupmsg.invalid_user.app_error",
     "translation": {
-      "one": "We couldn't find the user: {{.Users}}",
-      "other": "We couldn't find the users: {{.Users}}"
+      "one": "Nie można znaleźć użytkownika: {{.Users}}",
+      "other": "Nie można znaleźć użytkowników: {{.Users}}"
     }
   },
   {
@@ -732,11 +740,11 @@
   },
   {
     "id": "api.command_groupmsg.max_users.app_error",
-    "translation": "Group messages are limited to a maximum of {{.MaxUsers}} users."
+    "translation": "Wiadomości grupowe są ograniczone do maksymalnie {{.MaxUsers}} użytkowników."
   },
   {
     "id": "api.command_groupmsg.min_users.app_error",
-    "translation": "Group messages are limited to a minimum of {{.MinUsers}} users."
+    "translation": "Wiadomości grupowe są ograniczone do minimum {{.MinUsers}} użytkowników."
   },
   {
     "id": "api.command_groupmsg.missing.app_error",
@@ -748,7 +756,7 @@
   },
   {
     "id": "api.command_groupmsg.success",
-    "translation": "Odbiorca wiadomości."
+    "translation": "Odbiorcy wiadomości."
   },
   {
     "id": "api.command_help.desc",
@@ -900,7 +908,7 @@
   },
   {
     "id": "api.command_remove.desc",
-    "translation": "Remove a member from the channel"
+    "translation": "Usuń członka z kanału"
   },
   {
     "id": "api.command_remove.direct_group.app_error",
@@ -920,15 +928,15 @@
   },
   {
     "id": "api.command_remove.name",
-    "translation": "remove"
+    "translation": "usuń"
   },
   {
     "id": "api.command_remove.permission.app_error",
-    "translation": "Nie posiadasz odpowiednich uprawnień do zmiany nazwy kanału."
+    "translation": "Nie posiadasz odpowiednich uprawnień do usunięcia członka."
   },
   {
     "id": "api.command_remove.user_not_in_channel",
-    "translation": "{{.Username}} is not a member of this channel."
+    "translation": "{{.Username}} nie jest członkiem tego kanału."
   },
   {
     "id": "api.command_search.desc",
@@ -1080,7 +1088,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.channel.app_error",
-    "translation": "Nie można znaleźć kanału posta dla masowych powiadomień email"
+    "translation": "Nie można znaleźć kanału wiadomości dla masowych powiadomień e-mail."
   },
   {
     "id": "api.email_batching.render_batched_post.date",
@@ -1092,7 +1100,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
-    "translation": "Przejdź do postu"
+    "translation": "Do wiadomości"
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
@@ -1104,7 +1112,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
-    "translation": "Nie można znaleźć nadawcy posta dla masowych powiadomień email"
+    "translation": "Nie można znaleźć nadawcy wiadomości dla masowych powiadomień e-mail"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
@@ -1334,7 +1342,7 @@
   },
   {
     "id": "api.file.move_file.copy_within_s3.app_error",
-    "translation": "Unable to copy file within S3."
+    "translation": "Nie można skopiować pliku w S3."
   },
   {
     "id": "api.file.move_file.delete_from_s3.app_error",
@@ -1426,7 +1434,7 @@
   },
   {
     "id": "api.incoming_webhook.invalid_username.app_error",
-    "translation": "Niepoprawna nazwa uzytkownika"
+    "translation": "Niepoprawna nazwa użytkownika."
   },
   {
     "id": "api.ldap.init.debug",
@@ -1634,19 +1642,19 @@
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.link.private",
-    "translation": "add them to this private channel"
+    "translation": "dodaj ich do tego prywatnego kanału"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.link.public",
-    "translation": "add them to the channel"
+    "translation": "dodaj ich do kanału"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
+    "translation": "@{{.Usernames}} oraz @{{.LastUsername}} zostali wspomnieni, ale nie było ich na kanale. Czy chcesz {{.Phrase}}? Będą mieć dostęp do całej historii wiadomości."
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history."
+    "translation": "@{{.Username}} został wspomniany, ale nie było go na kanale. Czy chcesz {{.Phrase}}? Będzie mieć dostęp do całej historii wiadomości."
   },
   {
     "id": "api.post.create_post.attach_files.error",
@@ -2120,7 +2128,7 @@
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
-    "translation": "Nie udało się pobrać zespołu do importu.\r\n"
+    "translation": "Nie udało się pobrać zespołu do którego ma nastąpić import.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
@@ -2136,7 +2144,7 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma nagłówek, który jest za długi. Będzie on przycięty po zaimportowaniu."
+    "translation": "Slack Importer: Kanał {{.ChannelName}} ma wyświetlaną nazwę, która jest za długa. Będzie ona przycięta po zaimportowaniu."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
@@ -2144,11 +2152,11 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma nagłówek, który jest za długi. Będzie on przycięty po zaimportowaniu."
+    "translation": "Slack Importer: Kanał {{.ChannelName}} ma nazwę, która jest za długa. Będzie ona przycięta po zaimportowaniu."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Importer: Kanał {{.ChannelName}} ma opis, który jest za długi. Będzie on przycięty po zaimportowaniu."
+    "translation": "Slack Importer: Kanał {{.ChannelName}} ma cel, który jest za długi. Będzie on przycięty po zaimportowaniu."
   },
   {
     "id": "api.status.init.debug",
@@ -2228,7 +2236,7 @@
   },
   {
     "id": "api.team.import_team.no_import_from.app_error",
-    "translation": "Nieprawidłowe zapytanie: pole rozmiaru pliku nie istnieje."
+    "translation": "Nieprawidłowe zapytanie: pole importFrom nie istnieje."
   },
   {
     "id": "api.team.import_team.open.app_error",
@@ -2292,11 +2300,11 @@
   },
   {
     "id": "api.team.join_team.post_and_forget",
-    "translation": "%v joined the team."
+    "translation": "%v dołączył do kanału."
   },
   {
     "id": "api.team.leave.left",
-    "translation": "%v left the team."
+    "translation": "%v opuścił zespół."
   },
   {
     "id": "api.team.permanent_delete_team.attempting.warn",
@@ -2312,7 +2320,7 @@
   },
   {
     "id": "api.team.remove_user_from_team.removed",
-    "translation": "%v został usunięty z kanału."
+    "translation": "%v został usunięty z zespołu."
   },
   {
     "id": "api.team.signup_team.email_disabled.app_error",
@@ -2832,7 +2840,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "Użycie SAML nie zostało skonfigurowane lub nie jest wspierane na tym serwerze."
+    "translation": "Użycie SAML 2.0 nie zostało skonfigurowane lub nie jest wspierane na tym serwerze."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2868,7 +2876,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send \"Personal access token added\" email successfully"
+    "translation": "Nie udało się wysłać maila \"Osobisty token dostępu został dodany\""
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -2880,7 +2888,7 @@
   },
   {
     "id": "api.user.update_active.no_deactivate_sso.app_error",
-    "translation": "Nie możesz zmieniać stanu aktywacji kont AD/LDAP. Proszę je zmodyfikować przez serwer LDAP."
+    "translation": "Nie możesz zmieniać stanu aktywacji kont SSO. Proszę je zmodyfikować przez serwer SSO."
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -3128,23 +3136,23 @@
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
-    "translation": "Nie udało się wysłać opisu kanału"
+    "translation": "Nie udało się wysłać celu kanału"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.removed",
-    "translation": "%s usunął opis kanału (był: %s)"
+    "translation": "%s usunął cel kanału (był: %s)"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.retrieve_user.error",
-    "translation": "Nie udało się pobrać użytkownika podczas aktualizacji opisu kanału %v"
+    "translation": "Nie udało się pobrać użytkownika podczas aktualizacji celu kanału %v"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_from",
-    "translation": "%s zaktualizował opis kanału z: %s na: %s"
+    "translation": "%s zaktualizował cel kanału z: %s na: %s"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.updated_to",
-    "translation": "%s zmienił opis kanału na %s"
+    "translation": "%s zmienił cel kanału na %s"
   },
   {
     "id": "app.import.bulk_import.file_scan.error",
@@ -3272,7 +3280,7 @@
   },
   {
     "id": "app.import.validate_channel_import_data.purpose_length.error",
-    "translation": "Opis kanału jest za długi."
+    "translation": "Cel kanału jest za długi."
   },
   {
     "id": "app.import.validate_channel_import_data.team_missing.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Brak wymaganej właściwości Post: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Właściwość CreateAt musi być wyższa niż parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Brak wymaganej właściwości: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "Właściwość CreateAt nie może być zero."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "Właściwość EmojiName jest dłuższa niż maksymalna dozwolona długość."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Brak wymaganej właściwości: EmojiName."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Brak wymaganej właściwości: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Właściwość CreateAt musi być wyższa niż parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Brak wymaganej właściwości Post: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "Właściwość Post CreateAt nie może być zero jeśli podany."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "Właściwość wiadomości Post jest dłuższa niz dozwolona długość."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Brak wymaganej właściwości: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Brak wymaganej właściwości: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Drużyna allowed_domains jest za długa."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "Pozycja użytkownika jest za długa."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Invalid profile image."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "Nieprawidłowe role użytkownika."
@@ -4356,7 +4416,7 @@
   },
   {
     "id": "model.channel.is_valid.purpose.app_error",
-    "translation": "Nieprawidłowe przeznaczenie"
+    "translation": "Nieprawidłowy cel"
   },
   {
     "id": "model.channel.is_valid.type.app_error",
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "Do musi być większe niż od"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Nie można odblokować masowych emaili gdy klastrowanie jest odblokowane."
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Nieprawidłowa szerokość miniaturki dla ustawień plików. Musi być liczbą większą od 0."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "Pole AD/LDAP \"BaseDN\" jest wymagane."
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Nie można usunąć identyfikatora dostępu"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Nie można usunąć identyfikatora dostępu"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Nie można usunąć identyfikatora dostępu"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Nie mogliśmy zapisać identyfikatora dostępu."
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Wystąpił błąd podczas wyszukiwania identyfikatora dostępu"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Nie udało się policzyć przychodzących webhooków"
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 369141607..66ff2c49b 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "Gerenciamento de Canais Públicos e criação é restrito apenas para o Time e Administradores do Sistema."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "Este canal foi convertido para um Canal Público e membros de qualquer equipe podem se juntar."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "Este canal foi convertido para um Canal Privado."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Deve-se usar a API de serviço createDirectChannel para criação do canal de mensagens diretas"
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "A propriedade CreateAt da mensagem não pode ser zero se informado."
+    "translation": "A propriedade CreateAt do Post não pode ser zero."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Propriedade obrigatória do Post não foi informada: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "A propriedade CreateAt da Reação deve ser maior que CreateAt do post pai."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Propriedade obrigatória da Reação não foi informada: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "A propriedade CreateAt da Reação não pode ser zero."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "A propriedade EmojiName da Reação é maior que o comprimento máximo permitido."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Propriedade obrigatória da Reação não foi informada: EmojiName."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Propriedade obrigatória da Reação não foi informada: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "A propriedade CreateAt da Resposta deve ser maior que CreateAt do post pai."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Propriedade obrigatória da Resposta não foi informada: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "A propriedade CreateAt da Resposta não pode ser zero."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "A propriedade Message da Resposta é maior que o comprimento máximo permitido."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Propriedade obrigatória da Resposta não foi informada: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Propriedade obrigatória da Resposta não foi informada: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Equipe allowed_domains é muito longo."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "O Cargo do usuário é muito longo."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Imagem do perfil inválida."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "As funções de usuário não são válidas."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "Para precisa ser maior que De"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Não é possível ativar email em lote quando clustering está ativo."
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Definição da largura do thumbnail inválida.  Deve ser um número positivo."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "O campo \"BaseDN\" no AD/LDAP é requerido."
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Não foi possível obter o token de acesso individual"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Não foi possível obter todos os tokens de acesso individual"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Não foi possível obter o token de acesso inidividual pelo token"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Não foi possível salvar o token de acesso individual"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Encontramos um erro ao procurar os tokens de acesso"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Não foi possível contar os webhooks entrada"
diff --git a/i18n/ru.json b/i18n/ru.json
index 1459f161d..efa6c4111 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "Создание и управление Публичными Каналами возможно Командой и Системными Администраторами."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "This channel has been converted to a Private Channel."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Нужно использовать createDirectChannel из API для создания канала личных сообщений"
@@ -2312,7 +2320,7 @@
   },
   {
     "id": "api.team.remove_user_from_team.removed",
-    "translation": "%v удален из канала."
+    "translation": "%v удален из команды."
   },
   {
     "id": "api.team.signup_team.email_disabled.app_error",
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "Post CreateAt property must not be zero if provided."
+    "translation": "Post CreateAt property must not be zero."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Отсутствует необходимое поле для Post: User."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: create_at."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "Reaction CreateAt property must not be zero."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "Post Message длиннее, чем максимально разрешённая длина."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: User."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: User."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: create_at."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "Reply CreateAt property must not be zero."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "Post Message длиннее, чем максимально разрешённая длина."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: Message."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Отсутствует необходимое поле для Post: User."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Свойство Team allowed_domains слишком длинное."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "Расположение пользователя слишком длинное."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Invalid profile image."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "Неверные роли пользователя."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "\"До\" должно быть больше, чем \"С\""
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Невозможно включить пакетную обработку почты при включенной кластеризации."
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Неверная ширина миниатюры в настройках файлов. Число должно быть положительным."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "Требуется поле AD/LDAP \"BaseDN\"."
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Не удалось получить персональный токен доступа"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Не удалось получить персональный токен доступа"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Не удалось получить персональный токен доступа по токену"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Не удалось сохранить персональный токен доступа"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Возникла ошибка с обнаружением токена доступа"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Не удалось подсчитать входящие вебхуки"
diff --git a/i18n/tr.json b/i18n/tr.json
index 987adbcab..45b047512 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "Herkese açık kanal ekleme ve yönetim işlemlerini yalnız Takım ve Sistem Yöneticileri yapabilir."
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "Bu kanal Herkese Açık Kanala dönüştürüldü ve isteyen her takım üyesi katılabilir."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "Bu kanal Özel Kanala dönüştürüldü."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "Doğrudan ileti kanalı eklemek için createDirectChannel API hizmeti kullanılmalıdır"
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "İleti oluşturulma zamanı belirtilmiş ise 0 olmamalıdır."
+    "translation": "İleti Oluşturulma Zamanı özelliği sıfır olamaz."
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "Zorunlu ileti özelliği eksik: Kullanıcı."
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Tepki Oluşturulma Zamanı özelliği üst iletinin Oluşturulma Zamanından sonra olmalıdır."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "Zorunlu tepki özelliği eksik: Oluşturulma Zamanı."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "Tepki Oluşturulma Zamanı özelliği sıfır olamaz."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "Tepki EmojiAdı özelliği izin verilen uzunluğu aşıyor."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "Zorunlu tepki özelliği eksik: EmojiAdı."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "Zorunlu tepki özelliği eksik: Kullanıcı."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Yanıt Oluşturulma Zamanı özelliği üst iletinin Oluşturulma Zamanından sonra olmalıdır."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "Zorunlu yanıt özelliği eksik: Oluşturulma Zamanı."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "Yanıt Oluşturulma Zamanı özelliği sıfır olamaz."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "Yanıt metni özelliği izin verilen uzunluğu aşıyor."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "Zorunlu yanıt özelliği eksik: İleti."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "Zorunlu yanıt özelliği eksik: Kullanıcı."
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "Takım için izin verilen etki alanları çok uzun."
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "Kullanıcının Konumu çok uzun."
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Profil görseli geçersiz."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "Kullanıcının Rolleri geçersiz."
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "Bitiş, başlangıç zamanından büyük olmalıdır"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Hizmet ayarlarında atmos/camo görsel vekil sunucusu ayarları geçersiz. Paylaşılmış anahtarınıza ayarlanmalıdır."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Küme özelliği etkinleştirilmişken toplu e-posta etkinleştirilemez."
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "Küçük görsel genişliği dosya ayarı geçersiz. Sıfır ya da pozitif bir sayı olmalı."
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Hizmet ayarlarında görsel vekil sunucu türü geçersiz."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "\"BaseDN\" AD/LDAP alanı zorunludur."
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "Kişisel erişim kodu alınamadı"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "Tüm kişisel erişim kodları alınamadı"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "Koda göre kişisel erişim kodu alınamadı"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "Kişisel erişim kodu kaydedilemedi"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "Kullanıcı erişim kodları aranırken bir sorun çıktı"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "Gelen web bağlantıları sayılamadı"
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index dec0da464..fb484b50d 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -153,7 +153,7 @@
   },
   {
     "id": "api.channel.add_member.added",
-    "translation": "%v 由 %v 邀请加入频道"
+    "translation": "%v 由 %v 邀请加入频道。"
   },
   {
     "id": "api.channel.add_member.find_channel.app_error",
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "只有团队和系统管理员能创建与管理公开频道。"
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "此频道已转换到公共频道并允许任何团队成员加入。"
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "此频道已转换到私有频道。"
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "必须使用 createDirectChannel API 创建私信频道"
@@ -2176,7 +2184,7 @@
   },
   {
     "id": "api.team.add_user_to_team.added",
-    "translation": "%v 由 %v 邀请加入到团队"
+    "translation": "%v 由 %v 邀请加入到团队。"
   },
   {
     "id": "api.team.add_user_to_team.missing_parameter.app_error",
@@ -2312,7 +2320,7 @@
   },
   {
     "id": "api.team.remove_user_from_team.removed",
-    "translation": "%v 已从频道移出。"
+    "translation": "%v 已移出团队。"
   },
   {
     "id": "api.team.signup_team.email_disabled.app_error",
@@ -3352,7 +3360,7 @@
   },
   {
     "id": "app.import.validate_post_import_data.create_at_zero.error",
-    "translation": "如果提供消息 CreateAt 属性则不能为零。"
+    "translation": "消息 CreateAt 属性不能为零。"
   },
   {
     "id": "app.import.validate_post_import_data.message_length.error",
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "缺少消息必须属性：User。"
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "缺少反应必须属性：create_at。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "反应 CreateAt 属性不能为零。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "反应 EmojiName 属性超过允许的最大长度。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "缺少反应必须属性：User。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "缺少反应必须属性：User。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "缺少回复必须属性：create_at。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "回复 CreateAt 属性不能为零。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "回复消息属性超过允许的最大长度。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "缺少回复必须属性：Message。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "缺少回复必须属性：User。"
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "团队 allowed_domains 过长。"
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "用户职位过长。"
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "无效个人资料图片。"
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "无效用户角色。"
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "必须比From参数大"
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "无效的 atmos/camo 图片代理设定。必须设为您的共享密钥。"
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "当机群启用时没法启动批量电子邮件。"
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "文件设置时缩略图宽度无效。必须是正数。"
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "无效的图片代理类型服务设定。"
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "AD/LDAP 栏 \"BaseDN\" 为必须。"
@@ -5336,7 +5404,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "无效位置：不能超过 35 个字符。"
+    "translation": "无效位置：不能超过 128 个字符。"
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "我们无法获取个人访问令牌"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "我们无法获取所有个人访问令牌"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "我们无法从令牌获取个人访问令牌"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "我们无法保存个人访问令牌"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "我们查找用户访问令牌时遇到一个错误"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "我们无法计算传入的 webhooks"
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 9b3af5d76..cbd7db862 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -199,6 +199,14 @@
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
     "translation": "只有團隊和系統管理員能建立與管理公開頻道。"
   },
+  {
+    "id": "api.channel.change_channel_privacy.private_to_public",
+    "translation": "This channel has been converted to a Public Channel and can be joined by any team member."
+  },
+  {
+    "id": "api.channel.change_channel_privacy.public_to_private",
+    "translation": "This channel has been converted to a Private Channel."
+  },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
     "translation": "必須使用 createDirectChannel API 服務來建立直接訊息頻道"
@@ -3370,6 +3378,54 @@
     "id": "app.import.validate_post_import_data.user_missing.error",
     "translation": "缺少必要的訊息屬性：使用者。"
   },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_before_parent.error",
+    "translation": "Reaction CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_missing.error",
+    "translation": "缺少必要的訊息屬性：建立日期。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.create_at_zero.error",
+    "translation": "如果有提供訊息建立時間，該值不能為 0。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_length.error",
+    "translation": "訊息屬性長度超過允許的最大長度"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.emoji_name_missing.error",
+    "translation": "缺少必要的訊息屬性：使用者。"
+  },
+  {
+    "id": "app.import.validate_reaction_import_data.user_missing.error",
+    "translation": "缺少必要的訊息屬性：使用者。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_before_parent.error",
+    "translation": "Reply CreateAt property must be greater than the parent post CreateAt."
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_missing.error",
+    "translation": "缺少必要的訊息屬性：建立日期。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.create_at_zero.error",
+    "translation": "如果有提供訊息建立時間，該值不能為 0。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_length.error",
+    "translation": "訊息屬性長度超過允許的最大長度"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.message_missing.error",
+    "translation": "缺少必要的訊息屬性：訊息。"
+  },
+  {
+    "id": "app.import.validate_reply_import_data.user_missing.error",
+    "translation": "缺少必要的訊息屬性：使用者。"
+  },
   {
     "id": "app.import.validate_team_import_data.allowed_domains_length.error",
     "translation": "團隊允許網域過長。"
@@ -3506,6 +3562,10 @@
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "使用者職位過長。"
   },
+  {
+    "id": "app.import.validate_user_import_data.profile_image.error",
+    "translation": "Invalid profile image."
+  },
   {
     "id": "app.import.validate_user_import_data.roles_invalid.error",
     "translation": "無效的使用者角色。"
@@ -4582,6 +4642,10 @@
     "id": "model.compliance.is_valid.start_end_at.app_error",
     "translation": "\"到\"必須大於\"起始\""
   },
+  {
+    "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error",
+    "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key."
+  },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "啟用叢集時無法啟用批次郵件"
@@ -4694,6 +4758,10 @@
     "id": "model.config.is_valid.file_thumb_width.app_error",
     "translation": "檔案設定中縮圖寬度無效。必須為正數。"
   },
+  {
+    "id": "model.config.is_valid.image_proxy_type.app_error",
+    "translation": "Invalid image proxy type for service settings."
+  },
   {
     "id": "model.config.is_valid.ldap_basedn",
     "translation": "AD/LDAP 欄位 \"BaseDN\" 為必須欄位。"
@@ -6778,6 +6846,10 @@
     "id": "store.sql_user_access_token.get.app_error",
     "translation": "無法取得個人存取 Token"
   },
+  {
+    "id": "store.sql_user_access_token.get_all.app_error",
+    "translation": "無法取得個人存取 Token"
+  },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
     "translation": "無法根據 Token 取得個人存取 Token"
@@ -6790,6 +6862,10 @@
     "id": "store.sql_user_access_token.save.app_error",
     "translation": "無法刪除儲存個人存取 Token"
   },
+  {
+    "id": "store.sql_user_access_token.search.app_error",
+    "translation": "尋找存取 Token 時遇到錯誤"
+  },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "無法計算傳入的 Webhook"
-- 
cgit v1.2.3-1-g7c22