translations PR 20170904 (#7371)

14 files changed, 2954 insertions, 2330 deletions

diff --git a/i18n/de.json b/i18n/de.json
index b987e16ff..dd98c5870 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -592,6 +592,14 @@
     "translation": "Sie haben nicht die nötigen Berechtigungen, um den Kanal umzubenennen."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Fehler beim Aktualisieren des aktuellen Kanals."
   },
@@ -844,156 +852,16 @@
     "translation": "Der Einstellungen-Befehl wird auf Ihrem Gerät nicht unterstützt"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Nächster Kanal in Ihrem Verlauf\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+RECHTS"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+RECHTS"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Vorheriger Kanal in Ihrem Verlauf\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+LINKS"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+LINKS"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MINUS: Schriftgröße verkleinern (herauszoomen)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS: Schriftgröße erhöhen (hineinzoomen)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Eingebaute Browser-Befehle\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+RUNTER (im Eingabefeld): Text bis zur nächsten Zeile auswählen\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+HOCH (im Eingabefeld): Text bis zur vorherigen Zeile auswählen\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (im Eingabefeld): Einen Zeilenumbruch einfügen\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "STRG"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Eine Liste der Tastaturkürzel anzeigen"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Dateien\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Datei(en) hochladen\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Tastaturkürzel\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[Zeichen]+TAB: Den Kanal beginnend mit [Zeichen] autovervollständigen\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[Zeichen]+TAB: Emoji beginnend mit [Zeichen] autovervollständigen\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[Zeichen]+TAB: @Benutzername beginnend mit [Zeichen] autovervollständigen\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "HOCH (im leeren Eingabefeld): Editieren Sie Ihre letzte Nachricht im aktuellen Kanal\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Mitteilungen\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Alle Nachrichten im aktuellen Kanal als gelesen markieren\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+HOCH (in einem leeren Eingabefeld): Auf die neueste Nachricht im aktuellen Kanal antworten\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+RUNTER (im leeren Eingabefeld): Die nächste Nachricht oder den nächsten Slash-Befehl anzeigen\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+HOCH (im leeren Eingabefeld): Die vorherige Nachricht oder den vorherigen Slash-Befehl anzeigen\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "tastaturkürzel"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Direktnachrichten-Menü öffnen\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Navigation\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+RUNTER: Nächsten Kanal oder Direktnachricht in der linken Seitenleiste\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+HOCH: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Letzten Erwähnungen öffnen\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Kontoeinstellungen öffnen\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: Den Kanalschnellwechsler öffnen\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K: Den Teamschnellwechsler-Dialog öffnen\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+RUNTER: Nächster Kanal oder Direktnachricht mit ungelesenen Nachrichten in der linken Seitenleiste\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+HOCH: Vorheriger Kanal oder Direktnachricht mit ungelesenen Nachrichten in der linken Seitenleiste\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "Der Kurzbefehl wird auf Ihrem Gerät nicht unterstützt"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "Die Datei kann lokal nicht verschoben werden."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "Dateispeicher wurde nicht vollständig konfiguriert. Bitte konfigurieren Sie diesen entweder für S3 oder einen lokalen Server mit Dateispeicher."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Ein Fehler bei der Erstellung des Verzeichnisses für die neue Datei ist aufgetreten"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Fehler beim Schreiben in den lokalen Serverspeicher"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 wird nicht unterstützt."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "Dateispeicher wurde nicht vollständig konfiguriert. Bitte konfigurieren Sie diesen entweder für S3 oder einen lokalen Server mit Dateispeicher."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Initialisiere Open Graph Protocol API-Routen"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} und {{.LastUsername}} wurden erwähnt, aber sie haben keine Benachrichtigung erhalten, weil sie nicht im Kanal sind."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Ungültiger RootId Parameter"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Fehler beim Erstellen des Eintrages"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here wurde deaktiviert, da der Kanal mehr als {{.Users}} Benutzer hat."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Ungültige Client-ID"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} Datei versendet: {{.Filenames}}",
@@ -2501,11 +2377,11 @@
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "Benutzer-Zugriffs-Token zu Ihrem Konto hinzugefügt"
+    "translation": "Persönliches Zugriffs-Token zu Ihrem Konto hinzugefügt"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] Benutzer-Zugriffs-Token zu Ihrem Konto hinzugefügt"
+    "translation": "[{{ .SiteName }}] Persönliches Zugriffs-Token zu Ihrem Konto hinzugefügt"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2829,7 +2705,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt."
+    "translation": "SAML 2.0 ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Konnte \"Benutzer-Zugriffs-Token hinzugefügt\"-E-Mail nicht erfolgreich versenden"
+    "translation": "Konnte \"Persönliches Zugriffs-Token hinzugefügt\"-E-Mail nicht erfolgreich versenden"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "Es muss eine Team-ID angegeben werden um einen Kanal zu erstellen"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Fehler beim Senden des Kanalzwecks"
   },
@@ -3560,8 +3440,48 @@
     "translation": "[{{ .SiteName }}] Benachrichtigung in {{ .TeamName}} am {{.Day}}.{{.Month}}.{{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Konnte Reaktion nicht löschen"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Konnte Reaktion nicht löschen"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Konnte Reaktion nicht löschen"
+  },
+  {
     "id": "app.user_access_token.disabled",
-    "translation": "Benutzer-Zugriffs-Token sind auf diesem Server deaktiviert. Bitte kontaktieren Sie ihren Systemadministrator für Details."
+    "translation": "Persönliche Zugriffs-Token sind auf diesem Server deaktiviert. Bitte kontaktieren Sie ihren Systemadministrator für Details."
   },
   {
     "id": "app.user_access_token.invalid_or_missing",
@@ -3593,11 +3513,11 @@
   },
   {
     "id": "authentication.permissions.create_user_access_token.description",
-    "translation": "Fähigkeit zum Erstellen von Benutzer-Zugriffs-Token"
+    "translation": "Fähigkeit zum Erstellen von persönlichen Zugriffs-Token"
   },
   {
     "id": "authentication.permissions.create_user_access_token.name",
-    "translation": "Benutzer-Zugriffs-Token erstellen"
+    "translation": "Persönlichen Zugriffs-Token erstellen"
   },
   {
     "id": "authentication.permissions.manage_jobs.description",
@@ -3625,19 +3545,19 @@
   },
   {
     "id": "authentication.permissions.read_user_access_token.description",
-    "translation": "Fähigkeit zum Lesen der Felder id, description and user_id von Benutzer-Zugriffs-Token"
+    "translation": "Fähigkeit zum Lesen der Felder id, description and user_id von persönlichen Zugriffs-Token"
   },
   {
     "id": "authentication.permissions.read_user_access_token.name",
-    "translation": "Benutzer-Zugriffs-Token lesen"
+    "translation": "Persönliche Zugriffs-Token lesen"
   },
   {
     "id": "authentication.permissions.revoke_user_access_token.description",
-    "translation": "Fähigkeit zum Widerrufen von Benutzer-Zugriffs-Token"
+    "translation": "Fähigkeit zum Widerrufen von persönlichen Zugriffs-Token"
   },
   {
     "id": "authentication.permissions.revoke_user_access_token.name",
-    "translation": "Benutzer-Zugriffs-Token widerrufen"
+    "translation": "Persönlichen Zugriffs-Token widerrufen"
   },
   {
     "id": "authentication.permissions.team_invite_user.description",
@@ -3673,11 +3593,11 @@
   },
   {
     "id": "authentication.roles.system_user_access_token.description",
-    "translation": "Eine Rolle mit den Berechtigungen zum Erstellen, Lesen und Widerrufen von Benutzer-Zugriffs-Token"
+    "translation": "Eine Rolle mit den Berechtigungen zum Erstellen, Lesen und Widerrufen von persönlichen Zugriffs-Token"
   },
   {
     "id": "authentication.roles.system_user_access_token.name",
-    "translation": "Benutzer-Zugriffs-Token"
+    "translation": "Persönlicher Zugriffs-Token"
   },
   {
     "id": "authentication.roles.team_post_all.description",
@@ -3788,6 +3708,22 @@
     "translation": "Compliance Export gestartet für Job '{{.JobName}}' in '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch-Aggregator-Worker konnte den Indizierungs-Job nicht erstellen"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch-Aggregator-Worker konnte die Indexe nicht löschen"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch-Aggregator-Worker konnte Indexe nicht abrufen"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch-Aggregator-Worker ist fehlgeschlagen, da der Indizierungs-Job fehlgeschlagen ist"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Fehler beim Einrichten des ElasticSearch-Client"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Indizierung der Nachricht fehlgeschlagen"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch-Aggregator-Worker konnte die Endzeit nicht verarbeiten"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch-Aggregator-Worker konnte die Startzeit nicht verarbeiten"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch ist nicht gestartet"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt."
+    "translation": "SAML 2.0 ist auf diesem Server nicht konfiguriert oder wird nicht unterstützt."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "Fehler bei der Erstellung der SAML Zertifikat Multipart Form Anfrage"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Erstellt am muss eine gültige Zeit sein"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Ungültige Benutzer-ID"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Ungültige Kanal-ID"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Ungültige Befehls-ID"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "\"Erstellt am\" muss eine gültige Zeit sein"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Ungültige Befehls-Hook-ID"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Ungültige Vorgänger-ID"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Ungültige Root-ID"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Ungültige Benutzer-ID"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Erstellt am muss eine gültige Zeit sein"
   },
@@ -4420,6 +4396,10 @@
     "translation": "E-Mail-Stapelverarbeitung lässt sich bei aktiviertem Clustering nicht aktivieren."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays-Einstellung muss eine Zahl sein, die größer als oder gleich 1 ist"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "ElasticSearch-Einstellung ConnectionUrl muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
@@ -4432,6 +4412,10 @@
     "translation": "ElasticSearch-Einstellung Passwort muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime-Einstellung muss eine Uhrzeit im Format \"hh:mm\" sein"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "ElasticSearch-Einstellung Benutzername muss angegeben sein, wenn Elastic-Search-Indizierung aktiviert ist."
   },
@@ -5176,6 +5160,10 @@
     "translation": "Konnte nicht dekodieren"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error invoking plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Fehler beim Anpassen des Spaltentyps %v"
   },
@@ -5281,7 +5269,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Datenbankschema-Version %v wird nicht länger unterstützt. Dieser Mattermost-Server unterstützt automatische Upgrades von Schema-Version %v bis %v. Downgrades werden nicht unterstützt. Bitte aktualisieren Sie manuell auf mindestens Version %v bevor Sie fortfahren."
+    "translation": "Datenbankschema-Version %v wird nicht länger unterstützt. Dieser Mattermost-Server unterstützt automatische Upgrades von Schema-Version %v bis %v. Downgrades werden nicht unterstützt. Bitte aktualisieren Sie manuell auf mindestens Version %v, bevor Sie fortfahren."
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5596,6 +5584,26 @@
     "translation": "Der Befehl konnte nicht aktualisiert werden"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Der Webhook konnte nicht gefunden werden"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "Der CommandWebhook konnte nicht gespeichert werden"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "Sie können einen existierenden CommandWebhook nicht aktualisieren"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Kann den Webhook nicht verwenden"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Ungültiger Webhook"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Beim Empfang des Compliance-Berichtes wurde ein Fehler festgestellt"
   },
@@ -5648,6 +5656,10 @@
     "translation": "Die Dateiinformationen konnten nicht für den Beitrag abgerufen werden"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "Die Dateiinformationen konnten nicht gespeichert werden"
   },
@@ -6405,23 +6417,23 @@
   },
   {
     "id": "store.sql_user_access_token.delete.app_error",
-    "translation": "Das Benutzer-Zugriffs-Token konnte nicht entfernt werden"
+    "translation": "Das persönliche Zugriffs-Token konnte nicht entfernt werden"
   },
   {
     "id": "store.sql_user_access_token.get.app_error",
-    "translation": "Das Benutzer-Zugriffs-Token konnte nicht abgerufen werden"
+    "translation": "Das persönliche Zugriffs-Token konnte nicht abgerufen werden"
   },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
-    "translation": "Das Benutzer-Zugriffs-Token konnte nicht über Token abgerufen werden"
+    "translation": "Das persönliche Zugriffs-Token konnte nicht über Token abgerufen werden"
   },
   {
     "id": "store.sql_user_access_token.get_by_user.app_error",
-    "translation": "Die Benutzer-Zugriffs-Token konnten nicht über den Benutzer abgerufen werden"
+    "translation": "Die persönliche Zugriffs-Token konnten nicht über den Benutzer abgerufen werden"
   },
   {
     "id": "store.sql_user_access_token.save.app_error",
-    "translation": "Das Benutzer-Zugriffs-Token konnte nicht gespeichert werden"
+    "translation": "Das persönliche Zugriffs-Token konnte nicht gespeichert werden"
   },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
@@ -6509,7 +6521,7 @@
   },
   {
     "id": "utils.config.add_client_locale.app_error",
-    "translation": "Konnte Mattermost-Konfigurationsdatei nicht laden:  Fügre DefaultClientLocale zu AvailableLocales hinzu."
+    "translation": "Konnte Mattermost-Konfigurationsdatei nicht laden:  Füge DefaultClientLocale zu AvailableLocales hinzu."
   },
   {
     "id": "utils.config.load_config.decoding.panic",
@@ -6533,7 +6545,7 @@
   },
   {
     "id": "utils.config.supported_available_locales.app_error",
-    "translation": "Konnte Mattermost-Konfigurationsdatei nicht laden:  AvailableLocales muss DefaultClientLocale enthalten. Setze AvailableLocales auf alle Übersetzungen als Standardwert."
+    "translation": "Konnte Mattermost-Konfigurationsdatei nicht laden:  AvailableLocales muss DefaultClientLocale enthalten. Setze AvailableLocales für alle Übersetzungen als Standardwert."
   },
   {
     "id": "utils.config.supported_client_locale.app_error",
@@ -6552,6 +6564,30 @@
     "translation": "Analytics nicht initialisiert"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Der Dateispeicher ist nicht korrekt konfiguriert. Bitte konfigurieren Sie diesen entweder für S3 oder den Dateispeicher des lokalen Servers."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Ein Fehler während des Lesens vom lokalen Server ist aufgetreten"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Der Dateispeicher ist nicht korrekt konfiguriert. Bitte konfigurieren Sie diesen entweder für S3 oder den Dateispeicher des lokalen Servers."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Ein Fehler während des Lesens vom lokalen Server ist aufgetreten"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Systemübersetzungen geladen für '%v' von '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Benutzer konnte nicht gefunden werden teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Der Befehl konnte nicht gefunden werden"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Ungültiger Webhook"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Konnte eingehende Daten nicht verarbeiten"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Fehler beim Erstellen der Ordner Überwachung %v"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 138241c5a..5f7aadcb2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -404,58 +404,6 @@
     "translation": "Invalid permissions to delete command"
   },
   {
-    "id": "app.plugin.disabled.app_error",
-    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
-  },
-  {
-    "id": "app.plugin.extract.app_error",
-    "translation": "Encountered error extracting plugin"
-  },
-  {
-    "id": "app.plugin.no_files.app_error",
-    "translation": "No files found in the compressed folder"
-  },
-  {
-    "id": "app.plugin.bad_path.app_error",
-    "translation": "Bad file path in extracted files"
-  },
-  {
-    "id": "app.plugin.manifest.app_error",
-    "translation": "Unable to find manifest for extracted plugin"
-  },
-  {
-    "id": "app.plugin.mvdir.app_error",
-    "translation": "Unable to move plugin from temporary directory to final destination"
-  },
-  {
-    "id": "app.plugin.activate.app_error",
-    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
-  },
-  {
-    "id": "app.plugin.get_plugins.app_error",
-    "translation": "Unable to get active plugins"
-  },
-  {
-    "id": "app.plugin.deactivate.app_error",
-    "translation": "Unable to deactivate plugin"
-  },
-  {
-    "id": "app.plugin.remove.app_error",
-    "translation": "Unable to delete plugin"
-  },
-  {
-    "id": "api.plugin.upload.no_file.app_error",
-    "translation": "Missing file in multipart/form request"
-  },
-  {
-    "id": "api.plugin.upload.array.app_error",
-    "translation": "File array is empty in multipart/form request"
-  },
-  {
-    "id": "api.plugin.upload.file.app_error",
-    "translation": "Unable to open file in multipart/form request"
-  },
-  {
     "id": "api.command.disabled.app_error",
     "translation": "Commands have been disabled by the system admin."
   },
@@ -636,14 +584,6 @@
     "translation": "A message must be provided with the /rename command."
   },
   {
-    "id": "api.command_channel_rename.too_long.app_error",
-    "translation": "Channel name must be {{.Length}} or fewer characters"
-  },
-  {
-    "id": "api.command_channel_rename.too_short.app_error",
-    "translation": "Channel name must be {{.Length}} or more characters"
-  },
-  {
     "id": "api.command_channel_rename.name",
     "translation": "rename"
   },
@@ -652,6 +592,14 @@
     "translation": "You do not have the appropriate permissions to rename the channel."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Error to update the current channel."
   },
@@ -1306,30 +1254,6 @@
     "translation": "Encountered an error reading from local server storage"
   },
   {
-    "id": "utils.file.remove_file.local.app_error",
-    "translation": "Encountered an error removing file from local server file storage."
-  },
-  {
-    "id": "utils.file.remove_file.s3.app_error",
-    "translation": "Encountered an error removing file from S3."
-  },
-  {
-    "id": "utils.file.remove_file.configured.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
-  },
-  {
-    "id": "utils.file.remove_directory.local.app_error",
-    "translation": "Encountered an error removing directory from local server file storage."
-  },
-  {
-    "id": "utils.file.remove_directory.s3.app_error",
-    "translation": "Encountered an error removing directory from S3."
-  },
-  {
-    "id": "utils.file.remove_directory.configured.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
-  },
-  {
     "id": "api.file.upload_file.bad_parse.app_error",
     "translation": "Unable to upload file. Header cannot be parsed."
   },
@@ -1590,6 +1514,18 @@
     "translation": "Initializing open graph protocol api routes"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} and {{.LastUsername}} were mentioned, but they did not receive notifications because they do not belong to this channel."
   },
@@ -1658,6 +1594,14 @@
     "translation": "@here has been disabled because the channel has more than {{.Users}} users."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Invalid action id"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} file sent: {{.Filenames}}",
@@ -1816,14 +1760,6 @@
     "translation": "Unable to get post"
   },
   {
-    "id": "api.post.do_action.action_id.app_error",
-    "translation": "Invalid action id"
-  },
-  {
-    "id": "api.post.do_action.action_integration.app_error",
-    "translation": "Action integration error"
-  },
-  {
     "id": "api.preference.delete_preferences.decode.app_error",
     "translation": "Unable to decode preferences from request"
   },
@@ -3504,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Unable to deactivate plugin"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Unable to get active plugins"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Unable to delete plugin"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
   },
@@ -3732,10 +3708,6 @@
     "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
-    "translation": "Elasticsearch aggregator worker failed to get indexes"
-  },
-  {
     "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
     "translation": "Elasticsearch aggregator worker failed to create the indexing job"
   },
@@ -3744,16 +3716,12 @@
     "translation": "Elasticsearch aggregator worker failed to delete the indexes"
   },
   {
-    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
-    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
-  },
-  {
-    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
-    "translation": "Elasticsearch indexing worker failed to parse the start time"
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
   },
   {
-    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
-    "translation": "Elasticsearch indexing worker failed to parse the end time"
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
   },
   {
     "id": "ent.elasticsearch.create_client.connect_failed",
@@ -3784,6 +3752,14 @@
     "translation": "Failed to index the post"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch is not started"
   },
@@ -4248,10 +4224,6 @@
     "translation": "Invalid user id"
   },
   {
-    "id": "model.client.writer.app_error",
-    "translation": "Unable to build multipart request"
-  },
-  {
     "id": "model.client.connecting.app_error",
     "translation": "We encountered an error while connecting to the server"
   },
@@ -4316,6 +4288,10 @@
     "translation": "Error creating SAML certificate multipart form request"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
@@ -4364,6 +4340,34 @@
     "translation": "Invalid user id"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Invalid channel id"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Invalid command id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Create at must be a valid time"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Invalid command hook id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Invalid parent id"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Invalid root id"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Invalid user id"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
@@ -4392,6 +4396,10 @@
     "translation": "Unable to enable email batching when clustering is enabled."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
   },
@@ -4404,18 +4412,14 @@
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
   {
-    "id": "model.config.is_valid.elastic_search.username.app_error",
-    "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
-  },
-  {
-    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
-    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
-  },
-  {
     "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
     "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
   },
   {
+    "id": "model.config.is_valid.elastic_search.username.app_error",
+    "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
+  },
+  {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
     "translation": "Invalid email batching buffer size for email settings.  Must be zero or a positive number."
   },
@@ -4764,34 +4768,6 @@
     "translation": "Invalid job type"
   },
   {
-    "id": "model.command_hook.id.app_error",
-    "translation": "Invalid command hook id"
-  },
-  {
-    "id": "model.command_hook.create_at.app_error",
-    "translation": "Create at must be a valid time"
-  },
-  {
-    "id": "model.command_hook.command_id.app_error",
-    "translation": "Invalid command id"
-  },
-  {
-    "id": "model.command_hook.user_id.app_error",
-    "translation": "Invalid user id"
-  },
-  {
-    "id": "model.command_hook.channel_id.app_error",
-    "translation": "Invalid channel id"
-  },
-  {
-    "id": "model.command_hook.root_id.app_error",
-    "translation": "Invalid root id"
-  },
-  {
-    "id": "model.command_hook.parent_id.app_error",
-    "translation": "Invalid parent id"
-  },
-  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Invalid app id"
   },
@@ -5608,6 +5584,26 @@
     "translation": "We couldn't update the command"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "We couldn't get the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "We couldn't save the CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "You cannot update an existing CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Unable to use the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Invalid webhook"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "We encountered an error retrieving the compliance reports"
   },
@@ -5660,6 +5656,10 @@
     "translation": "We couldn't get the file info for the post"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "We couldn't save the file info"
   },
@@ -5668,10 +5668,6 @@
     "translation": "We couldn't save or update the file info"
   },
   {
-    "id": "store.sql_file_info.permanent_delete.app_error",
-    "translation": "We couldn't permanently delete the file info"
-  },
-  {
     "id": "store.sql_job.delete.app_error",
     "translation": "We couldn't delete the job"
   },
@@ -6520,26 +6516,6 @@
     "translation": "We couldn't update the webhook"
   },
   {
-    "id": "store.sql_command_webhooks.save.existing.app_error",
-    "translation": "You cannot update an existing CommandWebhook"
-  },
-  {
-    "id": "store.sql_command_webhooks.save.app_error",
-    "translation": "We couldn't save the CommandWebhook"
-  },
-  {
-    "id": "store.sql_command_webhooks.get.app_error",
-    "translation": "We couldn't get the webhook"
-  },
-  {
-    "id": "store.sql_command_webhooks.try_use.app_error",
-    "translation": "Unable to use the webhook"
-  },
-  {
-    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
-    "translation": "Invalid webhook"
-  },
-  {
     "id": "system.message.name",
     "translation": "System"
   },
@@ -6588,6 +6564,30 @@
     "translation": "Analytics not initialized"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Encountered an error removing directory from local server file storage."
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Encountered an error removing file from local server file storage."
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Loaded system translations for '%v' from '%v'"
   },
@@ -6700,6 +6700,18 @@
     "translation": "Couldn't find user teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Couldn't find the command"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Invalid webhook"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Unable to parse incoming data"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Failed to create directory watcher %v"
   },
@@ -6764,18 +6776,6 @@
     "translation": "Couldn't find the user"
   },
   {
-    "id": "web.command_webhook.parse.app_error",
-    "translation": "Unable to parse incoming data"
-  },
-  {
-    "id": "web.command_webhook.invalid.app_error",
-    "translation": "Invalid webhook"
-  },
-  {
-    "id": "web.command_webhook.command.app_error",
-    "translation": "Couldn't find the command"
-  },
-  {
     "id": "web.init.debug",
     "translation": "Initializing web routes"
   },
diff --git a/i18n/es.json b/i18n/es.json
index c55f728f0..3d5a60bf7 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -592,6 +592,14 @@
     "translation": "No tienes los permisos adecuados para renombrar el canal."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Nombre del canal debe ser de {{.Length}} caracteres o menos"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Nombre del canal debe ser de {{.Length}} o más caracteres"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Error al actualizar el canal actual."
   },
@@ -844,156 +852,16 @@
     "translation": "El comando de configuración no es compatible con tu dispositivo"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: canal Siguiente en el historial\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+DER"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: canal Anterior en el historial\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+IZQ"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MENOS: Disminuir tamaño de la fuente (alejar)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+MAS: Aumentar tamaño de la fuente (acercar)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Comandos incluidos en el Navegador\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "MAYUS+ABAJO (en el cuadro de texto): Selecciona el texto de las linea siguiente\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "MAYUS+ARRIBA (en el cuadro de texto): Selecciona el texto de las línea anterior\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "MAYUS+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Muestra una lista de los accesos rápidos de teclado"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Archivos\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Subir archivo(s)\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Atajos de Teclado\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[carácter]+TAB: Auto completa el canal que comience por [carácter]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[carácter]+TAB: Auto completa el emoticon que comience por [carácter]\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "ARRIBA (con el cuadro de texto vacío): Edita el último mensaje en el canal actual\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Mensajes\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Marca todos los mensajes como leídos en el canal actual\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "MAYÚS+ARRIBA (en el campo de entrada vacío): Responder al mensaje más reciente en el canal actual\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "accesos rápidos de teclado"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+MAYÚS+K: Abre el menú de mensajes directos\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Navegación\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+MAYUS+M: Abre las menciones recientes\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+MAYUS+A: Abre la configuración de la cuenta\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+K: Abre un dialogo para cambiar rápidamente de canal\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "El comando de accesos rápidos no es compatible con tu dispositivo"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "No se pudo mover el archivo localmente."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "El almacenamiento de archivos no ha sido configurado apropiadamente. Por favor configuralo ya sea para S3 o para almacenamiento en el servidor local."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Se encontró un error al crear el directorio para el nuevo archivo"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Se encontró un error al escribir en el almacenamiento del servidor local"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 no está soportado."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "El almacenamiento de archivos no ha sido configurado apropiadamente. Por favor configuralo ya sea para S3 o para almacenamiento en el servidor local."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Inicializando rutas del API para el protocolo open graph"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "Matriz de archivo está vacía en la solicitud multipart/form"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "No se puede abrir el archivo en la solicitud multipart/form"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Falta el archivo en la solicitud multipart/form"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} y {{.LastUsername}} fueron mencionados, pero no recibieron una notificación porque no pertenecen a este canal."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Parámetro RootId inválido"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "Este canal es de sólo lectura. Sólo los miembros con permiso pueden publicar aquí."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Error creando el mensaje"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here ha sido desactivado debido a que el canal tiene más de {{.Users}} usuarios."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Id de acción no válida"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Error en la acción de la integración"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} archivo enviado: {{.Filenames}}",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "Un token de acceso de usuario ha sido agregado a tu cuenta en {{ .SiteURL }}. El token puede ser utilizado para accesar {{.SiteName}} con tu cuenta.<br>Si este cambió no fue realizado por ti, por favor contacta a tu administrador del sistema."
+    "translation": "Un token de acceso personal ha sido agregado a tu cuenta en {{ .SiteURL }}. El token puede ser utilizado para accesar {{.SiteName}} con tu cuenta.<br>Si este cambió no fue realizado por ti, por favor contacta a tu administrador del sistema."
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "Token de acceso de usuario agregado a tu cuenta"
+    "translation": "Token de acceso personal agregado a tu cuenta"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] Token de acceso de usuario añadido a tu cuenta"
+    "translation": "[{{ .SiteName }}] Token de acceso personal añadido a tu cuenta"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2829,7 +2705,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML no está configurado o no es soportado en este servidor"
+    "translation": "SAML 2.0 no está configurado o no es soportado en este servidor"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Error al enviar correo electrónico de token de acceso de usuario añadido correctamente"
+    "translation": "Error al enviar correo electrónico de token de acceso personal añadido correctamente"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "Debe especificar el ID del equipo crear un canal"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "No pudo publicar el mensaje del propósito del canal"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notificación en {{ .TeamName}} el {{.Day}} {{.Month}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "No se puede activar el plugin extraído. Puede que el plugin ya exista y esté activo."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Mala ruta de archivo en archivos extraídos"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "No puede desactivar el plugin"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Se encontró un error al extraer el plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "No se puede obtener los plugins activos"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "No se puede encontrar el manifiesto del plugin extraído"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "No se puede mover el plugin desde el directorio temporal a destino final"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No se encontraron archivos en la carpeta comprimida"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "No se puede eliminar el plugin"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Los tokens de acceso personal están inhabilitados en este servidor. Por favor, póngase en contacto con su administrador del sistema para obtener más detalles."
   },
@@ -3788,6 +3708,22 @@
     "translation": "Iniciado el trabajo '{{.JobName}}' para exportar el Cumplimiento en '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "El agregador trabajos de Elasticsearch no pudo crear el trabajo de indexación"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "El agregador trabajos de Elasticsearch no pudo eliminar los índices"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "El agregador trabajos de Elasticsearch no pudo obtener los índices"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "El agregador trabajos de Elasticsearch falló debido a que hay un trabajo indexación fallando"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "La configuración del cliente de Elasticsearch falló"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Error al indexar el mensaje"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "El trabajo de Elasticsearch falló al analizar la hora de finalización"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "El trabajo de Elasticsearch falló al analizar la hora de inicio"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch no se ha iniciado"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML no está configurado o no es soportado en este servidor"
+    "translation": "SAML 2.0 no está configurado o no es soportado en este servidor"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "Error al crear la solicitud multiparte del certificado SAML"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Incapaz de construir una solicitud multipart"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Fecha de Creación debe ser válida"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Id de usuario inválido"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Id de canal no válido"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "ID de commando no válido"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Create debe ser un tiempo válido"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Comando con hook id no válido"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Id del padre no es válido"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Id de la raíz no es válido"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Id de usuario no válido"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Create debe ser una fecha válida"
   },
@@ -4420,6 +4396,10 @@
     "translation": "No se puede habilitar el correo electrónico por lotes cuando la agrupación de servidores está habilitada"
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "El valor AggregatePostsAfterDays de Elasticsearch debe ser un número mayor que o igual a 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "El valor de Elastic Search ConnectionUrl debe ser proporcionado cuando está habilitado la indización de Elastic Search."
   },
@@ -4432,6 +4412,10 @@
     "translation": "El valor de Elastic Search Password debe ser proporcionado cuando está habilitado la indización de Elastic Search."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "El ajuste PostsAggregatorJobStartTime de Elasticsearch debe ser un tiempo en el formato \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "El valor de Elastic Search Username debe ser proporcionado cuando está habilitado la indización de Elastic Search."
   },
@@ -5176,6 +5160,10 @@
     "translation": "no se puede decodificar"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error al invocar el plugin de RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Falla al alterar el tipo de la columna %v"
   },
@@ -5596,6 +5584,26 @@
     "translation": "No pudimos actualizar el comando"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "No pudimos obtener el webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "No pudimos guardar el Comando o Webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "No puedes actualizar un Comando o Webhook existente"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "No se puede utilizar el webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Webhook no válido"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Se ha detectado un error al recuperar los informes de cumplimiento"
   },
@@ -5648,6 +5656,10 @@
     "translation": "No pudimos obtener la información del archivo para el mensaje"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "No pudimos eliminar permanentemente la información del archivo"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "No pudimos guardar la información del archivo"
   },
@@ -6552,6 +6564,30 @@
     "translation": "Analytics no se ha inicializado"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Almacenamiento de archivos no está correctamente configurado. Por favor, configurar, ya sea para S3 o almacenamiento de archivos en el servidor local."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Se encontró un error al eliminar el directorio en el almacenamiento en el servidor local."
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Se encontró un error al eliminar el directorio en S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Almacenamiento de archivos no está correctamente configurado. Por favor, configurar, ya sea para S3 o almacenamiento de archivos en el servidor local."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Se encontró un error eliminar el archivo del almacenamiento en el servidor local"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Se encontró un error al eliminar el archivo en S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Cargada traducciones del sistema para '%v' desde '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "No se encotró el usuario teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "No se encontró el comando"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Webhook no válido"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "No se puede analizar la data entrante"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Falla al crear el vigilante de directorio %v"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 79013486d..c41bc142d 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -592,6 +592,14 @@
     "translation": "Vous ne disposez pas des permissions requises pour renommer le canal."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Une erreur s'est produite lors de la mise à jour du canal courant."
   },
@@ -844,156 +852,16 @@
     "translation": "La commande de paramètres n'est pas supportée sur votre périphérique"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}} : Canal suivant dans votre historique\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+DROITE"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}} : Canal précédent dans votre historique\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+GAUCHE"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MOINS : Diminue la taille de la police de caractères (zoom arrière)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS : Augmente la taille de la police de caractères (zoom avant)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Commandes intégrées au navigateur\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "MAJ+BAS (dans le champ de saisie) : Sélectionne le texte jusqu'à la ligne suivante\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "MAJ+HAUT (dans le champ de saisie) : Sélectionne le texte jusqu'à la ligne précédente\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "MAJ+ENTREE (dans le champ de saisie) : Crée une nouvelle ligne\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Raccourcis clavier"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Fichiers\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U : Envoie des fichiers\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Raccourcis clavier\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[caractère]+TAB : Complète automatiquement le nom du canal commençant par [caractère]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[caractère]+TAB: Complète automatiquement l'émoticône commençant par [caractère]\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[caractère]+TAB : Complète automatiquement le nom d'@utilisateur commençant par [caractère]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "HAUT (dans le champ de saisie vide) : Édite le denier message du canal en cours\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Messages\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ECHAP : Marque tous les messages du canal en cours comme lus\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "MAJ+HAUT (dans le champ de saisie vide) : Répond au message le plus récent dans le canal en cours\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+BAS (dans le champ de saisie vide) : Affiche à nouveau le message ou la commande slash suivants que vous avez spécifiés\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+HAUT (dans le champ de saisie vide) : Affiche à nouveau le message ou la commande slash précédents que vous avez spécifiés\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "raccourcis clavier"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+MAJ+K: Ouvre le menu des messages privés\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Navigation\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+BAS : Canal ou message privé suivants de la barre latérale gauche\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+HAUT : Canal ou message privé précédents de la barre latérale gauche\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+MAJ+M : Ouvre les mentions récentes\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A : Ouvre les paramètres du compte\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K : Ouvre une une boite de dialogue permettant de passer rapidement d'un canal à l'autre\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+K : Ouvre une boite de dialogue permettant de passer rapidement d'un canal à l'autre\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+MAJ+BAS : Canal ou message privé suivants de la barre latérale gauche comportant des messages non lus\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+MAJ+HAUT : Canal ou message privé précédents de la barre latérale gauche comportant des messages non lus\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "La commande de recherche n'est pas supportée sur votre périphérique"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "Impossible de déplacer le fichier en local."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Une erreur est survenue lors de la création du dossier pour le nouveau fichier"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Une erreur est survenue lors de l'écriture sur le stockage local du serveur"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 n'est pas supporté."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Initialisation des routes de l'API du protocole Open Graph"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} et {{.LastUsername}} ont été mentionnés, mais, ne faisant pas partie de ce canal, ils ne recevront pas de notifications."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Paramètre RootId invalide"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Erreur lors de la création du message"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here a été désactivé car le canal a plus de {{.Users}} utilisateurs."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Id client invalide"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} fichier envoyé : {{.Filenames}}",
@@ -3120,6 +2996,10 @@
     "translation": "Veuillez spécifier l'identifiant d'équipe afin de créer un canal"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Impossible de publier la description du canal"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{.SiteName}}] Notification dans {{.TeamName}} le {{.Day}}/{{.Month}}/{{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Impossible de supprimer la réaction"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Impossible de supprimer la réaction"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Impossible de supprimer la réaction"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Les jetons d'accès personnel sont désactivés sur ce serveur. Veuillez contacter votre administrateur système pour plus d'informations."
   },
@@ -3788,6 +3708,22 @@
     "translation": "L'export de compatibilité a démarré pour le job '{{.JobName}}' à '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "La configuration du client Elasticsearch a échoué"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Impossible d'indexer le message"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch n'est pas démarré"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML n'est pas configuré ou supporté sur ce serveur"
+    "translation": "SAML n'est pas configuré ou supporté sur ce serveur."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "Erreur lors de la création de la requête pour le formulaire multipart pour le certificat SAML"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "La date de création doit être une date valide"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Id utilisateur invalide"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Id canal invalide"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Invalid command id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "La date de création doit être une date valide"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Invalid command hook id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Id parent invalide"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Id racine invalide"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Id utilisateur invalide"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "La date de création doit être une date valide"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Impossible d'activer l'envoi d'e-mails par lot lorsque le clustering est activé"
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Le paramètre ConnectionUrl d'ElasticSearch doit être spécifié lorsque l'indexation avec ElasticSearch est activée."
   },
@@ -4432,6 +4412,10 @@
     "translation": "Le paramètre Password d'ElasticSearch doit être spécifié lorsque l'indexation avec ElasticSearch est activée."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Le paramètre Username d'ElasticSearch doit être spécifié lorsque l'indexation avec ElasticSearch est activée."
   },
@@ -5176,6 +5160,10 @@
     "translation": "impossible de décoder"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error invoking plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Impossible de modifier le type de la colonne %v"
   },
@@ -5596,6 +5584,26 @@
     "translation": "Nous n'avons as pu mettre à jour la commande"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Impossible de récupérer le webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "Impossible d'enregistrer le IncomingWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "You cannot update an existing CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Unable to use the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Webhook invalide"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Nous avons rencontré une erreur durant le chargement des rapports de conformité"
   },
@@ -5648,6 +5656,10 @@
     "translation": "Impossible de récupérer l'information du fichier du message"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "Impossible de sauvegarder l'information du fichier"
   },
@@ -6552,6 +6564,30 @@
     "translation": "Analytics non initialisé"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Une erreur est survenue lors de la lecture depuis le stockage local du serveur"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Une erreur est survenue lors de la lecture depuis le stockage local du serveur"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Traduction chargées de '%v' vers '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Impossible de trouver l'utilisateur teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Impossible de trouver le canal"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Webhook invalide"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Impossible d'analyser les données entrantes"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Échec de la création de l'observateur de dossier %v"
   },
diff --git a/i18n/it.json b/i18n/it.json
index f7dc32996..bb9f08fea 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_default_channels.town_square",
-    "translation": "Piazza Grande"
+    "translation": "Piazza"
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
@@ -592,6 +592,14 @@
     "translation": "Non si dispone dei permessi necessari per rinominare il canale."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Il nome del canale deve essere lungo al masimo {{.Length}} caratteri"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Il nome del canale deve essere lungo almeno {{.Length}} caratteri"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Errore nell'aggiornamento del canale."
   },
@@ -844,156 +852,16 @@
     "translation": "Le impostazioni non sono disponibili sul tuo dispositivo"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Canale successivo della tua cronologia\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+FRECCIA DESTRA"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Canale precedente della tua cronologia\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+FRECCIA SINISTRA"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+SEGNO MENO: Riduce la dimensione del carattere (zoom out)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+SEGNO PIÙ: Aumenta la dimensione del carattere (zoom in)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Comandi Browser\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "MAIUSC + GIU' (nel campo di inserimento): Seleziona la prossima riga\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "MAIUSC + SU' (nel campo di inserimento): Seleziona la riga precedente\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "MAIUSC + INVIO (nel campo di inserimento): Crea una nuova linea\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Mostra una lista di scorciatoie di tastiera"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### File\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: File Caricati\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Scorciatoie da tastiera\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[carattere]+TAB: Autocompleta con il nome del canale che inizia con il carattere [carattere]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[character]+TAB: Autocompleta l'emoji che inizia per [character]\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[carattere]+TAB: Autocompleta @nomeutente che inizia con [carattere]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "SU (in un campo vuoto): Modifica l'ultimo messaggio nel canale attuale\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Messaggi\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Marca tutti i messaggi nel canale corrente come letti\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "MAIUSCOLO+SU (in campo input vuoto): Rispondi al messaggio più recente nel canale corrente\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+GIU (in un campo vuoto): Riscrive l'ultimo messaggio o comando slash inserito\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+ SU (in un campo vuoto): Riscrive il messaggio o il comando slash precedente\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "scorciatoie"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Apri menù messaggi diretti\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Navigazione\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+GIU: canale successivo o messaggio successivo nella barra a sinistra\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+SU: canale precedente o messaggio precedente nella barra a sinistra\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOCtrl}}+SHIFT+M: Apri citazioni recenti\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Apri impostazioni account\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: apri finestra di cambio rapido canale\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K: Apri finestra di cambio rapido canale\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+GIU: canale successivo nella barra a sinistra che ha messaggi non letti\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+SU: Canale precedente nella barra a sinistra che ha messaggi non letti\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "Il comando rapido non è disponibile sul tuo dispositivo"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1117,7 +985,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Messaggio Diretto da"
+    "translation": "Messaggio Diretto da "
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1125,11 +993,11 @@
   },
   {
     "id": "api.email_batching.render_batched_post.group_message",
-    "translation": "Messaggio di Gruppo da"
+    "translation": "Messaggio di Gruppo da "
   },
   {
     "id": "api.email_batching.render_batched_post.notification",
-    "translation": "Notifica da"
+    "translation": "Notifica da "
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
@@ -1374,22 +1242,6 @@
     "translation": "Impossibile muovere il file localmente."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "File storage non configurato correttamente. Configurare S3 o file server locale."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Si è verificato un errore creando la cartella per il nuovo file"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Si è verificato un errore scrivendo nello storage locale del server"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 non è supportato."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "File storage non configurato correttamente. Configurare S3 o file server locale."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Inizializzazione api routes protocollo open graph"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "L'elenco dei file è vuoto nella richiesta multipart/form"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Impossibile aprire il file nella richiesta multipart/form"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "File mancante nella richiesta multipart/form"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} e {{.LastUsername}} sono stati citati, ma non riceveranno notifiche in quanto non appartengono più a questo canale."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Parametro RooId non valido"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "Il canale è in sola lettura. Solo i membri con i permessi corretti possono pubblicare qui."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Errore nel creare la pubblicazione"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here è stato disabilitato perché il canale ha più di {{.Users}} utenti."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Id azione non valido"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Errore azione d'integrazione"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} file inviati: {{.Filenames}}{{.Count}} file inviati: {{.Filenames}}",
@@ -1981,7 +1857,7 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "L' Integrazione/Slack-Bot-User con email {{.Email}} e password {{.Password}} è stata importata.\r\n"
+    "translation": "L'Integrazione/Slack-Bot-User con email {{.Email}} e password {{.Password}} è stata importata.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
@@ -1989,7 +1865,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n Canali aggiunti:\r\n"
+    "translation": "\r\nCanali aggiunti:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
@@ -2041,7 +1917,7 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
-    "translation": "Slack Import: Unable to attach the file to the post as the latter has no \"file\" section present in Slack export."
+    "translation": "Importazione Slack: Impossibile allegare il file alla pubblicazione poiché non è presente la sezione \"file\" nell'esportazione di Slack."
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_open_failed.warn",
@@ -2061,7 +1937,7 @@
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\n Utente creato:\r\n"
+    "translation": "\r\nUtente creato:\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
@@ -2089,7 +1965,7 @@
   },
   {
     "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Slack Import: Unable to compile the !channel, matching regular expression for the Slack channel {{.ChannelName}} (id={{.ChannelID}})."
+    "translation": "Importazione Slack: Impossibile compilare il !channel, corrispondenza per l'espressione regolare del canale Slack {{.ChannelName}} (id={{.ChannelID}})."
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
@@ -2097,11 +1973,11 @@
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Slack Import: Unable to compile the @mention, matching regular expression for the Slack user {{.Username}} (id={{.UserID}})."
+    "translation": "Importazione Slack: Impossibile compilare la @mention, corrispondenza dell'espressione regolare per l'utente Slack {{.Username}} (id={{.UserID}})."
   },
   {
     "id": "api.slackimport.slack_deactivate_bot_user.failed_to_deactivate",
-    "translation": "Slack Import: Unable to deactivate the user account used for the bot."
+    "translation": "Importazione Slack: Impossibile disattivare l'account utente usato per il bot."
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2141,7 +2017,7 @@
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Slack Import: Errore durante l'analisi di alcuni canali Slack. L'importazione potrebbe continuare senza problemi."
+    "translation": "Slack Import: Errore durante l'analisi di alcune pubblicazioni Slack. L'importazione potrebbe continuare senza problemi."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
@@ -2829,7 +2705,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML non configurato o supportato su questo server."
+    "translation": "SAML 2.0 non configurato o non supportato su questo server."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3120,6 +2996,10 @@
     "translation": "E' necessario specificare l'ID del gruppo per creare un canale"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Impossibile pubblicare lo scopo del canale"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notifca in {{ .TeamName}} del {{.Day}}/{{.Month}}/{{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Impossibile attivare il plugin estratto. Il plugin può essere già disponibile e dev'essere attivato."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Percorso errato nei file estratti"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Impossibile disattivare il plugin"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Rilevato errore durante l'estrazione del plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Impossibile trovare i plugin attivi"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Impossibile trovare il manifest del plugin estratto"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Impossibile spostare il plugin dalla cartella temporanea alla destinazione definitiva"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "Nessun file nella cartella compressa"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Impossibile eliminare il plugin"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "I Token di accesso personale sono disattivati su questo server. Per favore contatta l'Amministratore di Sistema per ulteriori dettagli."
   },
@@ -3788,6 +3708,22 @@
     "translation": "Esportazione di conformita fallita per l'attività '{{.JobName}}' in '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Il lavoro di aggregazione di Elasticsearch non è riuscito a creare gli indici"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Il lavoro di aggregazione di Elasticsearch non è riuscito a cancellare gli indici"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Il lavoro di aggregazione di Elasticsearch non è riuscito a trovare gli indici"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Il lavoro di aggregazione di Elasticsearch è fallito a causa di un errore di indicizzazione"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Impostazione del Client Elasticsearch fallita"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Impossibile indicizzare la pubblicazione"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Il lavoro di indicizzazione di Elasticsearch non è riuscito a calcolare l'ora di inizio e di fine"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Il lavoro di indicizzazione di Elasticsearch non è riuscito a calcolare l'ora d'inizio"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch non è in esecuzione"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML non configurato su questo server."
+    "translation": "SAML 2.0 non configurato o non supportato su questo server."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "Errore in creazione del certificato SAML (multipart form request)"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Impossibile costruire la richiesta multipart"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Creato alle deve essere un tempo valido"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Id utente non valido"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Id canale non valido"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Id comando non valido"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Creato alle deve essere un tempo valido"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Id comando hook non valido"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Id genitore non valido"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Id radice non valido"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Id utente non valido"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Creato alle deve essere una data valida"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Impossibile abilitare la spedizione email programmata quando il supporto cluster è abilitato."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "L'impostazione AggregatePostsAfterDays di Elasticsearch deve essere un numero maggiore o uguale a 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Il ConnectionUrl di Elastich Search deve essere fornito quando l'indicizzazione di Elastic Search è abilitata."
   },
@@ -4432,6 +4412,10 @@
     "translation": "La Password di Elastic Search deve essere fornita quando l'indicizzazione Elastic Search è abilitata."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "L'impostazione PostsAggregatorJobStartTime di Elasticsearch deve essere un'ora in formato \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Il nome utente Elastic Search deve essere fornito quando l'indicizzazione Elastic Search è abilitata."
   },
@@ -4445,7 +4429,7 @@
   },
   {
     "id": "model.config.is_valid.email_notification_contents_type.app_error",
-    "translation": "Invalid email notification contents type for email settings. Must be one of either 'full' or 'generic'."
+    "translation": "Content type delle notifiche email non valido. Deve essere 'completo' oppure 'generico'."
   },
   {
     "id": "model.config.is_valid.email_reset_salt.app_error",
@@ -5176,6 +5160,10 @@
     "translation": "impossibile decodificare"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Errore nella chiamata al plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Impossibile modificare la colonna con tipo %v"
   },
@@ -5281,7 +5269,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "Database schema version %v is no longer supported. This Mattermost server supports automatic upgrades from schema version %v through schema version %v. Downgrades are not supported. Please manually upgrade to at least version %v before continuing"
+    "translation": "La versione dello schema del database %v non è più supportata. Questo server Mattermost supporta gli aggiornamenti automatici dalla versione di schema %v alla versione di schema %v. I downgrade non sono supportati. Per favore aggiornare manualmente alla versione %v prima di procedere"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -5596,6 +5584,26 @@
     "translation": "Non è stato possibile aggiornare il canale"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Non è stato possibile recuperare il webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "Non è stato possibile salvare il comando Webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "Impossibile aggiornare un comando Webhook esistente"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Impossibile utilizzare il webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Webhook non valido"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Non è stato possibile recuperare i rapporti di compliance"
   },
@@ -5648,6 +5656,10 @@
     "translation": "Non è stato possibile recuperare le informazioni sul file per la pubblicazione"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "Impossibile eliminare definitivamente le informazioni del file"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "Non è stato possibile salvare le informazioni sul file"
   },
@@ -6413,7 +6425,7 @@
   },
   {
     "id": "store.sql_user_access_token.get_by_token.app_error",
-    "translation": "Impossibile trovare il Token di accesso personale per \"token\""
+    "translation": "Impossibile trovare il token di accesso personale per token"
   },
   {
     "id": "store.sql_user_access_token.get_by_user.app_error",
@@ -6509,7 +6521,7 @@
   },
   {
     "id": "utils.config.add_client_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+    "translation": "Impossibile caricare il file di configurazione di mattermost:  Aggiunta di DefaultClientLocale a AvailableLocales."
   },
   {
     "id": "utils.config.load_config.decoding.panic",
@@ -6533,15 +6545,15 @@
   },
   {
     "id": "utils.config.supported_available_locales.app_error",
-    "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
+    "translation": "Impossibile caricare il file di configurazione di mattermost:  AvailableLocales deve includere DefaultClientLocale. Impostazione di AvailableLocales su tutte le lingue come valore predefinito."
   },
   {
     "id": "utils.config.supported_client_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  DefaultClientLocale must be one of the supported locales. Setting DefaultClientLocale to en as default value."
+    "translation": "Impossibile caricare il file di configurazione di mattermost:  DefaultClientLocale deve essere una lingua supportata. Impostazione di DefaultClientLocale a en come valore predefinito."
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  DefaultServerLocale must be one of the supported locales. Setting DefaultServerLocale to en as default value."
+    "translation": "Impossibile caricare il file di configurazione:  DefaultServerLocale deve essere una lingua supportata. Impostazione di DefaultServerLocale a en come valore predefinito."
   },
   {
     "id": "utils.config.validate_locale.app_error",
@@ -6552,6 +6564,30 @@
     "translation": "Metriche non inizializzate"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Spazio di archiviazione non configurato correttamente. Configura S3 o il server locale."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Si è verificato un errore cancellando la cartella dal server locale."
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Si è verificato un errore cancellando la cartella da S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Spazio di archiviazione non configurato correttamente. Configura S3 o il server locale."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Si è verificato un errore cancellando il file dal server locale."
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Si è verificato un errore cancellando il file da S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Traduzioni di sistema caricare per '%v' da '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Impossibile trovare utente teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Impossibile trovare il comando"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Webhook non valido"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Impossibile analizzare i dati in ingresso"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Impossibile creare osservatore cartella %v"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 9ba8b56c8..e580bb523 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -592,6 +592,14 @@
     "translation": "あなたにはチャンネル名を変更するのに必要な権限が付与されていません。"
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "チャンネル名は {{.Length}} 文字以下でなくてはなりません"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "チャンネル名は {{.Length}} 文字以上でなくてはなりません"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "現在のチャンネルを更新する際にエラーが発生しました。"
   },
@@ -844,156 +852,16 @@
     "translation": "このデバイスでは設定コマンドはサポートされていません"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: 履歴の次のチャンネル\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+右"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: 履歴の前のチャンネル\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+左"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+マイナス: フォントを小さくする(ズームアウト)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+プラス: フォントを大きくする(ズームイン)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### 内蔵ブラウザーコマンド\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+DOWN (入力欄で): 一つ下の行のテキストをハイライトする\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+UP (入力欄で): 一つ上の行のテキストをハイライトする\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (入力欄で): 改行する\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "キーボードショートカットのリストを表示する"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### ファイル\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: ファイルをアップロードする\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### キーボードショートカット\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[文字]+TAB: [文字]で始まる @ユーザー名 を自動補完する\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "UP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### メッセージ\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: 現在のチャンネルの全てのメッセージを既読にする\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+UP (空白の入力欄で): 現在のチャンネルの最新のメッセージに返信する\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "ショートカット"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: ダイレクトメッセージメニューを開く\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### 移動\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージに移動する\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージに移動する\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: 最近の自分についての投稿を開く\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: アカウント設定を開く\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: 高速チャンネル切り替えダイアログボックスを開く\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K: 高速チーム切り替えダイアログを開く\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+DOWN: 左側のサイドバーの未読のメッセージのある次のチャンネルまたはダイレクトメッセージに移動する\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+UP: 左側のサイドバーの未読のメッセージのある前のチャンネルまたはダイレクトメッセージに移動する\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "このデバイスではショートカットコマンドはサポートされていません"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "ローカルでファイルを移動できません。"
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "ファイルストレージが正しく設定されていません。S3またはローカルサーバーファイルストレージを設定してください。"
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "新しいファイルのためにディレクトリーを作成しようとして失敗しました"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "ローカルサーバーストレージへの書き込みに失敗しました"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3はサポートされません。"
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "ファイルストレージが正しく設定されていません。S3またはローカルサーバーファイルストレージを設定してください。"
   },
@@ -1662,6 +1514,18 @@
     "translation": "オープングラフプロトコルのAPIルートを初期化しています"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "multipart/formリクエストのファイル配列が空です"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "multipart/formリクエストのファイルを開けませんでした"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "multipart/formリクエストにファイルが存在しません"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}}と{{.LastUsername}}が投稿に現れましたが、彼らはこのチャンネルには属していません。"
   },
@@ -1698,6 +1562,10 @@
     "translation": "RootIdパラメーターが不正です"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "このチャンネルは読み取り専用です。権限のあるメンバーのみがここに投稿できます。"
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "投稿を作成できません"
   },
@@ -1726,6 +1594,14 @@
     "translation": "チャンネルに{{.Users}}以上のユーザーがいるため@hereは無効化されています。"
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "不正なアクションIDです"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "アクション統合エラー"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} ファイル送信: {{.Filenames}}{{.Count}} ファイル送信: {{.Filenames}}",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "ユーザーアクセストークンが {{ .SiteURL }} のあなたのアカウントに追加されました。あなたのアカウントで{{.SiteName}}へアクセスするために利用することができます。<br>この変更があなたによって行われたものでない場合、システム管理者に連絡してください。"
+    "translation": "パーソナルアクセストークンが {{ .SiteURL }} のあなたのアカウントに追加されました。あなたのアカウントで {{.SiteName}} へアクセスするために利用することができます。<br>この変更があなたによって行われたものでない場合、システム管理者に連絡してください。"
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "ユーザーアクセストークンがあなたのアカウントに追加されました"
+    "translation": "パーソナルアクセストークンがあなたのアカウントに追加されました"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] ユーザーアクセストークンがあなたのアカウントに追加されました"
+    "translation": "[{{ .SiteName }}] パーソナルアクセストークンがあなたのアカウントに追加されました"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2829,7 +2705,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAMLは設定されていないか、このサーバーではサポートされていません"
+    "translation": "SAML 2.0 は、このサーバーでは設定されていないかサポートされていません。"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "ユーザーアクセストークン追加の電子メールを送信できませんでした"
+    "translation": "パーソナルアクセストークン追加の電子メールを送信できませんでした"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "チャンネルを作成するにはチームIDを指定しなければなりません"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "チャンネルの目的メッセージを投稿できませんでした"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} {{.TeamName}}の通知"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "抽出されたプラグインを有効化できませんでした。プラグインが既に存在し、有効化されている可能性があります。"
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "抽出されたファイルに不正なファイルパスがあります"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "プラグインを無効化できませんでした"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "プラグインの抽出に失敗しました"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "有効なプラグインを取得できませんでした"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "抽出されたプラグインのマニフェストが見付かりませんでした"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "プラグインを一時ディレクトリから最終的な移動先へ移動できませんでした"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "圧縮されたフォルダの中にファイルが見付かりませんでした"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "プラグインを削除できませんでした"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "このサーバーではパーソナルアクセストークンが無効になっています。詳しくはシステム管理者に問い合わせてください。"
   },
@@ -3788,6 +3708,22 @@
     "translation": "コンプライアンスエクスポートが開始されました ジョブ='{{.JobName}}'、ファイル='{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearchアグリゲーターのワーカーがインデックス付与処理を作成できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearchアグリゲーターのワーカーがインデックスを削除できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearchアグリゲーターのワーカーがインデックスを取得できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearchアグリゲーターのワーカーがインデックス付与処理失敗ために失敗しました"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Elasticsearchクライアントを設定できませんでした"
   },
@@ -3816,6 +3752,14 @@
     "translation": "投稿にインデックスを付与できませんでした"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearchインデックス付与ワーカーが終了時刻を解析できませんでした"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearchインデックス付与ワーカーが開始時刻を解析できませんでした"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearchが起動されていません"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAMLは設定されていないか、このサーバーではサポートされていません"
+    "translation": "SAML 2.0 は、このサーバーでは設定されていないかサポートされていません。"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "リクエストからSAML証明書のマルチパートを作成する際にエラーになりました"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "マルチパートリクエストを構築できませんでした"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "作成日時は有効な時刻にしてください"
   },
@@ -4392,6 +4340,34 @@
     "translation": "不正なユーザーIDです"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "不正なチャンネルIDです"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "不正なコマンドIDです"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "作成日時は有効な時刻にしてください"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "不正なコマンドフックIDです"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "不正な親IDです"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "不正なルートIDです"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "不正なユーザーIDです"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "作成日時は有効な時刻にしてください"
   },
@@ -4420,6 +4396,10 @@
     "translation": "クラスタリングが有効化されている場合、電子メールバッチ処理は有効化できません。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "ElasticsearchのAggregatePostsAfterDays設定は1以上でなくてはなりません"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Searchインデックスが有効な場合、Elastic SearchのConnectionUrl設定は必須です。"
   },
@@ -4432,6 +4412,10 @@
     "translation": "Elastic Searchインデックスが有効な場合、Elastic Searchパスワード設定は必須です。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "ElasticsearchのPostsAggregatorJobStartTime設定は \"hh:mm\" の形式でなくてはなりません"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Elastic Searchインデックスが有効な場合、Elastic Searchユーザー名設定は必須です。"
   },
@@ -5176,6 +5160,10 @@
     "translation": "デコードできませんでした"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "プラグインRPC呼出エラー"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "列形式%vを変更できませんでした"
   },
@@ -5596,6 +5584,26 @@
     "translation": "コマンドが更新できませんでした"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "ウェブフックを取得できませんでした"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "CommandWebhookを保存できませんでした"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "既存のCommandWebhookは更新できません"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "ウェブフックを使用できません"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "不正なウェブフックです"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "コンプライアンスリポートを取得する際にエラーが発生しました"
   },
@@ -5648,6 +5656,10 @@
     "translation": "投稿のファイル情報を取得できませんでした"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "ファイル情報を完全に削除できませんでした"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "ファイル情報を保存できませんでした"
   },
@@ -6541,7 +6553,7 @@
   },
   {
     "id": "utils.config.supported_server_locale.app_error",
-    "translation": "Mattermost設定ファイルを読み込めませんでした:  DefaultServerLocaleはサポートされている言語の一つでなければなりません。デフォルト値としてDefaultClientLocaleに en を設定しました。"
+    "translation": "Mattermost設定ファイルを読み込めませんでした:  DefaultServerLocaleはサポートされている言語の一つでなければなりません。デフォルト値としてDefaultServerLocaleに en を設定しました。"
   },
   {
     "id": "utils.config.validate_locale.app_error",
@@ -6552,6 +6564,30 @@
     "translation": "解析は初期化されていません"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "ファイルストレージが正しく設定されていません。S3またはローカルサーバーファイルストレージを設定してください。"
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "ローカルサーバーストレージからのディレクトリ削除に失敗しました。"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "S3からのディレクトリ削除に失敗しました。"
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "ファイルストレージが正しく設定されていません。S3またはローカルサーバーファイルストレージを設定してください。"
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "ローカルサーバーファイルストレージからのファイル削除に失敗しました。"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "S3からのファイル削除に失敗しました。"
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "'%v'用のシステム翻訳を'%v'から読み込みました"
   },
@@ -6664,6 +6700,18 @@
     "translation": "ユーザーが見付かりません teamid=%v、email=%v、err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "コマンドが見付かりません"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "不正なウェブフックです"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "外部からのデータを解析できません"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "ディレクトリーウォッチャーを作成できませんでした %v"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 3ef7971f3..66a232819 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -592,6 +592,14 @@
     "translation": "당신은 채널 머릿말을 수정할 권한을 가지고 있지 않습니다."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "현재 채널의 업데이트에 실패하였습니다."
   },
@@ -844,156 +852,16 @@
     "translation": "당신의 기기에서는 설정 명령을 지원하지 않습니다"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: 기록 상의 다음 채널\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+오른쪽 방향키"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: 기록 상의 이전 채널\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+왼쪽 방향키"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MINUS: 글자 크기 줄이기 (배율 축소)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS: 글자 크기 늘이기 (배율 확대)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### 브라우저 내장 명령어\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "(입력 란에서) SHIFT+아래 방향키: 다음 줄까지의 글자를 선택\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "(입력 란에서) SHIFT+위 방향키: 이전 줄까지의 글자를 선택\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "(입력 란에서) SHIFT+ENTER: 줄바꾸기\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "단축키 목록을 표시합니다."
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### 파일\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: 파일 업로드 (복수 파일 가능)\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### 키보드 단축키\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[문자]+TAB: [문자]로 시작하는 채널명 자동 완성\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[문자]+TAB: [문자]로 시작하는 이모지 자동 완성\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[문자]+TAB: [문자]로 시작하는 @사용자명 자동 완성\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "위 방향키 (빈 입력란에서): 현재 채널에서 마지막으로 보낸 메시지 수정\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### 메시지\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: 현재 채널의 모든 메시지를 읽음으로 표시\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+UP (빈 입력창에서):현재 채널의 가장 마지막 메세지에 대답\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+아래 방향키 (빈 입력란에서): 입력한 다음 차례의 메시지 혹은 슬래시 명령어 재입력\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+아래 방향키 (빈 입력란에서): 이전에 입력한 메시지 혹은 슬래시 명령어 재입력\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "단축키"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Direct 메세지 메뉴 열기\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### 조작법\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+아래 방향키: 왼쪽 사이드바에서 다음 채널 또는 개인 대화 선택\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+아래 방향키: 왼쪽 사이드바에서 이전 채널 또는 개인 대화 선택\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: 최근 멘션 열기\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: 계정 설정 열기\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: 빠른 채널 스위처 창 열기\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+K: 빠른 채널 스위처 창 열기\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+아래 방향키: 왼쪽 사이드바에서 읽지 않은 메시지가 있는 다음 채널 또는 개인 대화 선택\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+위 방향키: 왼쪽 사이드바에서 읽지 않은 메시지가 있는 이전 채널 또는 개인 대화 선택\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "당신의 기기에서는 검색 명령을 지원하지 않습니다"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "파일을 근처로 이동할 수 없습니다."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "파일 저장소가 제대로 설정되지 않았습니다. S3이나 개인 서버 파일 저장소를 설정해주세요."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "새로운 파일을 위한 디렉토리 생성에 실패했습니다."
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "로컬 서버 저장소에 쓰는 도중 에러가 발생했습니다."
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3를 지원하지 않습니다."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "파일 저장소가 제대로 설정되지 않았습니다. S3이나 로컬 서버 파일 저장소를 설정해주세요."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Initializing open graph protocol api routes"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}}, {{.LastUsername}} 이 멘션되었으나, 그들은 이 채널에 속하지 않기 때문에 알림을 받지 못했습니다."
   },
@@ -1698,6 +1562,10 @@
     "translation": "잘못된 RootId 매개변수입니다"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "포스트 만드는 중 오류"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here has been disabled because the channel has more than {{.Users}} users."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "잘못된 클라이언트 ID"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}}개 파일 발송됨: {{.Filenames}}",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "User access token added to your account"
+    "translation": "Personal access token added to your account"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] User access token added to your account"
+    "translation": "[{{ .SiteName }}] Personal access token added to your account"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send user access token added email successfully"
+    "translation": "Failed to send personal access token added email successfully"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "Must specify the team ID to create a channel"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Unable to deactivate plugin"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Unable to get active plugins"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Unable to delete plugin"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
   },
@@ -3788,6 +3708,22 @@
     "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Setting up Elasticsearch Client Failed"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Failed to index the post"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch is not started"
   },
@@ -4344,6 +4288,10 @@
     "translation": "Error creating SAML certificate multipart form request"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
@@ -4392,6 +4340,34 @@
     "translation": "잘못된 사용자 ID"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Invalid channel id"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Invalid command id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Create at must be a valid time"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Invalid command hook id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "잘못된 Parent Id 입니다."
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "잘못된 루트 아이디입니다."
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "잘못된 사용자 ID"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Unable to enable email batching when clustering is enabled"
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
   },
@@ -4432,6 +4412,10 @@
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
   },
@@ -5176,6 +5160,10 @@
     "translation": "could not decode"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error invoking plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Failed to alter column type %v"
   },
@@ -5596,6 +5584,26 @@
     "translation": "채널을 찾을 수 없습니다"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Webhook을 찾는 데 실패했습니다"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "IncomingWebhook을 저장하는 데 실패했습니다"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "You cannot update an existing CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Unable to use the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "잘못된 Webhook"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "We encountered an error retrieving the compliance reports"
   },
@@ -5648,6 +5656,10 @@
     "translation": "We couldn't get the file info for the post"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "We couldn't save the file info"
   },
@@ -6552,6 +6564,30 @@
     "translation": "분석기가 초기화되지 않았습니다"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "파일 저장소가 제대로 설정되지 않았습니다. S3나 로컬 서버 파일 저장소를 설정해주세요."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "로컬 서버 저장소를 읽는 도중 에러가 발생했습니다."
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "파일 저장소가 제대로 설정되지 않았습니다. S3나 로컬 서버 파일 저장소를 설정해주세요."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "로컬 서버 저장소를 읽는 도중 에러가 발생했습니다."
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Loaded system translations for '%v' from '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Couldn't find user teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "채널을 찾을 수 없습니다"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "잘못된 Webhook"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Unable to parse incoming data"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Failed to create directory watcher %v"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 3dc7d7c09..a19cfd694 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -592,6 +592,14 @@
     "translation": "You do not have the appropriate permissions to rename the channel."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Error to update the current channel."
   },
@@ -844,156 +852,16 @@
     "translation": "The settings command is not supported on your device"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Volgende kanaal uit je geschiedenis\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+RECHTS"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Vorige kanaal in je geschiedenis\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+LINKS"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Built-in Browser Commands\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (in input field): Create a new line\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Toon een lijst met snelkoppelingen"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Bestanden\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Upload file(s)\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Keyboard Shortcuts\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[character]+TAB: Autocomplete channel beginning with [character]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[character]+TAB: Autocomplete @username beginning with [character]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "UP (in empty input field): Edit your last message in the current channel\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Berichten\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Mark all messages in the current channel as read\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+UP (in empty input field): Reply to the most recent message in the current channel\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "Snelkoppelingen"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Open direct messages menu\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Navigation\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+OMLAAG: Volgende kanaal of direct bericht in linker zijbalk\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+OMHOOG: Vorige kanaal of direct bericht in linker zijbalk\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Open recente vermeldingen\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Open account instellingen\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: Open a quick channel switcher dialog\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K: Open a quick team switcher dialog\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "The shortcuts command is not supported on your device"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "Kan lokaal bestand niet verplaatsen."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "Bestand opslag is niet goed geconfigueerd. Configureer of S3 of lokale bestands opslag."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Er is een fout opgetreden bij het maken van een directory voor een niet bestand"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Er is een fout opgetreden tijdens het schrijven naar lokale opslag"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 word niet ondersteund."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "Bestand opslag is niet goed geconfigueerd. Configureer of S3 of lokale bestands opslag."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Initializing open graph protocol api routes"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} en {{.LastUsername}} zijn genoemd, maar ze hebben geen notificatie gekregen, omdat ze niet deelnemen aan dit kanaal."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Ogeldig RootId parameter"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Fout bij het aanmaken van bericht"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here has been disabled because the channel has more than {{.Users}} users."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Ongeldig client id "
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} bestand verzonden: {{.Filenames}}",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "User access token added to your account"
+    "translation": "Personal access token added to your account"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] User access token added to your account"
+    "translation": "[{{ .SiteName }}] Personal access token added to your account"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send user access token added email successfully"
+    "translation": "Failed to send personal access token added email successfully"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "Must specify the team ID to create a channel"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Unable to deactivate plugin"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Unable to get active plugins"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Unable to delete plugin"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
   },
@@ -3788,6 +3708,22 @@
     "translation": "Compliance export is mislukt voor taak '{{.JobName}}' naar '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Setting up Elasticsearch Client Failed"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Failed to index the post"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch is not started"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML is niet ondersteund, of niet geconfigureerd op deze server."
+    "translation": "SAML wordt niet ondersteund, of is niet geconfigureerd op deze server."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "Error creating SAML certificate multipart form request"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Aangemaakt op moet een geldige tijd zijn"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Ongeldig gebruikers id"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Ongeldig kanaal id"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Invalid command id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Aangemaakt op moet een geldige tijd zijn"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Invalid command hook id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Ongeldig ouder id"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Ongeldig start id"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Ongeldige gebruikers id"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Aangemaakt op moet een geldige tijd zijn"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Niet mogelijk om bulk email aan te zetten als clustering aan staat."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
   },
@@ -4432,6 +4412,10 @@
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
   },
@@ -5176,6 +5160,10 @@
     "translation": "kan niet decoderen"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error invoking plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Fout tijdens het aanpassen van kolom type %v"
   },
@@ -5596,6 +5584,26 @@
     "translation": "De opdracht kan niet bijgewerkt worden"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "We kunnen de webhook niet ophalen"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "De binnenkomende webhook kan niet opgeslagen worden"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "You cannot update an existing CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Unable to use the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Ongeldige webhook"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Er is een probleem opgetreden bij het ophalen van het 'compliance' rapport"
   },
@@ -5648,6 +5656,10 @@
     "translation": "We konden de bestandsinfo niet ophalen"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "We konden de bestandsinfo niet opslaan"
   },
@@ -6552,6 +6564,30 @@
     "translation": "Analytics niet geïnitialiseerd"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Bestand opslag is niet goed geconfigureerd. Configureer S3 of lokale bestandsopslag."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Er is een fout opgetreden bij het lezen van een bestand uit lokale opslag"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Bestand opslag is niet goed geconfigureerd. Configureer S3 of lokale bestandsopslag."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Er is een fout opgetreden bij het lezen van een bestand uit lokale opslag"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Systeem vertaling ingelezen voor '%v' uit '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Kan de gebruiker niet vinden, teamid=%v, email=%v, fout=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Het kanaal kan niet gevonden worden"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Ongeldige webhook"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Kan binnenkomende data niet verwerken"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Toevoegen van een directory om te controleren is mislukt %v"
   },
diff --git a/i18n/pl.json b/i18n/pl.json
index 3952213de..bec46a190 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -153,7 +153,7 @@
   },
   {
     "id": "api.channel.add_member.added",
-    "translation": "%v dodany do kanału przez %v"
+    "translation": "%v został dodany do kanału przez %v"
   },
   {
     "id": "api.channel.add_member.find_channel.app_error",
@@ -501,7 +501,7 @@
   },
   {
     "id": "api.command_channel_header.channel.app_error",
-    "translation": "Błąd aktualizacji bieżącego kanału."
+    "translation": "Błąd pobierania aktualnego kanału."
   },
   {
     "id": "api.command_channel_header.desc",
@@ -533,7 +533,7 @@
   },
   {
     "id": "api.command_channel_purpose.channel.app_error",
-    "translation": "Błąd aktualizacji bieżącego kanału."
+    "translation": "Błąd pobierania aktualnego kanału."
   },
   {
     "id": "api.command_channel_purpose.desc",
@@ -549,7 +549,7 @@
   },
   {
     "id": "api.command_channel_purpose.message.app_error",
-    "translation": "Dla polecenia /echo musi zostać podana wiadomość."
+    "translation": "Wiadomość musi zawierać komendę /purpose."
   },
   {
     "id": "api.command_channel_purpose.name",
@@ -592,6 +592,14 @@
     "translation": "Nie posiadasz odpowiednich uprawnień do edycji nagłówka kanału."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Błąd aktualizacji bieżącego kanału."
   },
@@ -844,156 +852,16 @@
     "translation": "Komenda ustawień nie jest wspierana na Twoim urządzeniu"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Następny kanał w Twojej historii\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+STRZAŁKA W PRAWO"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Poprzedni kanał w Twojej historii\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+STRZAŁKA W LEWO"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MINUS: Zmniejsz rozmiar czcionki (pomniejsz)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS: Zwiększ rozmiar czcionki (powiększ)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Wbudowane komendy przeglądarki\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+STRZAŁKA W DÓŁ (w polu wprowadzania): Zaznacz tekst do następnej linii\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+STRZAŁKA W GÓRĘ (w polu wprowadzania): Zaznacz tekst do poprzedniej linii\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (w polu wprowadzania): Utwórz nową linię\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Wyświetl listę skrótów klawiaturowych"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Pliki\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Wyślij plik(i)\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Skróty klawiszowe\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[znak]+TAB: Autouzupełnij nazwę kanału rozpoczynającą się od [znaku]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[znak]+TAB: Autouzupełnij emoji rozpoczynające się od [znaku]\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[znak]+TAB: Autouzupełnij nazwę użytkownika rozpoczynającą się od [znaku]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "STZRAŁKA W GÓRĘ (w pustym polu wprowadzania): Edytuj swoją ostatnią wiadomość w aktualnym kanale\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Wiadomości\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Oznacz wszystkie wiadomości w aktualnym kanale jako przeczytane\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+STRZAŁKA W GÓRĘ (w pustym polu) : Odpowiedź na ostatnią wiadomość w aktualnym kanale\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+STRZAŁKA W DÓŁ (w pustym polu wprowadzania): Ponownie wyświetl następną wprowadzoną przez Ciebie wiadomość lub komendę w polu wprowadzania\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+STRZAŁKA W GÓRĘ (w pustym polu wprowadzania): Ponownie wyświetl ostatnią wiadomość lub komendę w polu wprowadzania\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "skróty"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Otwórz menu wiadomości bezpośrednich\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Nawigacja\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+STRZAŁKA W DÓŁ: Następny kanał lub wiadomość bezpośrednia z paska po lewej stronie\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+STRZAŁKA W GÓRĘ: Poprzedni kanał lub wiadomość bezpośrednia z paska po lewej stronie\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Otwórz ostatnie wspomnienia\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Otwórz ustawienia konta\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: Otwórz okienko szybkiej zmiany kanału\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+K: Otwórz okienko szybkiej zmiany zespołu\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+DOWN: Następny kanał lub wiadomość bezpośrednia z paska po lewej stronie z nieprzeczytanymi wiadomościami\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+STRZAŁKA W GÓRĘ: Poprzedni kanał lub wiadomość bezpośrednia z paska po lewej stronie z nieprzeczytanymi wiadomościami\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "Polecenie wyszukiwania nie jest wspierana na Twoim urządzeniu"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "Nie można przenieść pliku lokalnie."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "Magazyn plików nie jest poprawnie skonfigurowany. Proszę skonfigurować usługę S3 lub lokalny magazyn plików."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Napotkano błąd podczas tworzenia katalogu dla nowych plików"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Napotkano błąd podczas zapisu do lokalnego magazynu"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "Usługa S3 nie jest wspierana."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "Magazyn plików nie jest poprawnie skonfigurowany. Proszę skonfigurować usługę S3 lub lokalny magazyn plików."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Inicjalizacja tras protokołów otwartego grafu API"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "Wymieniono użytkowników {{.Usernames}} oraz {{.LastUsername}} ale nie otrzymali powiadomień ponieważ nie należą do tego kanału."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Nieprawidłowy parametr RootId"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Błąd podczas tworzenia postu"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here zostało zablokowane ponieważ kanał ma więcej niż {{.Users}} użytkowników."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Nieprawidłowy identyfikator klienta"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} plik wysłany: {{.Filenames}}",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "User access token added to your account"
+    "translation": "Personal access token added to your account"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] User access token added to your account"
+    "translation": "[{{ .SiteName }}] Personal access token added to your account"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send user access token added email successfully"
+    "translation": "Failed to send personal access token added email successfully"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "ID zespołu musi być określone aby można było stworzyć kanał"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Nie udało się wysłać opisu kanału"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Nie udało się skasować reakcji"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Nie udało się skasować reakcji"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Nie udało się skasować reakcji"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
   },
@@ -3788,6 +3708,22 @@
     "translation": "Rozpoczęto eksport zgodności dla zadania '{{.JobName}}' do '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Nie udało się ustawić parametrów klienta ElasticSearch."
   },
@@ -3816,6 +3752,14 @@
     "translation": "Failed to index the post"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch is not started"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML nie jest skonfigurowany lub nie jest wspierany na tym serwerze."
+    "translation": "Użycie SAML nie zostało skonfigurowane lub nie jest wspierane na tym serwerze."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "Błąd podczas tworzenia wieloczęściowych żądań formularza certyfikatu SAML"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Utworzono dnia musi być poprawnym czasem"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Nieprawidłowy identyfikator użytkownika"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Nieprawidłowy identyfikator kanału"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Invalid command id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Utworzono dnia musi zawierać prawidłowy czas"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Invalid command hook id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Nieprawidłowe id rodzica"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Nieprawidłowy root id"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Nieprawidłowy identyfikator użytkownika"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Utworzono dnia musi być prawidłowym czasem"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Nie można odblokować masowych emaili gdy klastrowanie jest odblokowane."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Aby włączyć indeksowanie Elastic Search, należy ustawić hasło dla Elastic Search"
   },
@@ -4432,6 +4412,10 @@
     "translation": "Aby włączyć indeksowanie Elastic Search, należy ustawić hasło dla Elastic Search"
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Aby włączyć indeksowanie Elastic Search, należy ustawić nazwę użytkownika"
   },
@@ -5176,6 +5160,10 @@
     "translation": "nie można zdekodować"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error invoking plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Nie udało się zmienić typu kolumny %v"
   },
@@ -5596,6 +5584,26 @@
     "translation": "Nie można zaktualizować polecenia"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Nie udało się pobrać przychodzącego webhooka"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "Nie udało się zapisać przychodzącego webhooka"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "You cannot update an existing CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Unable to use the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Nieprawidłowy webhook"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Wystąpił błąd podczas pobierania raportów zgodności"
   },
@@ -5648,6 +5656,10 @@
     "translation": "Nie mogliśmy uzyskać informacji o pliku dla wiadomości"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "Nie mogliśmy zapisać informacji o pliku"
   },
@@ -6552,6 +6564,30 @@
     "translation": "Analytics nie zainicjowany"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Magazyn plików nie został poprawnie skonfigurowany. Proszę skonfigurować usługę S3 lub lokalny magazyn plików."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Napotkano błąd podczas odczytu z lokalnego magazynu"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Magazyn plików nie został poprawnie skonfigurowany. Proszę skonfigurować usługę S3 lub lokalny magazyn plików."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Napotkano błąd podczas odczytu z lokalnego magazynu"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Wczytano tłumaczenia systemowe dla '%v' z '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Nie można znaleźć użytkownika teamid=%vv e-mail=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Nie odnaleziono kanału"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Nieprawidłowy webhook"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Unable to parse incoming data"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Nie udało się utworzyć stróża katalogu %v"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index f24570232..8e4e3ef72 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -592,6 +592,14 @@
     "translation": "Você não tem a permissão apropriada para renomear o canal."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Nome do canal deve ter {{.Length}} caracteres ou menos"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Nome do canal deve ter {{.Length}} caracteres ou mais"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Erro ao atualizar o canal atual."
   },
@@ -844,156 +852,16 @@
     "translation": "O comando de configurações não é suportado no seu equipamento"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Próximo canal no seu histórico\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+DIR"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Canal anterior no seu histórico\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+ESQ"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MENOS: Reduz o tamanho da fonte (zoom out)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+MAIS: Aumenta o tamanho da fonte (zoom in)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Comandos Nativos do Navegador\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+BAIXO (no campo de entrada): Seleciona o texto da próxima linha\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+CIMA (no campo de entrada): Seleciona o texto da linha anterior\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (no campo de entrada): Cria uma nova linha\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Mostrar a lista de atalhos"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Arquivos\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Envia arquivo(s)\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Atalhos do Teclado\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[caractere]+TAB: Autocompleta o canal começado com o [caractere]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[caractere]+TAB: Autocompleta o emoji começado com o [caractere]\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[caractere]+TAB: Autocompleta @usuário começado com o [caractere]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "CIMA (no campo de entrada vazio): Edita sua última mensagem no canal atual\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Mensagens\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Marca todas as mensagens no canal atual como lida\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+CIMA (campo de entrada vazio): Responde a mais recente mensagem no canal atual\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+BAIXO (no campo de entrada vazio): Reimprime a próxima mensagem ou o comando slash inserido\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+CIMA (no campo de entrada vazio): Reimprime a mensagem anterior ou o comando slash inserido\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "atalhos"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Abre o menu the mensagens diretas\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Navegação\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+CIMA: Canal ou mensagem direta anterior na barra lateral esquerda\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Abre as menções recentes\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Abre as configurações de conta\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: Abra uma janela de troca rápida de canal\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K: Abra uma janela de troca rápida de equipe\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+UP: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "O comando de busca não é suportado no seu dispositivo"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "Não foi possível mover o arquivo localmente."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "Armazenamento de arquivos não está configurado corretamente. Por favor configure S3 ou armazenamento de arquivos no servidor local."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Encontrado um erro ao criar o diretório para o novo arquivo"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Encontrado um erro ao gravar no servidor local de armazenamento"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 não é suportado."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "Armazenamento de arquivos não está configurado corretamente. Por favor configure S3 ou armazenamento de arquivos no servidor local."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Inicializando as rotas da api para o protocolo open graph"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "Matriz de arquivo está vazia na requisição multipart/form"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Não foi possível abrir o arquivo na requisição multipart/form"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Arquivo faltando na requisição multipart/form"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} e {{.LastUsername}} foram mencionados, mas eles não receberam notificação porque eles não pertencem a este canal."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Parâmetro RootId inválido"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "Este canal é somente leitura. Somente membros com permissão podem postar aqui."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Erro ao criar o post"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here foi desabilitado devido ao canal ter mais de {{.Users}} usuários."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Id da ação inválido"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Erro na ação de integração"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} arquivo enviado: {{.Filenames}}",
@@ -2829,7 +2705,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML não está configurado ou disponível neste servidor."
+    "translation": "SAML 2.0 não está configurado ou disponível neste servidor."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -3120,6 +2996,10 @@
     "translation": "É necessário informar o ID da equipe para criar um canal"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Falha ao postar a mensagem de propósito do canal"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notificação em {{ .TeamName}} em {{.Day}} {{.Month}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Não foi possível ativar o plugin extraído. O plugin já pode existir e estar ativado."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Caminho do arquivo incorreto nos arquivos extraídos"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Não é possível desativar o plugin"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encontrado erro ao extrair o plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Não é possível obter os plugins ativos"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Não foi possível encontrar o manifesto para o plugin extraído"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Não foi possível mover o plugin da pasta temporária para o destino final"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "Nenhum arquivo encontrado na pasta compactada"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Não é possível deletar o plugin"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Os tokens de acesso individual estão desativados neste servidor. Entre em contato com o administrador do sistema para obter detalhes."
   },
@@ -3788,6 +3708,22 @@
     "translation": "Exportação da conformidade para tarefa '{{.JobName}}' iniciada no '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Agregador do Elastisearch falhou para criar os índices"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Agregador do Elastisearch falhou para apagar os índices"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Agregador do Elastisearch falhou para buscar os índices"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Agregador do Elastisearch falhou devido a falha do job de indexação"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Configuração do Cliente de ElasticSearch Falhou"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Não foi possível indexar o post"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Agregador do Elastisearch falhou em transformar a data de término"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Agregador do Elastisearch falhou em transformar a data de início"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch não foi iniciado"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML não está configurado ou disponível neste servidor."
+    "translation": "SAML 2.0 não está configurado ou disponível neste servidor."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "Error em criar o formulário de requisição com o certificado multipart SAML"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Não foi possível construir a requisição multipart"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Create deve ser um tempo válido"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Id de usuário inválido"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Id do canal inválido"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "ID do comando inválido"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Create deve ser uma hora válida"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Hook id do comando inválido"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "parent id inválido"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "root id inválida"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Id do usuário inválido"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Create deve ser um tempo válido"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Não é possível ativar email em lote quando clustering está ativo."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays a configuração deve ser um número maior ou igual a 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "A ElasticSearch ConnectionUrl deve ser fornecida quando ElasticSearch indexing está ativado."
   },
@@ -4432,6 +4412,10 @@
     "translation": "A senha do ElasticSearch deve ser fornecida quando o ElasticSearch indexing está ativo."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime a configuração deve ser uma hora no formato \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "O nome de usuário do ElasticSearch deve ser fornecido quando o ElasticSearch indexing está ativo."
   },
@@ -5176,6 +5160,10 @@
     "translation": "não foi possível decodificar"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Erro ao chamar o plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Falha ao alterar o tipo da coluna %v"
   },
@@ -5596,6 +5584,26 @@
     "translation": "Não foi possível atualizar o comando"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Não conseguimos obter o webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "Não foi possível salvar o CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "Você não pode atualizar o CommandWebhook existente"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Não foi possível utilizar o webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Webhook inválido"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Encontramos um erro ao obter o relatório de conformidade"
   },
@@ -5648,6 +5656,10 @@
     "translation": "Não foi possível obter as informações do arquivo para o post"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "Não foi possível remover permanentemente o info do arquivo"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "Não foi possível salvar as informações do arquivo"
   },
@@ -6552,6 +6564,30 @@
     "translation": "Análise não inicializada"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "O armazenamento de arquivos não está configurado corretamente. Por favor, configure o S3 ou o armazenamento de arquivos no servidor local."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Encontrado um erro removendo diretório a partir do servidor de armazenamento local."
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encontrado um erro removendo diretório a partir do S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "O armazenamento de arquivos não está configurado corretamente. Por favor, configure o S3 ou o armazenamento de arquivos no servidor local."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Encontrado um erro removendo arquivo a partir do servidor de armazenamento local."
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encontrado um erro removendo arquivo a partir do S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Carregado o sistema de traduções para '%v' de '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Não foi possível encontrar o usuário teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Não foi possível encontrar o comando"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Webhook inválido"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Não é possível processar os dados de entrada"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Falha ao criar o diretório observador %v"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 47874bee6..c76c81ca4 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -592,6 +592,14 @@
     "translation": "У вас нет прав для переименовании канала."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Ошибка обновления текущего канала."
   },
@@ -844,156 +852,16 @@
     "translation": "Настройки недоступны на вашем устройстве"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Следующий канал в вашей истории\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+ВПРАВО"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Предыдущий канал в вашей истории\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+ВЛЕВО"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+МИНУС: Уменьшить размер шрифта (отдалить)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+ПЛЮС: Увеличить размер шрифта (приблизить)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Встроенные команды\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+ВНИЗ (в поле ввода): Выделить текст до следующей строки\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+ВВЕРХ (в поле ввода): Выделить текст до предыдущей строки\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ВВОД (в поле ввода): Создать новую строку\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Отображает список сочетаний клавиш"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Файлы\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Загрузить файл(ы)\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Горячие клавиши\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[character]+TAB: Автодополнение названия канала, начинающегося с символа [character]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[character]+TAB: Автодополнение эмодзи, начинающегося с символа [character]\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[character]+TAB: Автодополнение @имени пользователя, начинающегося с символа [character]\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "ВВЕРХ (в пустом поле ввода): Редактировать ваше последнее сообщение в этом канале\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### Сообщения\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Пометить все сообщения в текущем канале как прочитанные\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+ВВЕРХ (в пустом поле ввода): Ответить на последнее сообщение в канале\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+ВНИЗ (в пустом поле ввода): Ввести следующее сообщение или команду\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+ВВЕРХ (в пустом поле ввода): Ввести предыдущее сообщение или команду\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "комбинации клавиш"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Открыть меню личных сообщений\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Навигация\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+ВНИЗ: Следующий канал или диалог в левом боковом меню\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+ВВЕРХ: Предыдущий канал или диалог в левом боковом меню\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Открыть недавние упоминания\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Открыть настройки аккаунта\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: Открыть диалог переключения между каналами\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K: Открыть диалог быстрого переключения между каналами\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+ВНИЗ: Следующий канал или диалог в левом боковом меню с непрочитанными сообщениями\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+ВВЕРХ: Предыдущий канал или диалог в левом боковом меню с непрочитанными сообщениями\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "Поиск недоступен на вашем устройстве"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "Не удалось локально переместить файл."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "Хранилище файлов не настроено. Пожалуйста, настройте или S3 или локальное серверное файловое хранилище."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Произошла ошибка при создании директории для нового файла"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Произошла ошибка при записи в локальное серверное хранилище"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 не поддерживается."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "Хранилище файлов не настроено. Пожалуйста, настройте или S3 или локальное серверное файловое хранилище."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Initializing open graph protocol api routes"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} и {{.LastUsername}} были упомянуты, но они не получили уведомлений поскольку не состоят в этом канале."
   },
@@ -1698,6 +1562,10 @@
     "translation": "Ошибочный RouteId параметр"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "Ошибка создания записи"
   },
@@ -1726,6 +1594,14 @@
     "translation": "Упоминание @here было отключено, поскольку количество пользователей на канале превышает {{.Users}}."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "Недопустимый идентификатор клиента"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} файл отправлен: {{.Filenames}}{{.Count}} файлов отправлено: {{.Filenames}}",
@@ -1981,7 +1857,7 @@
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
-    "translation": "The Integration/Slack Bot user with email {{.Email}} and password {{.Password}} has been imported.\r\n"
+    "translation": "Slack пользователь с email {{.Email}} и паролем {{.Password}} импортирован.\r\n"
   },
   {
     "id": "api.slackimport.slack_add_bot_user.unable_import",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "User access token added to your account"
+    "translation": "Personal access token added to your account"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] User access token added to your account"
+    "translation": "[{{ .SiteName }}] Personal access token added to your account"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send user access token added email successfully"
+    "translation": "Failed to send personal access token added email successfully"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "Для создания канала необходимо указать ID команды"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Не удалось обновить заголовок канала."
   },
@@ -3529,7 +3409,7 @@
   },
   {
     "id": "app.notification.body.intro.notification.full",
-    "translation": "You have a new notification."
+    "translation": "У вас есть новое уведомление."
   },
   {
     "id": "app.notification.body.intro.notification.generic",
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Не удалось удалить реакцию"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Не удалось удалить реакцию"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Не удалось удалить реакцию"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
   },
@@ -3788,6 +3708,22 @@
     "translation": "Экспорт комплаенс-листа начат для задачи '{{.JobName}}' в '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Setting up Elasticsearch Client Failed"
   },
@@ -3816,6 +3752,14 @@
     "translation": "Failed to index the post"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch is not started"
   },
@@ -4344,6 +4288,10 @@
     "translation": "Error creating SAML certificate multipart form request"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "\"Создать в\" должно быть корректным временем"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Недопустимы идентификатор пользователя"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Недопустимый идентификатор канала"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Invalid command id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "\"Создать в\" должно быть корректным временем"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Invalid command hook id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Некорректный родительский идентификатор"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Некорректный идентификатор root"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Недопустимый идентификатор пользователя"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "\"Создать в\" должно быть корректным временем"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Невозможно включить пакетную обработку почты при включенной кластеризации."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
   },
@@ -4432,6 +4412,10 @@
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
   },
@@ -5176,6 +5160,10 @@
     "translation": "невозможно декодировать"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error invoking plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "Не удалось изменить тип колонки %v"
   },
@@ -5596,6 +5584,26 @@
     "translation": "Не удалось обновить команду"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Не удалось получить вебхук"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "Не удалось сохранить IncomingWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "You cannot update an existing CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Unable to use the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Неверный вебхук"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Возникла ошибка с получением комплаенс-отчетов"
   },
@@ -5648,6 +5656,10 @@
     "translation": "Мы не смогли получить информацию о файле к сообщению"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "Мы не смогли сохранить информацию о файле"
   },
@@ -6552,6 +6564,30 @@
     "translation": "Аналитика не инициализирована"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Хранилище файлов не настроено. Пожалуйста, настройте S3 или локальное серверное файловое хранилище."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Произошла ошибка при чтении из локального серверного хранилища"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Хранилище файлов не настроено. Пожалуйста, настройте S3 или локальное серверное файловое хранилище."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Произошла ошибка при чтении из локального серверного хранилища"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "Загружен перевод системы на '%v' из '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Не удалось найти пользователя teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Не удалось найти канал"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Неверный вебхук"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Невозможно разобрать входящие данные"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Не удалось создать наблюдатель каталога %v"
   },
diff --git a/i18n/tr.json b/i18n/tr.json
index d77e8e728..0b8393ef8 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -592,6 +592,14 @@
     "translation": "Kanalı yeniden adlandırma izniniz yok."
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Kanal adında en fazla {{.Length}} karakter bulunmalıdır."
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Kanal adında en az {{.Length}} karakter bulunmalıdır."
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "Geçerli kanal güncellenirken sorun çıktı."
   },
@@ -844,156 +852,16 @@
     "translation": "Ayarlar komutu aygıtınız için desteklenmiyor"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}: Geçmişinizdeki sonraki kanal\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+SAĞ"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Geçmişinizdeki önceki kanal\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+SOL"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MINUS: Yazı boyutunu küçült (uzaklaştır)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS: Yazı boyutunu büyüt (yakınlaştır)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### İç Tarayıcı Komutları\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+AŞAĞI (giriş alanında): Sonraki satırdaki metni vurgula\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+YUKARI (giriş alanında): Önceki satırdaki metni vurgula\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (giriş alanında): Yeni bir satır ekle\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "Tuş takımı kısayollarının listesini görüntüler"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### Dosyalar\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U: Dosyaları yükle\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### Tuş Takımı Kısayolları\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[character]+TAB: Kanalı [character] karakteriyle başlayarak otomatik tamamla\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[character]+TAB: Emojiyi [character] karakteriyle başlayarak otomatik tamamla\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[character]+TAB: @kullanıcıadını [character] karakteriyle başlayarak otomatik tamamla\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "YUKARI (boş giriş alanında): Geçerli kanaldaki son iletimi düzenle\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### İletiler\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC: Geçerli kanaldaki tüm iletileri okunmuş olarak işaretle\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+UP (boş giriş alanında): Geçerli kanalda son gönderilen iletiyi yanıtla\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+AŞAĞI (boş giriş alanında): Sonraki iletiyi ya da yazdığım bölü komutunu yeniden yaz\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+YUKARI (boş giriş alanında): Önceki iletiyi ya da yazdığım bölü komutunu yeniden yaz\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "kısayollar"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: Doğrudan iletiler menüsünü açar\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### Gezinme\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+AŞAĞI: Sol yan çubukta sonraki kanal ya da doğrudan ileti\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+YUKARI: Sol yan çubukta önceki kanal ya da doğrudan ileti\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Son anmaları aç\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Hesap ayarlarını aç\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K: Hızlı kanal değiştirme penceresini aç\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K: Hızlı takım değiştirme penceresini aç\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+AŞAĞI: Okunmamış iletilerle sol yan çubukta sonraki kanal ya da doğrudan ileti\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+YUKARI: Okunmamış iletilerle sol yan çubukta önceki kanal ya da doğrudan ileti\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "Kısayollar komutu aygıtınız için desteklenmiyor"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "Dosya yerel olarak taşınamadı."
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "Dosya depolaması doğru şekilde ayarlanmamış. Lütfen dosya depolaması için bir S3 ya da yerel sunucusu ayarlayın."
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Yeni dosya için klasör eklenirken bir sorun çıktı"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Yerel sunucu depolamasına yazılırken bir sorun çıktı"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 desteklenmiyor."
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "Dosya depolaması doğru şekilde ayarlanmamış. Lütfen dosya depolaması için bir S3 ya da yerel sunucusu ayarlayın."
   },
@@ -1662,6 +1514,18 @@
     "translation": "Initializing open graph protocol api routes"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "Multipart/form isteğindeki dosya dizisi boş"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Multipart/form isteğindeki dosya açılamadı"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Multipart/form isteğindeki dosya eksik"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}} ve {{.LastUsername}} anıldı, ancak bu kanalın üyesi olmadıklarından bildirimleri almayacaklar."
   },
@@ -1698,6 +1562,10 @@
     "translation": "RootID parametresi geçersiz"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "Kanal salt okunur. Yalnız izni olan üyeler buraya ileti gönderebilir."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "İleti oluşturulurken sorun çıktı"
   },
@@ -1726,6 +1594,14 @@
     "translation": "Kanalda {{.Users}} taneden fazla kullanıcı bulunduğundan @here seçeneği devre dışı bırakıldı."
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "İşlem kodu geçersiz"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "İşlem bütünleştirme sorunu"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} dosya gönderildi: {{.Filenames}}",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "{{ .SiteURL }} sitesindeki hesabınıza bir kullanıcı erişimi kodu eklendi. Bu kod {{.SiteName}} sitesindeki hesabınıza erişmek için kullanılacak.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
+    "translation": "{{ .SiteURL }} sitesindeki hesabınıza bir kişisel erişim kodu eklendi. Bu kod hesabınızı kullanarak {{.SiteName}} sitesine erişmek için kullanılabilir.<br>Bu değişikliği siz yapmadıysanız lütfen sistem yöneticiniz ile görüşün."
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "Kullanıcı erişimi kodu hesabınıza eklendi"
+    "translation": "Hesabınıza kişisel erişim kodu eklendi"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] kullanıcı erişimi kodu hesabınıza eklendi"
+    "translation": "[{{ .SiteName }}] kişisel erişim kodu hesabınıza eklendi"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2829,7 +2705,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML ayarları yapılmamış ya da bu sunucu tarafından desteklenmiyor."
+    "translation": "SAML 2.0 ayarları yapılmamış ya da bu sunucu tarafından desteklenmiyor."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "E-postaya eklenen kullanıcı erişim kodu gönderilemedi"
+    "translation": "Kişisel erişim kodu eklendi e-postası gönderilemedi"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "Bir kanal eklemek için takım kodu belirtilmelidir"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Kanal amacı iletisi gönderilemedi"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] {{ .TeamName}} takımında {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni bildirim"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Ayıklanan uygulama eki etkinleştirilemedi. Uygulama eki zaten var ve etkinleştirilmiş olabilir."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Ayıklanan dosyalarda bozuk bir dosya yolu var"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "Uygulama eki devre dışı bırakılamadı"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Uygulama eki ayıklanırken sorun çıktı"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Etkin uygulama ekleri alınamadı"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Ayıklanan uygulama eki bilgi dosyası bulunamadı"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Uygulama eki geçici klasörden son hedefine taşınamadı"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "Sıkıştırılmış klasör içinde herhangi bir dosya bulunamadı"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "Uygulama eki silinemedi"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "Bu sunucu üzerinde kişisel erişim kodları devre dışı bırakılmış. Lütfen ayrıntılı bilgi almak için sistem yöneticiniz ile görüşün."
   },
@@ -3788,6 +3708,22 @@
     "translation": "'{{.JobName}}' görevi için '{{.FilePath}}' konumuna uygunluk dışa aktarma işlemi başlatıldı"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch toplayıcı işlemi dizin işlemini oluşturamadı"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch toplayıcı işlemi dizinleri silemedi"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch toplayıcı işlemi dizinleri alamadı"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch toplayıcı işlemi dizin işlemi tamamlanamadığından yarım kaldı"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "Elasticsearch İstemcisi Kurulamadı"
   },
@@ -3816,6 +3752,14 @@
     "translation": "İleti dizine eklenemedi"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch toplayıcı işlemi bitiş zamanını işleyemedi"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch toplayıcı işlemi başlangıç zamanını işleyemedi"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch başlatılmamış"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML ayarları yapılmamış ya da bu sunucu tarafından desteklenmiyor."
+    "translation": "SAML 2.0 ayarları yapılmamış ya da bu sunucu tarafından desteklenmiyor."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "SAML setifikası çoklu form isteği oluşturulurken sorun çıktı"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Multipart isteği oluşturulamadı"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "Oluşturulma zamanı geçerli bir zaman olmalıdır"
   },
@@ -4392,6 +4340,34 @@
     "translation": "Kullanıcı kodu geçersiz"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "Kanal kodu geçersiz"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Komut kodu geçersiz"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "Oluşturulma zamanı geçerli bir zaman olmalıdır"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Komut bağlantı kodu geçersiz"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "Üst öge kodu geçersiz"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "Kök kodu geçersiz"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "Kullanıcı kodu geçersiz"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "Oluşturulma zamanı geçerli bir zaman olmalıdır"
   },
@@ -4420,6 +4396,10 @@
     "translation": "Küme özelliği etkinleştirilmişken toplu e-posta etkinleştirilemez."
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch toplayıcı AggregatePostsAfterDays ayarının değeri 1 ya da daha büyük bir sayı olmalıdır"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
   },
@@ -4432,6 +4412,10 @@
     "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled."
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch toplayıcı JobStartTime ayarının değeri \"ss:dd\" biçiminde bir zaman olmalıdır"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
   },
@@ -5176,6 +5160,10 @@
     "translation": "kod çözülemedi"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Uygulama eki RPC eklenirken sorun çıktı"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "%v sütun türü değiştirilemedi"
   },
@@ -5596,6 +5584,26 @@
     "translation": "Komut güncellenemedi"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "Web bağlantısı alınamadı"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "KomutWebBağlantısı kaydedilemedi"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "Var olan bir KomutWebBağlantısını güncelleyemezsiniz"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Web bağlantısı kullanılamaz"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "Web bağlantısı geçersiz"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "Uygunluk raporları alınırken bir sorun çıktı"
   },
@@ -5648,6 +5656,10 @@
     "translation": "İletinin dosya bilgileri alınamadı"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "Dosya bilgileri kalıcı olarak silinemedi"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "Dosya bilgileri kaydedilemedi"
   },
@@ -6552,6 +6564,30 @@
     "translation": "Analytics başlatılmadı"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "Dosya depolaması doğru şekilde yapılandırılmamış. Lütfen S3 ya da yerel sunucusu depolamasını yapılandırın."
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Klasör yerel sunucu depolaması üzerinden silinirken bir sorun çıktı."
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Klasör S3 üzerinden silinirken bir sorun çıktı."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "Dosya depolaması doğru şekilde yapılandırılmamış. Lütfen S3 ya da yerel sunucu depolamasını yapılandırın."
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "Dosya yerel sunucu depolaması üzerinden silinirken bir sorun çıktı"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Dosya S3 üzerinden silinirken bir sorun çıktı."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "'%v' için sistem çevirileri '%v' üzerinden yüklendi"
   },
@@ -6664,6 +6700,18 @@
     "translation": "Kullanıcı bulunamadı. Takım Kodu: %v, E-posta: %v, Hata: %v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "Komut bulunamadı"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "Web bağlantısı geçersiz"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "Gelen veriler işlenemedi"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "Klasör izleyici eklenemedi %v"
   },
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index c0915dd65..644fefef4 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -592,6 +592,14 @@
     "translation": "您没有权限重命名频道。"
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "更新当前频道错误。"
   },
@@ -844,156 +852,16 @@
     "translation": "您的设备不支持设定命令"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}：您的历史记录里的下一个频道\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+RIGHT"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}：您的历史记录里的上一个频道\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+LEFT"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+减号：减少字体大小 (缩小)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+加号：增加字体大小 (放大)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### 内置浏览器命令\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+DOWN (在输入栏)：高亮到下一行之间的文字\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+UP (在输入栏)：高亮到上一行之间的文字\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (在输入栏)：新增行\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "显示快捷键列表"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### 文件\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U：上传文件\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### 键盘快捷键\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[字符]+TAB：自动完成以[字符]开头的频道\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[字符]+TAB：自动完成以[字符]开头的 @用户名\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "向上键 (在空白输入栏)：修改您在本频道的上一条消息\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### 消息\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC：将当前频道所有消息标为已读\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+UP (在空输入栏)：回复当前频道最新的消息\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+向下键 (在空白输入栏)：重显示您输入的下一条消息或斜杠命令\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+向上键 (在空白输入栏)：重显示您输入的上一条消息或斜杠命令\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "快捷键"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K：打开私信菜单\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### 导航\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+向下键：左侧栏中的下一个频道或私信\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+向上键：左侧栏中的上一个频道或私信\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M：打开最近提及\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A：打开帐号设置\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K：打开频道快速切换对话框\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K：打开团队快速切换对话框\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+向下键：左侧栏中的下一个有未读消息的频道或私信\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+向上键：左侧栏中的上一个有未读消息的频道或私信\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "您的设备不支持快捷命令"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "无法移动本地文件。"
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "没有配置文件存储。请配置S3或本地服务器的文件存储。"
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "创建新文件的目录时遇到错误"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "写入本地存储时遇到错误"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "不支持 S3。"
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "没有配置文件存储。请配置S3或本地服务器的文件存储。"
   },
@@ -1662,6 +1514,18 @@
     "translation": "正在初始化 open graph 协议 api 路由"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "{{.Usernames}}和{{.LastUsername}}被提到了，但是他们不会收到通知，因为他们不在这个频道。"
   },
@@ -1698,6 +1562,10 @@
     "translation": "无效的RootId参数"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "创建信息时出错"
   },
@@ -1726,6 +1594,14 @@
     "translation": "@here 已禁用因为频道超过 {{.Users}} 位用户。"
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "无效客户端id"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} 文件已发送：{{.Filenames}}{{.Count}} 文件已发送：{{.Filenames}}",
@@ -2497,15 +2373,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "一个用户访问令牌在 {{ .SiteURL }} 创建到了您的帐号。他们可以以您的帐号访问 {{.SiteName}}。<br>如果此操作非来自您，请联系您的系统管理员。"
+    "translation": "一个个人访问令牌在 {{ .SiteURL }} 创建到了您的帐号。他们可以以您的帐号访问 {{.SiteName}}。<br>如果此操作非来自您，请联系您的系统管理员。"
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "已添加用户访问令牌到您的帐号"
+    "translation": "已添加用个人访问令牌到您的帐号"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] 已添加用户访问令牌到您的帐号"
+    "translation": "[{{ .SiteName }}] 已添加个人访问令牌到您的帐号"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2829,7 +2705,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "此服务器没有正确配置或者不支持 SAML。"
+    "translation": "此服务器没有正确配置或者不支持 SAML 2.0。"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2865,7 +2741,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "发送成功添加用户访问令牌邮件失败"
+    "translation": "发送成功添加个人访问令牌邮件失败"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3120,6 +2996,10 @@
     "translation": "必须指定团队ID才能创建频道"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "发送频道作用消息失败"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{ .SiteName }}] 在 [{{ .SiteName }}] 的通知于 {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "无法删除反应"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "无法删除反应"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "无法删除反应"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "个人访问令牌在本服务器禁用。请联系您的系统管理员了解详情。"
   },
@@ -3788,6 +3708,22 @@
     "translation": "导出审核自'{{.FilePath}}'的'{{.JobName}}'任务开始"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "设置 ElasticSearch 客户端失败"
   },
@@ -3816,6 +3752,14 @@
     "translation": "索引消息失败"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "ElasticSearch没有启动"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "本服务器未设定或支持 SAML。"
+    "translation": "此服务器没有正确配置或者不支持 SAML 2.0。"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "创建 SAML 证书多部分表格请求失败"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "创建时必须是有效时间"
   },
@@ -4392,6 +4340,34 @@
     "translation": "无效用户id"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "无效的频道 id"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "无效命令 id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "创建时必须有效时间"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "无效的命令钩子 id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "无效父 id"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "无效根 id"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "无效用户 id"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "创建时间必须为有效时间"
   },
@@ -4420,6 +4396,10 @@
     "translation": "当机群启用时没法启动批量电子邮件。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search ConnectionUrl 设定。"
   },
@@ -4432,6 +4412,10 @@
     "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search 密码设定。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search 用户名设定。"
   },
@@ -5176,6 +5160,10 @@
     "translation": "无法解码"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "调用插件 RPC 错误"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "栏目类型%v修改失败"
   },
@@ -5596,6 +5584,26 @@
     "translation": "我们无法更新这个命令"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "我们不能获取 webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "我们不能保存 CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "您不能更新现有的 CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "无法使用 webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "无效的 webhook"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "我们获取合规报告时遇到错误"
   },
@@ -5648,6 +5656,10 @@
     "translation": "我们没法从信息获取文件信息"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "我们无法永久删除文件信息"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "我们无法保存文件信息"
   },
@@ -6552,6 +6564,30 @@
     "translation": "解析未初始化"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "文件存储没有正确配置。请配置 S3 或本地文件存储服务。"
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "从本地存储移除目录时遇到错误。"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "从 S3 移除目录时遇到错误。"
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "文件存储没有正确配置。请配置 S3 或本地文件存储服务。"
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "从本地存储移除文件时遇到错误。"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "从 S3 移除文件时遇到错误。"
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "加载系统翻译 '%v' 从 '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "不能找到用户 teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "找不到该命令"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "无效的 webhook"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "无法解析传入数据"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "创建目录监视器失败 %v"
   },
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index 52e204a4f..479783042 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -592,6 +592,14 @@
     "translation": "權限不足以更改頻道名稱。"
   },
   {
+    "id": "api.command_channel_rename.too_long.app_error",
+    "translation": "Channel name must be {{.Length}} or fewer characters"
+  },
+  {
+    "id": "api.command_channel_rename.too_short.app_error",
+    "translation": "Channel name must be {{.Length}} or more characters"
+  },
+  {
     "id": "api.command_channel_rename.update_channel.app_error",
     "translation": "更新當前頻道時錯誤。"
   },
@@ -844,156 +852,16 @@
     "translation": "當前裝置不支援設定命令"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_next",
-    "translation": "{{.ChannelNextCmd}}：紀錄的下一個頻道\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd",
-    "translation": "ALT+RIGHT"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
-    "translation": "CMD+]"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}：紀錄的前一個頻道\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+LEFT"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_decrease",
-    "translation": "{{.CmdOrCtrl}}+MINUS：減少字體尺寸(縮小)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS：增加字體尺寸(放大)\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### 瀏覽器內建命令\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_next",
-    "translation": "SHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.newline",
-    "translation": "SHIFT+ENTER (在輸入欄)：新增一行\n"
-  },
-  {
-    "id": "api.command_shortcuts.cmd",
-    "translation": "CMD"
-  },
-  {
-    "id": "api.command_shortcuts.ctrl",
-    "translation": "CTRL"
-  },
-  {
     "id": "api.command_shortcuts.desc",
     "translation": "顯示鍵盤快捷鍵列表"
   },
   {
-    "id": "api.command_shortcuts.files.header",
-    "translation": "#### 檔案\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files.upload",
-    "translation": "{{.CmdOrCtrl}}+U：上傳檔案\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.header",
-    "translation": "### 鍵盤快捷鍵\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_channel",
-    "translation": "~[文字]+TAB：自動完成以[文字]起始的頻道\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_emoji",
-    "translation": ":[文字]+TAB：自動完成以[文字]起始的繪文字\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.comp_username",
-    "translation": "@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.edit",
-    "translation": "UP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.header",
-    "translation": "#### 訊息\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.mark_as_read",
-    "translation": "ESC：將當前頻道所有訊息設為已讀\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reply",
-    "translation": "SHIFT+UP (在空的輸入欄)：回覆當前頻道最新的訊息\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_next",
-    "translation": "{{.CmdOrCtrl}}+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\n"
-  },
-  {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\n"
-  },
-  {
     "id": "api.command_shortcuts.name",
     "translation": "快捷鍵"
   },
   {
-    "id": "api.command_shortcuts.nav.direct_messages_menu",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+K: 開啟直接傳訊選單\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.header",
-    "translation": "#### 瀏覽\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.next",
-    "translation": "ALT+DOWN：側邊欄裡面下一個頻道或直接訊息\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.prev",
-    "translation": "ALT+UP：側邊欄裡面上一個頻道或直接訊息\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.recent_mentions",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+M：開啟最近提及您的訊息\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.settings",
-    "translation": "{{.CmdOrCtrl}}+SHIFT+A：開啟帳號設定\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher",
-    "translation": "{{.CmdOrCtrl}}+K：開啟快速切換頻道對話框\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.switcher_team",
-    "translation": "{{.CmdOrCtrl}}+ALT+K：開啟快速切換團隊對話框\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\n"
-  },
-  {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\n"
+    "id": "api.command_shortcuts.unsupported.app_error",
+    "translation": "當前裝置不支援搜尋命令"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1374,22 +1242,6 @@
     "translation": "無法移動本地端的檔案。"
   },
   {
-    "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "檔案儲存位置設定不正確。請設定為 S3 或是本地儲存。"
-  },
-  {
-    "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "建立新檔案的目錄時遇到錯誤"
-  },
-  {
-    "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "寫入本地儲存時遇到錯誤"
-  },
-  {
-    "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "不支援 S3。"
-  },
-  {
     "id": "api.file.read_file.configured.app_error",
     "translation": "檔案儲存位置設定不正確。請設定為 S3 或是本地儲存。"
   },
@@ -1662,6 +1514,18 @@
     "translation": "初始化 Open Graph 協定 API 路徑"
   },
   {
+    "id": "api.plugin.upload.array.app_error",
+    "translation": "File array is empty in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.file.app_error",
+    "translation": "Unable to open file in multipart/form request"
+  },
+  {
+    "id": "api.plugin.upload.no_file.app_error",
+    "translation": "Missing file in multipart/form request"
+  },
+  {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
     "translation": "無法傳送通知給{{.Usernames}} 與 {{.LastUsername}}，因為他們並未加入此頻道。"
   },
@@ -1698,6 +1562,10 @@
     "translation": "無效的 RootId 參數"
   },
   {
+    "id": "api.post.create_post.town_square_read_only",
+    "translation": "This channel is read-only. Only members with permission can post here."
+  },
+  {
     "id": "api.post.create_webhook_post.creating.app_error",
     "translation": "建立訊息時遇到錯誤"
   },
@@ -1726,6 +1594,14 @@
     "translation": "由於頻道使用者超過 {{.Users}} 人，已停用@here。"
   },
   {
+    "id": "api.post.do_action.action_id.app_error",
+    "translation": "無效的用戶 ID"
+  },
+  {
+    "id": "api.post.do_action.action_integration.app_error",
+    "translation": "Action integration error"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "已送出 {{.Count}} 個檔案：{{.Filenames}}已送出 {{.Count}} 個檔案：{{.Filenames}}",
@@ -3120,6 +2996,10 @@
     "translation": "建立頻道時必須指定團隊 ID"
   },
   {
+    "id": "app.channel.move_channel.members_do_not_match.error",
+    "translation": "Cannot move a channel unless all its members are already members of the destination team."
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "發送頻道用途訊息失敗"
   },
@@ -3560,6 +3440,46 @@
     "translation": "[{{.SiteName}}] 來自 {{.TeamName}} 的通知，發於 {{.Year}} {{.Month}} {{.Day}}"
   },
   {
+    "id": "app.plugin.activate.app_error",
+    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+  },
+  {
+    "id": "app.plugin.bad_path.app_error",
+    "translation": "Bad file path in extracted files"
+  },
+  {
+    "id": "app.plugin.deactivate.app_error",
+    "translation": "無法刪除互動"
+  },
+  {
+    "id": "app.plugin.disabled.app_error",
+    "translation": "Plugins have been disabled by the system admin or the server has not been restarted since they were enabled."
+  },
+  {
+    "id": "app.plugin.extract.app_error",
+    "translation": "Encountered error extracting plugin"
+  },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "無法刪除互動"
+  },
+  {
+    "id": "app.plugin.manifest.app_error",
+    "translation": "Unable to find manifest for extracted plugin"
+  },
+  {
+    "id": "app.plugin.mvdir.app_error",
+    "translation": "Unable to move plugin from temporary directory to final destination"
+  },
+  {
+    "id": "app.plugin.no_files.app_error",
+    "translation": "No files found in the compressed folder"
+  },
+  {
+    "id": "app.plugin.remove.app_error",
+    "translation": "無法刪除互動"
+  },
+  {
     "id": "app.user_access_token.disabled",
     "translation": "個人存取 Token 在此伺服器被停用。詳情請洽管理員。"
   },
@@ -3788,6 +3708,22 @@
     "translation": "規範匯出作業 '{{.JobName}}' 開始，匯出到 '{{.FilePath}}'"
   },
   {
+    "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
+    "translation": "Elasticsearch aggregator worker failed to create the indexing job"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.delete_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to delete the indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.get_indexes.error",
+    "translation": "Elasticsearch aggregator worker failed to get indexes"
+  },
+  {
+    "id": "ent.elasticsearch.aggregator_worker.index_job_failed.error",
+    "translation": "Elasticsearch aggregator worker failed due to the indexing job failing"
+  },
+  {
     "id": "ent.elasticsearch.create_client.connect_failed",
     "translation": "設定 Elasticsearch 用戶端時失敗"
   },
@@ -3816,6 +3752,14 @@
     "translation": "索引訊息時失敗"
   },
   {
+    "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the end time"
+  },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.parse_start_time.error",
+    "translation": "Elasticsearch indexing worker failed to parse the start time"
+  },
+  {
     "id": "ent.elasticsearch.not_started.error",
     "translation": "Elasticsearch 沒有啟動"
   },
@@ -4037,7 +3981,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "本機不支援或未設定SAML"
+    "translation": "本機不支援或未設定 SAML"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -4344,6 +4288,10 @@
     "translation": "建立 SAML 憑證 multipart 表單要求時遇到錯誤"
   },
   {
+    "id": "model.client.writer.app_error",
+    "translation": "Unable to build multipart request"
+  },
+  {
     "id": "model.command.is_valid.create_at.app_error",
     "translation": "\"新增時間\"必須是一個有效時間"
   },
@@ -4392,6 +4340,34 @@
     "translation": "無效的使用者 ID"
   },
   {
+    "id": "model.command_hook.channel_id.app_error",
+    "translation": "無效的頻道 ID"
+  },
+  {
+    "id": "model.command_hook.command_id.app_error",
+    "translation": "Invalid command id"
+  },
+  {
+    "id": "model.command_hook.create_at.app_error",
+    "translation": "\"新增時間\"必須是一個有效時間"
+  },
+  {
+    "id": "model.command_hook.id.app_error",
+    "translation": "Invalid command hook id"
+  },
+  {
+    "id": "model.command_hook.parent_id.app_error",
+    "translation": "無效的上層 ID"
+  },
+  {
+    "id": "model.command_hook.root_id.app_error",
+    "translation": "無效的根 ID"
+  },
+  {
+    "id": "model.command_hook.user_id.app_error",
+    "translation": "無效的使用者 ID"
+  },
+  {
     "id": "model.compliance.is_valid.create_at.app_error",
     "translation": "\"新增時間\"必須是一個有效時間"
   },
@@ -4420,6 +4396,10 @@
     "translation": "啟用叢集時無法啟用批次郵件"
   },
   {
+    "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
+    "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
+  },
+  {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "當啟用 ElasticSearch 搜尋時必須設定 ElasticSearch ConnectionUrl。"
   },
@@ -4432,6 +4412,10 @@
     "translation": "當啟用 ElasticSearch 搜尋時必須設定 ElasticSearch 密碼。"
   },
   {
+    "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
+    "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
+  },
+  {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "當啟用 ElasticSearch 搜尋時必須設定 ElasticSearch 使用者名稱。"
   },
@@ -5176,6 +5160,10 @@
     "translation": "無法解碼"
   },
   {
+    "id": "plugin.rpcplugin.invocation.error",
+    "translation": "Error invoking plugin RPC"
+  },
+  {
     "id": "store.sql.alter_column_type.critical",
     "translation": "更動欄位類型 %v 失敗"
   },
@@ -5596,6 +5584,26 @@
     "translation": "無法更新命令"
   },
   {
+    "id": "store.sql_command_webhooks.get.app_error",
+    "translation": "無法取得 Webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.app_error",
+    "translation": "無法儲存傳入的 Webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.save.existing.app_error",
+    "translation": "You cannot update an existing CommandWebhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.app_error",
+    "translation": "Unable to use the webhook"
+  },
+  {
+    "id": "store.sql_command_webhooks.try_use.invalid.app_error",
+    "translation": "無效的 Webhook"
+  },
+  {
     "id": "store.sql_compliance.get.finding.app_error",
     "translation": "取得規範報告時遇到錯誤"
   },
@@ -5648,6 +5656,10 @@
     "translation": "無法取得發文的檔案訊息"
   },
   {
+    "id": "store.sql_file_info.permanent_delete.app_error",
+    "translation": "We couldn't permanently delete the file info"
+  },
+  {
     "id": "store.sql_file_info.save.app_error",
     "translation": "無法儲存檔案訊息"
   },
@@ -6552,6 +6564,30 @@
     "translation": "分析尚未初始化"
   },
   {
+    "id": "utils.file.remove_directory.configured.app_error",
+    "translation": "檔案儲存位置設定不正確。請設定為 S3 或是本地儲存。"
+  },
+  {
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "從本地儲存讀取時遇到錯誤"
+  },
+  {
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
+  },
+  {
+    "id": "utils.file.remove_file.configured.app_error",
+    "translation": "檔案儲存位置設定不正確。請設定為 S3 或是本地儲存。"
+  },
+  {
+    "id": "utils.file.remove_file.local.app_error",
+    "translation": "從本地儲存讀取時遇到錯誤"
+  },
+  {
+    "id": "utils.file.remove_file.s3.app_error",
+    "translation": "Encountered an error removing file from S3."
+  },
+  {
     "id": "utils.i18n.loaded",
     "translation": "已載入系統翻譯 '%v' 來自 '%v'"
   },
@@ -6664,6 +6700,18 @@
     "translation": "找不到使用者 teamid=%v, email=%v, err=%v"
   },
   {
+    "id": "web.command_webhook.command.app_error",
+    "translation": "找不到頻道"
+  },
+  {
+    "id": "web.command_webhook.invalid.app_error",
+    "translation": "無效的 Webhook"
+  },
+  {
+    "id": "web.command_webhook.parse.app_error",
+    "translation": "無法解析流入的資料"
+  },
+  {
     "id": "web.create_dir.error",
     "translation": "建立目錄監控 %v 失敗"
   },