daily translations 20160823 (#3864)

10 files changed, 1473 insertions, 249 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 0ab8a12d9..f8b9d687b 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -324,10 +324,18 @@
     "translation": "Sie haben nicht die erforderlichen Zugriffsrechte "
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v was removed from the channel."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "Der Benutzer konnte nicht entfernt werden."
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "Der hinzuzufügende Benutzer konnte nicht gefunden werden"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "Der Channel wurde archiviert oder gelöscht"
   },
@@ -556,22 +564,46 @@
     "translation": "Benachrichtigter Benutzer."
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "Eine Liste der Tastaturkürzel anzeigen"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### Tastaturkürzel\n\n#### Navigation\n\nALT+HOCH: Vorheriger Kanal oder Direktnachricht in linker Sidebar\nALT+RUNTER: Nächster Kanal oder Direktnachricht in linker Sidebar\nALT+SHIFT+HOCH: Vorheriger Kanal oder Direktnachricht in linker Sidebar mit ungelesenen Nachrichten\nALT+SHIFT+RUNTER: Nächster Kanal oder Direktnachricht in linker Sidebar mit ungelesenen Nachrichten\nSTRG+K: Kanalschnellwechselfenster öffnen\nSTRG+SHIFT+A: Benutzereinstellungen öffnen\nSTRG+SHIFT+M: Öffnet die letzten Erwähnungen\n\n#### Dateien\n\nSTRG+U: Datei(en) hochladen\n\n#### Nachrichten\n\nESC: Markiere alle Nachrichten im Kanal als gelesen\nSTRG+HOCH (im leerem Eingabefeld): Letzte Nachricht oder Slash Befehl erneut ausgeben\nSTRG+RUNTER (im leerem Eingabefeld): Nächste Nachricht oder Slash Befehl erneut ausgeben\nHOCH (in leerem Eingabefeld): Letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+TAB: Autovervollständigen @Benutzername beginnend mit [Zeichen]\n:[Zeichen]+TAB: Autovervollständigen Emoji beginnend mit [Zeichen]\n\n#### Browser Kommandos\n\nALT+LEFT: Vorheriger Kanal in Ihrer Historie\nALT+RIGH: Nächster Kanal in Ihrer Historie\nSTRG+PLUS: Schrift vergrößern (Hineinzoomen)\nSTRG+MINUS: Schrift verkleinern (Herauszoomen)\nSHIFT+HOCH (in Eingabefeld): Text bis zur vorherigen Zeile markieren\nSHIFT+RUNTER (in Eingabefeld): Text bis zur nächsten Zeile markieren\nSHIFT+ENTER (in Eingabefeld): Neue Zeile erstellen\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### Tastaturkürzel\n\n#### Navigation\n\nALT+HOCH: Vorheriger Kanal oder Direktnachricht in linker Sidebar\nALT+RUNTER: Nächster Kanal oder Direktnachricht in linker Sidebar\nALT+SHIFT+HOCH: Vorheriger Kanal oder Direktnachricht in linker Sidebar mit ungelesenen Nachrichten\nALT+SHIFT+RUNTER: Nächster Kanal oder Direktnachricht in linker Sidebar mit ungelesenen Nachrichten\nCMD+K: Kanalschnellwechselfenster öffnen\nCMD+SHIFT+A: Benutzereinstellungen öffnen\nCMD+SHIFT+M: Öffnet die letzten Erwähnungen\n\n#### Dateien\n\nCMD+U: Datei(en) hochladen\n\n#### Nachrichten\n\nESC: Markiere alle Nachrichten im Kanal als gelesen\nCMD+HOCH (im leerem Eingabefeld): Letzte Nachricht oder Slash Befehl erneut ausgeben\nCMD+RUNTER (im leerem Eingabefeld): Nächste Nachricht oder Slash Befehl erneut ausgeben\nHOCH (in leerem Eingabefeld): Letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+TAB: Autovervollständigen @Benutzername beginnend mit [Zeichen]\n:[Zeichen]+TAB: Autovervollständigen Emoji beginnend mit [Zeichen]\n\n#### Browser Kommandos\n\nCMD+[: Vorheriger Kanal in Ihrer Historie\nCMD+]: Nächster Kanal in Ihrer Historie\nCMD+PLUS: Schrift vergrößern (Hineinzoomen)\nCMD+MINUS: Schrift verkleinern (Herauszoomen)\nSHIFT+HOCH (in Eingabefeld): Text bis zur vorherigen Zeile markieren\nSHIFT+RUNTER (in Eingabefeld): Text bis zur nächsten Zeile markieren\nSHIFT+ENTER (in Eingabefeld): Neue Zeile erstellen\n"
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "Tastenkürzel"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Fügt ¯\\_(ツ)_/¯ zu Ihrer Nachricht hinzu"
   },
@@ -628,6 +660,72 @@
     "translation": "Ein unbekannter Fehler ist aufgetreten. Bitte kontaktieren Sie den Support."
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "Öffentliche Verlinkungen wurden vom Systemadministrator deaktiviert"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "Unable to find status of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "Unable to find channel of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "Direktnachricht"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "Gehe zum Beitrag"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "Unable to find sender of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "Sie haben eine neue Nachricht.",
+      "other": "Sie haben {{.Count}} neue Nachrichten."
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "Unable to find display preferences of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "Failed to send batched email notification to %v: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}",
+      "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}"
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "Unable to find recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
     "translation": "Das Emoji kann nicht erstellt werden. Ein anderes Emoji mit dem selben Namen existiert bereits."
   },
@@ -1028,10 +1126,28 @@
     "translation": "Fehler beim Erstellen des Eintrages"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "Sie haben nicht die erforderlichen Zugriffsrechte"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} file sent: {{.Filenames}}",
+      "other": "{{.Count}} files sent: {{.Filenames}}"
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} image sent: {{.Filenames}}",
+      "other": "{{.Count}} images sent: {{.Filenames}}"
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "Fehler bei Regex-Verarbeitung @mention user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "Konnte keine Benachrichtigung an Onlinebenutzer senden mit @here, err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "Unable to get profile for channel member, user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Fehler beim Abrufen der Kommentarthread Nachrichten in Benachrichtigung root_post_id=%v, err=%v"
   },
@@ -2760,6 +2880,18 @@
     "translation": "Bis muss größer als von sein"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering 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."
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Ungültiger Passwort zurücksetzen Salt in E-Mail Einstellungen.  Muss 32 Zeichen oder mehr sein."
   },
@@ -2944,6 +3076,10 @@
     "translation": "Seiten-URL muss eine gültige URL sein und mit http:// oder https:// beginnen."
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "Der Name der Site darf bis zu {{.MaxLength}} Zeichen lang sein."
   },
diff --git a/i18n/en.json b/i18n/en.json
index d026a6066..40486b58d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -324,10 +324,18 @@
     "translation": "You do not have the appropriate permissions "
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v was removed from the channel."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "Unable to remove user."
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "Failed to find user to be removed"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "The channel has been archived or deleted"
   },
@@ -556,46 +564,46 @@
     "translation": "Messaged user."
   },
   {
-    "id": "api.command_shortcuts.desc",
-    "translation": "Displays a list of keyboard shortcuts"
-  },
-  {
-    "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
-  },
-  {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "id": "api.command_shortcuts.desc",
+    "translation": "Displays a list of keyboard shortcuts"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
   },
   {
     "id": "api.command_shortcuts.files_mac",
     "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "shortcuts"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Adds ¯\\_(ツ)_/¯ to your message"
   },
@@ -660,14 +668,14 @@
     "translation": "Email batching has been disabled by the system administrator"
   },
   {
-    "id": "api.email_batching.check_pending_emails.status.app_error",
-    "translation": "Unable to find status of recipient for batched email notification"
-  },
-  {
     "id": "api.email_batching.check_pending_emails.finished_running",
     "translation": "Email batching job ran. %v user(s) still have notifications pending."
   },
   {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "Unable to find status of recipient for batched email notification"
+  },
+  {
     "id": "api.email_batching.render_batched_post.channel.app_error",
     "translation": "Unable to find channel of post for batched email notification"
   },
@@ -1098,10 +1106,6 @@
     "translation": "Bad filename discarded, filename=%v"
   },
   {
-    "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
-  },
-  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "Invalid ChannelId for RootId parameter"
   },
@@ -1122,6 +1126,10 @@
     "translation": "Error creating post"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -4854,13 +4862,5 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
-  },
-  {
-    "id": "api.channel.remove_member.removed",
-    "translation": "%v was removed from the channel."
-  },
-  {
-    "id": "api.channel.remove_member.user.app_error",
-    "translation": "Failed to find user to be removed"
   }
 ]
diff --git a/i18n/es.json b/i18n/es.json
index eae4a88a7..0fc1f0d6d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -324,10 +324,18 @@
     "translation": "No tienes los permisos apropiados "
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v fue removido del canal."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "No se puede remover el usuario."
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "Falla al encontrar el usuario a ser removido"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "El canal ha sido archivado o eliminado"
   },
@@ -357,7 +365,7 @@
   },
   {
     "id": "api.command.duplicate_trigger.app_error",
-    "translation": "Esta palabra gatilladora ya está siendo utilizada. Por favor escoge otra palabra."
+    "translation": "Esta palabra que desencadena la acción ya está siendo utilizada. Por favor escoge otra palabra."
   },
   {
     "id": "api.command.execute_command.debug",
@@ -365,19 +373,19 @@
   },
   {
     "id": "api.command.execute_command.failed.app_error",
-    "translation": "El Comando con el gatillador '{{.Trigger}}' falló"
+    "translation": "El Comando con la palabra '{{.Trigger}}' que desencadena la acción falló"
   },
   {
     "id": "api.command.execute_command.failed_empty.app_error",
-    "translation": "El Comando con el gatillador '{{.Trigger}}' retorno una respuesta vacía"
+    "translation": "El Comando con la palabra '{{.Trigger}}' que desencadena la acción retorno una respuesta vacía"
   },
   {
     "id": "api.command.execute_command.failed_resp.app_error",
-    "translation": "El Comando con el gatillador '{{.Trigger}}' retorno la respuesta {{.Status}}"
+    "translation": "El Comando con la palabra '{{.Trigger}}' que desencadena la acción retorno la respuesta {{.Status}}"
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "No se encontró el Comando con el gatillador '{{.Trigger}}'"
+    "translation": "No se encontró el Comando con la palabra '{{.Trigger}}' que desencadena la acción"
   },
   {
     "id": "api.command.execute_command.save.app_error",
@@ -385,7 +393,7 @@
   },
   {
     "id": "api.command.execute_command.start.app_error",
-    "translation": "No se encontró un gatillador para el comando"
+    "translation": "No se encontró una palabra que desencadene la acción para el comando"
   },
   {
     "id": "api.command.init.debug",
@@ -556,22 +564,46 @@
     "translation": "Mensaje enviado al usuario."
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Comandos incluidos en el Navegador\n\nALT+IZQ: Canal anterior en tu historial\nALT+DER: Canal siguiente en tu historial\nCTRL+MAS: Incrementa el tamaño de las letras (hace zoom)\nCTRL+MENOS: Reduce el tamaño de las letras (quita zoom)\nSHIFT+ARRIBA (en el cuadro de texto): Selecciona el texto en las lineas de arriba\nSHIFT+ABAJO (en el cuadro de texto): Selecciona el texto en las lineas de abajo\nSHIFT+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Comandos incluidos en el Navegador\n\nCMD+[: Canal anterior en tu historial\nCMD+]: Canal siguiente en tu historial\nCMD+MAS: Incrementa el tamaño de las letras (hace zoom)\nCMD+MENOS: Reduce el tamaño de las letras (quita zoom)\nSHIFT+ARRIBA (en el cuadro de texto): Selecciona el texto en las lineas de arriba\nSHIFT+ABAJO (en el cuadro de texto): Selecciona el texto en las lineas de abajo\nSHIFT+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "Muestra una lista de los accesos rápidos de teclado"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### Atajos de Teclado\n\n#### Navegación\n\nALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\nALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\nALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\nALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\nCTRL+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\nCTRL+MAYUS+A: Abre la configuración de la cuenta\nCTRL+MAYUS+M: Abre las menciones recientes\n\n#### Archivos\n\nCTRL+U: Subir archivo(s)\n\n#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCTRL+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCTRL+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n#### Comandos incluidos en el Navegador\n\nALT+IZQ+[: Canal anterior en tu historial\nALT+DER+]: Canal siguiente en tu historial\nCTRL+MAS: Incrementa el tamaño de las letras (hace zoom)\nCTRL+MENOS: Reduce el tamaño de las letras (quita zoom)\nSHIFT+ARRIBA (en el cuadro de texto): Selecciona el texto en las lineas de arriba\nSHIFT+ABAJO (en el cuadro de texto): Selecciona el texto en las lineas de abajo\nSHIFT+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Archivos\n\nCTRL+U: Subir archivo(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### Atajos de Teclado\n\n#### Navegación\n\nALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\nALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\nALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\nALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\nCMD+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\nCMD+MAYUS+A: Abre la configuración de la cuenta\nCMD+MAYUS+M: Abre las menciones recientes\n\n#### Archivos\n\nCMD+U: Subir archivo(s)\n\n#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCMD+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCMD+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n#### Comandos incluidos en el Navegador\n\nCMD+[: Canal anterior en tu historial\nCMD+]: Canal siguiente en tu historial\nCMD+MAS: Incrementa el tamaño de las letras (hace zoom)\nCMD+MENOS: Reduce el tamaño de las letras (quita zoom)\nSHIFT+ARRIBA (en el cuadro de texto): Selecciona el texto en las lineas de arriba\nSHIFT+ABAJO (en el cuadro de texto): Selecciona el texto en las lineas de abajo\nSHIFT+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Archivos\n\nCMD+U: Subir archivo(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCTRL+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCTRL+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCMD+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCMD+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "accesos rápidos de teclado"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Atajos de Teclado\n\n#### Navegación\n\nALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\nALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\nALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\nALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\nCTRL+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\nCTRL+MAYUS+A: Abre la configuración de la cuenta\nCTRL+MAYUS+M: Abre las menciones recientes\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Atajos de Teclado\n\n#### Navegación\n\nALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\nALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\nALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\nALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\nCMD+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\nCMD+MAYUS+A: Abre la configuración de la cuenta\nCMD+MAYUS+M: Abre las menciones recientes\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Agrega ¯\\_(ツ)_/¯ a tu mensaje"
   },
@@ -628,40 +660,106 @@
     "translation": "Ocurrió un error inesperado. Por favor contacta a soporte."
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "El trabajo de correos electrónicos por lotes del canal de recepción estaba lleno. Por favor, aumenta el EmailBatchingBufferSize."
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "Los correos electrónicos por lotes han sido deshabilitados por el administrador de sistema"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "El trabajo de correos electrónicos por lotes se ejecutó. %v / los usuario(s) todavía tienen notificaciones pendientes."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "No se puede encontrar el estado del recipiente para la notificación de correos electrónicos por lotes"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "No se puede encontrar el canal del mensaje para la notificación de correos electrónicos por lote"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "Mensaje Directo"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "Ir al mensaje"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "No se puede encontrar el remitente del mensaje para la notificación de correos electrónicos por lote"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "Tienes un mensaje nuevo.",
+      "other": "Tienes {{.Count}} mensajes nuevos."
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "No se puede encontrar las preferencias de los destinatarios para la notificación por correos electrónicos por lote"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "Error al enviar la notificación por correos electrónicos por lote a %v: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] Nueva Notificación {{.Day}} {{.Month}}, {{.Year}}",
+      "other": "[{{.SiteName}}] Nuevas Notificaciones {{.Day}} {{.Month}}, {{.Year}}"
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "No se puede encontrar el destinatario para la notificación por correos electrónicos por lote"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "Iniciando el trabajo de correos electrónicos por lote. Revisando por correos electrónicos pendientes cada %v segundos."
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "No se puede crear el emoji. Ya existe otro emoji con el mismo nombre."
+    "translation": "No se puede crear el emoticon. Ya existe otro emoticon con el mismo nombre."
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "No se puede crear el emoji. No se comprendió la solicitud."
+    "translation": "No se puede crear el emoticon. No se comprendió la solicitud."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "Permisos inapropiados para crear el emoji."
+    "translation": "Permisos inapropiados para crear el emoticon."
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "No se pudo crear el emoji. La imagen debe tener un tamaño inferior a 64 KB."
+    "translation": "No se pudo crear el emoticon. La imagen debe tener un tamaño inferior a 64 KB."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Permisos inapropiados para eliminar el emoji."
+    "translation": "Permisos inapropiados para eliminar el emoticon."
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "Los emojis personalizados han sido deshabilitados por el administrador del sistema."
+    "translation": "Los emoticones personalizados han sido deshabilitados por el administrador del sistema."
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "Incapaz de decodificar archivo de imagen para emoji."
+    "translation": "Incapaz de decodificar archivo de imagen para emoticon."
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "No se puede leer el archivo de imagen para emoji."
+    "translation": "No se puede leer el archivo de imagen para emoticon."
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Inicializando rutas del API para los emoji"
+    "translation": "Inicializando rutas del API para los emoticon"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -669,11 +767,11 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "No se puede crear el emoji. El archivo debe ser un archivo PNG, JPEG o GIF."
+    "translation": "No se puede crear el emoticon. El archivo debe ser un archivo PNG, JPEG o GIF."
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "No se pudo crear el emoji. La imagen debe tener un máximo de 128 x 128 pixels."
+    "translation": "No se pudo crear el emoticon. La imagen debe tener un máximo de 128 x 128 pixels."
   },
   {
     "id": "api.file.file_upload.exceeds",
@@ -1028,10 +1126,28 @@
     "translation": "Error creando el mensaje"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "No se puede eliminar la preferencia del mensaje marcado al eliminar el mensaje, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "No tienes los permisos apropiados"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} archivo enviado: {{.Filenames}}",
+      "other": "{{.Count}} archivos enviados: {{.Filenames}}"
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} imagen enviada: {{.Filenames}}",
+      "other": "{{.Count}} imágenes enviadas: {{.Filenames}}"
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "Falla al compilar el regex de la @mencion user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "No se pudo enviar notificaciones a los usuarios en línea con @here, err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "No se puede obtener el perfil del miembro del canal, user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "No se pudo recuperar el hilo de comentarios en las notificaciones root_post_id=%v, err=%v"
   },
@@ -2113,7 +2233,7 @@
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "Webhoks de salida para el mismo canal no pueden tener las mismas palabras gatilladoras o los mismos URLs de retorno."
+    "translation": "Webhooks de salida para el mismo canal no pueden tener las mismas palabras que desencadenen acción o los mismos URLs de retorno."
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
@@ -2125,7 +2245,7 @@
   },
   {
     "id": "api.webhook.create_outgoing.triggers.app_error",
-    "translation": "Debe establecerse palabras gatilladoras o un channel_id"
+    "translation": "Debe establecerse palabras que desencadenen una acción o un channel_id"
   },
   {
     "id": "api.webhook.delete_incoming.disabled.app_errror",
@@ -2269,7 +2389,7 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "Las restricciones de los Emoji Personalizados están desactivadas por la licencia actual. Por favor contacta a un Administrador del Sistema sobre como actualizar a una licencia enterprise."
+    "translation": "Las restricciones de los Emoticones Personalizados están desactivadas por la licencia actual. Por favor contacta a un Administrador del Sistema sobre como actualizar a una licencia enterprise."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2673,7 +2793,7 @@
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "No se puede asociar datos del emoji a la solicitud"
+    "translation": "No se puede asociar datos del emoticon a la solicitud"
   },
   {
     "id": "model.client.create_emoji.image.app_error",
@@ -2717,7 +2837,7 @@
   },
   {
     "id": "model.command.is_valid.trigger.app_error",
-    "translation": "gatillador inválido"
+    "translation": "palabra que desencadena acción no válida"
   },
   {
     "id": "model.command.is_valid.update_at.app_error",
@@ -2760,6 +2880,18 @@
     "translation": "Desde debe ser mayor que Hasta"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "No puede habilitar el correo electrónico por lotes cuando la agrupación de servidores está habilitada"
+  },
+  {
+    "id": "model.config.is_valid.email_batching_buffer_size.app_error",
+    "translation": "Tamaño del búfer inválido para los correos electrónicos por lotes en la configuración de correo electrónico. Debe ser cero o un número positivo."
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "Intervalo inválido para los correos electrónicos por lotes en la configuración de correo electrónico.  Debe ser de 30 segundos o más."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Salt para restablecer contraseñas en la configuración de correos es inválido.  Debe ser de 32 caracteres o más."
   },
@@ -2781,11 +2913,11 @@
   },
   {
     "id": "model.config.is_valid.file_preview_height.app_error",
-    "translation": "La altura para la previsualización es inválido en la configuración de archivos.  Debe ser cero o un número positivo."
+    "translation": "La altura para la vista previa es inválido en la configuración de archivos.  Debe ser cero o un número positivo."
   },
   {
     "id": "model.config.is_valid.file_preview_width.app_error",
-    "translation": "El ancho para la previsualización es inválido en la configuración de archivos.  Debe ser un número positivo."
+    "translation": "El ancho para la vista previa es inválido en la configuración de archivos.  Debe ser un número positivo."
   },
   {
     "id": "model.config.is_valid.file_profile_height.app_error",
@@ -2944,6 +3076,10 @@
     "translation": "URL del Sitio debe ser una URL válida y empezar con http:// o https://."
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "No puede habilitar el correo electrónico por lotes cuando SiteURL no está configurado."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "Nombre del sitio debe ser menor o igual a {{.MaxLength}} caracteres."
   },
@@ -2973,7 +3109,7 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "Id del emoji no es válido"
+    "translation": "Id del emoticon no es válido"
   },
   {
     "id": "model.emoji.name.app_error",
@@ -3093,7 +3229,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.trigger_words.app_error",
-    "translation": "Palabras gatilladoras inválidas"
+    "translation": "Palabras que desencadenan acciones no válidas"
   },
   {
     "id": "model.outgoing_hook.is_valid.update_at.app_error",
@@ -3109,7 +3245,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.words.app_error",
-    "translation": "Palabras gatilladoras inválidas"
+    "translation": "Palabras que desencadenan acciones no válidas"
   },
   {
     "id": "model.post.is_valid.channel_id.app_error",
@@ -3749,27 +3885,27 @@
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "No pudimos eliminar el emoji"
+    "translation": "No pudimos eliminar el emoticon"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "No pudimos encontrar el emoji a eliminar"
+    "translation": "No pudimos encontrar el emoticon a eliminar"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "No pudimos obtener el emoji"
+    "translation": "No pudimos obtener el emoticon"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "No pudimos obtener el emoji"
+    "translation": "No pudimos obtener el emoticon"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "No pudimos obtener el emoji"
+    "translation": "No pudimos obtener el emoticon"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "No pudimos guardar el emoji"
+    "translation": "No pudimos guardar el emoticon"
   },
   {
     "id": "store.sql_license.get.app_error",
diff --git a/i18n/fr.json b/i18n/fr.json
index a2e4973a0..dbf954a14 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -324,10 +324,18 @@
     "translation": "Vous n'avez pas les droits requis "
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v was removed from the channel."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "Impossible de retirer l'utilisateur."
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "Impossible de trouver l'utilisateur à ajouter"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "Le canal a été archivé ou supprimé"
   },
@@ -556,22 +564,46 @@
     "translation": "Message envoyé."
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "Raccourcis clavier"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### Raccourcis clavier\n\n#### Navigation\n\nALT+HAUT: Canal ou message privé précédent dans la barre de gauche\nALT+BAS: Canal ou message privé suivant dans la barre de gauche\nALT+SHIFT+HAUT: Canal ou message privé précédent avec messages non-lus dans la barre de gauche\nALT+SHIFT+BAS: Canal ou message privé suivant avec messages non-lus dans la barre de gauche\nCTRL+K: Fenêtre de changemetn de canal rapide\nCTRL+SHIFT+A: Préférences du compte\nCTRL+SHIFT+M: Dernières mentions\n\n#### Fichiers\n\nCTRL+U: Télécharger des fichiers\n\n#### Messages\n\nCTRL+HAUT (dans un champ vide): Affiche le message ou commande slash précédent\nCTRL+DOWN (dans un champ vide): Affiche le message ou commande slash suivant\nHAUT (dans un champ vide): Édite votre dernier message dans le canal actuel\n@[lettre]+TAB: Autocomplète un @nom commençant par [lettre]\n:[lettre]+TAB: Autocomplète emoji commençant par [lettre]\n\n#### Commandes du navigateur intégré\n\nALT+GAUCH+[: Canal précédent dans votre historique\nALT+RIGHT+]: Canal suivant dans votre historique\nCTRL+PLUS: Augmente la taille de la police\nCTRL+MOINS: Diminue la taille de la police\nSHIFT+HAUT (dans un champ de saisie): Surligne le texte jusqu'à la ligne précédente\nSHIFT+BAS (dans un champ de saisie): Surligne le texte jusqu'à la ligne suivante\nSHIFT+ENTRÉE (dans un champ de saisie): Saut de ligne\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### Raccourcis clavier\n\n#### Navigation\n\nALT+HAUT: Canal ou message privé précédent dans la barre de gauche\nALT+BAS: Canal ou message privé suivant dans la barre de gauche\nALT+SHIFT+HAUT: Canal ou message privé précédent avec messages non-lus dans la barre de gauche\nALT+SHIFT+BAS: Canal ou message privé suivant avec messages non-lus dans la barre de gauche\nCMD+K: Fenêtre de changemetn de canal rapide\nCMD+SHIFT+A: Préférences du compte\nCMD+SHIFT+M: Dernières mentions\n\n#### Fichiers\n\nCMD+U: Télécharger des fichiers\n\n#### Messages\n\nCMD+HAUT (dans un champ vide): Affiche le message ou commande slash précédent\nCMD+DOWN (dans un champ vide): Affiche le message ou commande slash suivant\nHAUT (dans un champ vide): Édite votre dernier message dans le canal actuel\n@[lettre]+TAB: Autocomplète un @nom commençant par [lettre]\n:[lettre]+TAB: Autocomplète emoji commençant par [lettre]\n\n#### Commandes du navigateur intégré\n\nCMD+[: Canal précédent dans votre historique\nCMD+]: Canal suivant dans votre historique\nCMD+PLUS: Augmente la taille de la police\nCMD+MOINS: Diminue la taille de la police\nSHIFT+HAUT (dans un champ de saisie): Surligne le texte jusqu'à la ligne précédente\nSHIFT+BAS (dans un champ de saisie): Surligne le texte jusqu'à la ligne suivante\nSHIFT+ENTRÉE (dans un champ de saisie): Saut de ligne\n"
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "raccourcis clavier"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Ajoute ¯\\_(ツ)_/¯ à votre message"
   },
@@ -628,6 +660,72 @@
     "translation": "Une erreur inconnue est survenue. Veuillez contacter le support."
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "Les liens publics sont désactivés par l'administrateur système."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "Unable to find status of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "Unable to find channel of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "Nouveau Message Privé"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "Aller au message"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "Unable to find sender of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "Vous avez un nouveau message.",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "Unable to find display preferences of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "Failed to send batched email notification to %v: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}",
+      "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}"
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "Unable to find recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
     "translation": "Impossible de créer cet Emoji. Un autre Emoji du même nom existe déjà."
   },
@@ -1028,10 +1126,28 @@
     "translation": "Erreur lors de la création du message"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "Vous n'avez pas les permissions appropriées"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} file sent: {{.Filenames}}",
+      "other": "{{.Count}} files sent: {{.Filenames}}"
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} image sent: {{.Filenames}}",
+      "other": "{{.Count}} images sent: {{.Filenames}}"
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "Échec de la compilation @mention regex user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "Impossible d'envoyer une notification aux utilisateurs connectés avec @here, err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "Unable to get profile for channel member, user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Impossible de récupérer les fils de commentaires dans les notifications root_post_id=%v, err=%v"
   },
@@ -2760,6 +2880,18 @@
     "translation": "Jusqu'à doit être supérieur à De"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering 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."
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Clé de salage de réinitialisation de mot de passe invalide dans les paramètres de messagerie. Doit être composée de 32 caractères ou plus."
   },
@@ -2944,6 +3076,10 @@
     "translation": "URL du site invalide. Il doit s'agir d'une URL valide et commencer par http:// ou https://."
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "Le nom du site doit contenir au maximum {{.MaxLength}} caractères."
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 9cb92212b..15493848f 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -324,10 +324,18 @@
     "translation": "あなたには必要な権限が付与されていません"
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v was removed from the channel."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "ユーザを削除できません。"
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "追加しようとしているユーザーが見付かりませんでした"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "チャンネルはアーカイブされているか削除されています"
   },
@@ -556,22 +564,46 @@
     "translation": "ユーザーにメッセージを送信しました。"
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "キーボードショートカットのリストを表示する"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### キーボードショートカット\n\n#### 移動\n\nALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージ\nALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージ\nALT+SHIFT+UP: 未読のメッセージのある左側のサイドバーの前のチャンネルまたはダイレクトメッセージ\nALT+SHIFT+DOWN: 未読のメッセージのある左側のサイドバーの次のチャンネルまたはダイレクトメッセージ\nCTRL+K: 簡易チャンネル変更ダイアログボックスを開く\nCTRL+SHIFT+A: アカウント設定を開く\nCTRL+SHIFT+M: 最近のあなたについての投稿を開く\n\n#### ファイル\n\nCTRL+U: ファイルをアップロードする\n\n#### メッセージ\n\nESC: 現在のチャンネルのすべてのメッセージを既読にする\nCTRL+UP (空の入力欄で): あなたが入力した前のメッセージまたはスラッシュコマンドを表示する\nCTRL+DOWN (空の入力欄で): あなたが入力した次のメッセージまたはスラッシュコマンドを表示する\nUP (空の入力欄で): 現在のチャンネルの最新のメッセージを編集する\n@[文字]+TAB: [文字]で始まる@usernameを補完する\n:[文字]+TAB: [文字]で始まる絵文字を補完する\n\n#### ブラウザー内蔵のコマンド\n\nALT+LEFT: 履歴の前のチャンネル\nALT+RIGHT: 履歴の次のチャンネル\nCTRL+PLUS: フォントサイズを大きくする (ズームイン)\nCTRL+MINUS: フォントサイズを小さくする (ズームアウト)\nSHIFT+UP (入力欄で): 前の行を反転させる\nSHIFT+DOWN (入力欄で): 次の行を反転させる\nSHIFT+ENTER (入力欄で): 改行する\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### キーボードショートカット\n\n#### 移動\n\nALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージ\nALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージ\nALT+SHIFT+UP: 未読のメッセージのある左側のサイドバーの前のチャンネルまたはダイレクトメッセージ\nALT+SHIFT+DOWN: 未読のメッセージのある左側のサイドバーの次のチャンネルまたはダイレクトメッセージ\nCMD+K: 簡易チャンネル変更ダイアログボックスを開く\nCMD+SHIFT+A: アカウント設定を開く\nCMD+SHIFT+M: 最近のあなたについての投稿を開く\n\n#### ファイル\n\nCMD+U: ファイルをアップロードする\n\n#### メッセージ\n\nESC: 現在のチャンネルのすべてのメッセージを既読にする\nCMD+UP (空の入力欄で): あなたが入力した前のメッセージまたはスラッシュコマンドを表示する\nCMD+DOWN (空の入力欄で): あなたが入力した次のメッセージまたはスラッシュコマンドを表示する\nUP (空の入力欄で): 現在のチャンネルの最新のメッセージを編集する\n@[文字]+TAB: [文字]で始まる@usernameを補完する\n:[文字]+TAB: [文字]で始まる絵文字を補完する\n\n#### ブラウザー内蔵のコマンド\n\nCMD+[: 履歴の前のチャンネル\nCMD+]: 履歴の次のチャンネル\nCMD+PLUS: フォントサイズを大きくする (ズームイン)\nCMD+MINUS: フォントサイズを小さくする (ズームアウト)\nSHIFT+UP (入力欄で): 前の行を反転させる\nSHIFT+DOWN (入力欄で): 次の行を反転させる\nSHIFT+ENTER (入力欄で): 改行する\n"
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "ショートカット"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "¯\\_(ツ)_/¯をあなたのメッセージに追加します"
   },
@@ -628,6 +660,72 @@
     "translation": "詳細不明なエラーが発生しました。サポートに問い合わせしてください。"
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "電子メールバッチ処理のジョブを受け取るチャンネルがいっぱいです。EmailBatchingBufferSizeを増やしてください。"
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "電子メールバッチ処理はシステム管理者によって無効にされています"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "バッチ処理された電子メール通知の受け取り状態を確認できません"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "バッチ処理された電子メール通知について、投稿があったチャンネルが見付かりません"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "ダイレクトメッセージ"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "投稿へ行く"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "バッチ処理された電子メールについて、投稿の投稿者が見付かりません"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "新しいメッセージが1通あります。新しいメッセージが{{.Count}}通あります。",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "バッチ処理された電子メール通知の宛先の表示設定が見つかりませんでした"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "%v へバッチ処理された電子メール通知を送信できませんでした: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} の新着通知[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} の新着通知",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "バッチ処理された電子メール通知の宛先が見つかりませんでした"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
     "translation": "絵文字を作成できません。同じ名前を持つ他の絵文字が既に存在しています。"
   },
@@ -1028,10 +1126,28 @@
     "translation": "投稿を作成できません"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "あなたには必要な権限が付与されていません"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} ファイル送信: {{.Filenames}}{{.Count}} ファイル送信: {{.Filenames}}",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} ファイル送信: {{.Filenames}}{{.Count}} ファイル送信: {{.Filenames}}",
+      "other": ""
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "@mentionの正規表現をコンパイルできませんでした user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "@here を使って、オンラインのユーザーへ通知を送ることができませんでした。err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "チャンネルメンバーのプロフィールを取得できませんでした user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "通知内のコメントスレッドの投稿を取得できませんでした root_post_id=%v、err=%v"
   },
@@ -2237,7 +2357,7 @@
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "効果用モードを有効にした場合、システムコンソールは読み込み専用となります。"
+    "translation": "高可用モードを有効にした場合、システムコンソールは読み込み専用となります。"
   },
   {
     "id": "ent.cluster.starting.info",
@@ -2760,6 +2880,18 @@
     "translation": "有効終了は有効開始の後でなくてはいけません"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering is enabled"
+  },
+  {
+    "id": "model.config.is_valid.email_batching_buffer_size.app_error",
+    "translation": "電子メール設定の電子メールバッチ処理バッファーサイズが不正です。  ゼロ以上の数を指定してください。"
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "電子メール設定の電子メールバッチ処理間隔が不正です。  30秒以上にしてください。"
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "電子メールの設定におけるパスワードを初期化するためのソルトが不正です。32文字以上でなくてはいけません。"
   },
@@ -2781,7 +2913,7 @@
   },
   {
     "id": "model.config.is_valid.file_preview_height.app_error",
-    "translation": "ファイル設定のプレビューの高さが不正です。ゼロ以上の数を指定してください。"
+    "translation": "ファイル設定のプレビューの高さが不正です。  ゼロ以上の数を指定してください。"
   },
   {
     "id": "model.config.is_valid.file_preview_width.app_error",
@@ -2944,6 +3076,10 @@
     "translation": "サイトURLを正しく設定してください。URLはhttp://またはhttps://で始まります。"
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "サイト名は {{.MaxLength}} 文字以内にしてください。"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index eb71b4398..9f58d785a 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -324,10 +324,18 @@
     "translation": "작업을 할 수 있는 권한이 없습니다."
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v was removed from the channel."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "사용자를 제거할 수 없습니다."
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "추가할 사용자를 찾는 데 실패하였습니다"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "채널이 보존 처리 혹은 삭제되었습니다"
   },
@@ -556,22 +564,46 @@
     "translation": "메세지를 보낸 유저."
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "단축키 목록을 표시합니다."
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### 키보드 단축키\n\n#### 이동\n\nALT+UP: 왼쪽 사이드 바에서 이전 채널이 또는 개인 메시지\nALT+DOWN: 왼쪽 사이드 바에서 다음 채널 또는 개인 메시지\nALT+SHIFT+UP: 왼쪽 사이드 바에서 읽지 않은 이전 채널 또는 개인 메시지\nALT+SHIFT+DOWN: 왼쪽 사이드 바에서 읽지 않은 다음 채널 또는 개인 메시지\nCTRL+K: 빠른 채널 변경을 엽니다\nCTRL+SHIFT+A: 계정 설정을 엽니다\nCTRL+SHIFT+M: 최근 멘션을 엽니다\n\n#### 파일\n\nCTRL+U: 파일 업로드\n\n#### 메시지\n\nESC: 현재 채널의 모든 메시지를 읽음으로 표시합니다.\nCTRL+UP (빈 입력란에서): 입력했던 이전 메시지 또는 슬래시 명령을 다시 표시합니다\nCTRL+DOWN (빈 입력란에서): 입력했던 다음 메시지 또는 슬래시 명령을 다시 표시합니다\nUP (빈 입력란에서): 현재 채널에서 마지막으로 입력한 메시지를 편집합니다\n@[문자]+TAB: [문자]로 시작하는 @username 을 자동완성 합니다\n:[문자]+TAB: [문자]로 시작하는 이모티콘을 자동완성 합니다\n\n#### 브라우저 명령\n\nALT+LEFT: 히스토리의 이전 채널\nALT+RIGHT: 히스토리의 다음 채널\nCTRL+PLUS: 글꼴을 크게 합니다 (확대)\nCTRL+MINUS: 글꼴을 작게 합니다 (축소)\nSHIFT+UP (in input field): 이전 행을 강조합니다\nSHIFT+DOWN (in input field): 다음 행을 강조합니다\nSHIFT+ENTER (in input field): 줄바꿈을 합니다\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### 키보드 단축키\n\n#### 이동\n\nALT+UP: 왼쪽 사이드 바에서 이전 채널이 또는 개인 메시지\nALT+DOWN: 왼쪽 사이드 바에서 다음 채널 또는 개인 메시지\nALT+SHIFT+UP: 왼쪽 사이드 바에서 읽지 않은 이전 채널 또는 개인 메시지\nALT+SHIFT+DOWN: 왼쪽 사이드 바에서 읽지 않은 다음 채널 또는 개인 메시지\nCMD+K: 빠른 채널 변경을 엽니다\nCMD+SHIFT+A: 계정 설정을 엽니다\nCMD+SHIFT+M: 최근 멘션을 엽니다\n\n#### 파일\n\nCMD+U: 파일 업로드\n\n#### 메시지\n\nESC: 현재 채널의 모든 메시지를 읽음으로 표시합니다.\nCMD+UP (빈 입력란에서): 입력했던 이전 메시지 또는 슬래시 명령을 다시 표시합니다\nCMD+DOWN (빈 입력란에서): 입력했던 다음 메시지 또는 슬래시 명령을 다시 표시합니다\nUP (빈 입력란에서): 현재 채널에서 마지막으로 입력한 메시지를 편집합니다\n@[문자]+TAB: [문자]로 시작하는 @username 을 자동완성 합니다\n:[문자]+TAB: [문자]로 시작하는 이모티콘을 자동완성 합니다\n\n#### 브라우저 명령\n\nCMD+[: 히스토리의 이전 채널\nCMD+]: 히스토리의 다음 채널\nCMD+PLUS: 글꼴을 크게 합니다 (확대)\nCMD+MINUS: 글꼴을 작게 합니다 (축소)\nSHIFT+UP (in input field): 이전 행을 강조합니다\nSHIFT+DOWN (in input field): 다음 행을 강조합니다\nSHIFT+ENTER (in input field): 줄바꿈을 합니다\n"
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "단축키"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "¯\\_(ツ)_/¯를 메시지에 추가"
   },
@@ -628,6 +660,72 @@
     "translation": "알 수 없는 오류가 발생했습니다. 지원 서비스에 연락하시기 바랍니다."
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "시스템 관리자가 개인 링크들 저장을 할 수 없도록 했습니다."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "Unable to find status of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "Unable to find channel of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "신규 메시지"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "글로 이동하기"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "Unable to find sender of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "한개의 신규 메시지가 있습니다.",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "Unable to find display preferences of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "Failed to send batched email notification to %v: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}",
+      "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}"
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "Unable to find recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
     "translation": "이모티콘을 생성할 수 없습니다. 같은 이름을 가진 다른 이모티콘이 이미 있습니다."
   },
@@ -909,7 +1007,7 @@
   },
   {
     "id": "api.oauth.get_access_token.bad_client_secret.app_error",
-    "translation": "invalid_request: Missing client_secret"
+    "translation": "invalid_request: client_secret 값이 누락되었습니다"
   },
   {
     "id": "api.oauth.get_access_token.bad_grant.app_error",
@@ -917,7 +1015,7 @@
   },
   {
     "id": "api.oauth.get_access_token.credentials.app_error",
-    "translation": "invalid_client: Invalid client credentials"
+    "translation": "invalid_client: 잘못된 클라이언트 인증 정보입니다"
   },
   {
     "id": "api.oauth.get_access_token.disabled.app_error",
@@ -925,7 +1023,7 @@
   },
   {
     "id": "api.oauth.get_access_token.expired_code.app_error",
-    "translation": "invalid_grant: Invalid or expired authorization code"
+    "translation": "invalid_grant: 잘못되었거나 기한이 만료된 인증 코드"
   },
   {
     "id": "api.oauth.get_access_token.internal.app_error",
@@ -933,19 +1031,19 @@
   },
   {
     "id": "api.oauth.get_access_token.internal_saving.app_error",
-    "translation": "server_error: Encountered internal server error while saving access token to database"
+    "translation": "server_error: 접근 코드를 데이터베이스에 저장하던 도중 서버 내부 오류 발생"
   },
   {
     "id": "api.oauth.get_access_token.internal_session.app_error",
-    "translation": "server_error: Encountered internal server error while saving session to database"
+    "translation": "server_error: 데이터베이스에 세션 저장 중 서버 내부 오류 발생"
   },
   {
     "id": "api.oauth.get_access_token.internal_user.app_error",
-    "translation": "server_error: Encountered internal server error while pulling user from database"
+    "translation": "server_error: 사용자 정보를 데이터베이스에서 가져오던 도중 서버 내부 오류 발생"
   },
   {
     "id": "api.oauth.get_access_token.missing_code.app_error",
-    "translation": "invalid_request: Missing code"
+    "translation": "invalid_request: 코드가 누락"
   },
   {
     "id": "api.oauth.get_access_token.missing_refresh_token.app_error",
@@ -953,7 +1051,7 @@
   },
   {
     "id": "api.oauth.get_access_token.redirect_uri.app_error",
-    "translation": "invalid_request: Supplied redirect_uri does not match authorization code redirect_uri"
+    "translation": "invalid_request: 주어진 redirect_uri 값이 인증 코드의 redirect_uri 값과 맞지 않음"
   },
   {
     "id": "api.oauth.get_access_token.refresh_token.app_error",
@@ -1028,10 +1126,28 @@
     "translation": "포스트 만드는 중 오류"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "작업을 할 수 있는 권한이 없습니다"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} file sent: {{.Filenames}}",
+      "other": "{{.Count}} files sent: {{.Filenames}}"
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} image sent: {{.Filenames}}",
+      "other": "{{.Count}} images sent: {{.Filenames}}"
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "@mention 정규 표현식을 컴파일 할 수 없습니다 user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "Unable to send notification to online users with @here, err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "Unable to get profile for channel member, user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Failed to retrieve comment thread posts in notifications root_post_id=%v, err=%v"
   },
@@ -1185,7 +1305,7 @@
   },
   {
     "id": "api.preference.delete_preferences.user_id.app_error",
-    "translation": "다른 사용자의 기본 설정을 저장할 수 없습니다."
+    "translation": "다른 사용자의 기본 설정을 삭제할 수 없습니다."
   },
   {
     "id": "api.preference.init.debug",
@@ -1933,7 +2053,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "MFA를 설정하지 않았거나 서버에서 지원하지 않습니다"
+    "translation": "SAML이 설정되지 않았거나 서버에서 지원하지 않습니다"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2217,7 +2337,7 @@
   },
   {
     "id": "ent.cluster.incompatible.warn",
-    "translation": "Potential incompatibile version detected for clustering with %v"
+    "translation": "클러스터링에서 잠재적으로 호환되지 않는 버전 %v가 탐지되었습니다."
   },
   {
     "id": "ent.cluster.incompatible_config.warn",
@@ -2760,6 +2880,18 @@
     "translation": "To must be greater than From"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering 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."
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Invalid password reset salt for email settings.  Must be 32 chars or more."
   },
@@ -2941,7 +3073,11 @@
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "SAML SSO URL must be a valid URL and start with http:// or https://."
+    "translation": "사이트 URL은 반드시 올바른 URL이어야 하며, http:// 또는 https://로 시작해야 합니다."
+  },
+  {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -3025,7 +3161,7 @@
   },
   {
     "id": "model.oauth.is_valid.callback.app_error",
-    "translation": "SAML SSO URL must be a valid URL and start with http:// or https://."
+    "translation": "콜백 URL은 반드시 올바른 URL이어야 하며, http:// 또는 https://로 시작해야 합니다."
   },
   {
     "id": "model.oauth.is_valid.client_secret.app_error",
@@ -3045,11 +3181,11 @@
   },
   {
     "id": "model.oauth.is_valid.homepage.app_error",
-    "translation": "SAML SSO URL must be a valid URL and start with http:// or https://."
+    "translation": "홈페이지는 반드시 올바른 URL이어야 하며, http:// 또는 https://로 시작해야 합니다."
   },
   {
     "id": "model.oauth.is_valid.icon_url.app_error",
-    "translation": "SAML SSO URL must be a valid URL and start with http:// or https://."
+    "translation": "아이콘 URL은 반드시 올바른 URL이어야 하며, http:// 또는 https://로 시작해야 합니다."
   },
   {
     "id": "model.oauth.is_valid.name.app_error",
@@ -3165,7 +3301,7 @@
   },
   {
     "id": "model.post.is_valid.user_id.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "올바르지 않은 사용자 id"
   },
   {
     "id": "model.preference.is_valid.category.app_error",
@@ -3173,15 +3309,15 @@
   },
   {
     "id": "model.preference.is_valid.id.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "올바르지 않은 사용자 id"
   },
   {
     "id": "model.preference.is_valid.name.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 이름"
   },
   {
     "id": "model.preference.is_valid.theme.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 테마"
   },
   {
     "id": "model.preference.is_valid.value.app_error",
@@ -3189,11 +3325,11 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "이름은 반드시 1글자 이상 64글자 이하 영문 또는 숫자여야 합니다."
+    "translation": "이름은 반드시 4글자 이상 영소문자 또는 숫자여야 합니다."
   },
   {
     "id": "model.team.is_valid.company.app_error",
-    "translation": "잘못된 표시명"
+    "translation": "잘못된 회사명"
   },
   {
     "id": "model.team.is_valid.create_at.app_error",
@@ -3857,11 +3993,11 @@
   },
   {
     "id": "store.sql_oauth.save_auth_data.app_error",
-    "translation": "We couldn't save the authorization code."
+    "translation": "인증 코드를 저장할 수 없습니다"
   },
   {
     "id": "store.sql_oauth.update_access_data.app_error",
-    "translation": "We encountered an error finding the access token"
+    "translation": "접근 토큰을 업데이트하다 에러가 발생했습니다"
   },
   {
     "id": "store.sql_oauth.update_app.find.app_error",
diff --git a/i18n/nl.json b/i18n/nl.json
index 011995a9d..d7c452ed4 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -121,7 +121,7 @@
   },
   {
     "id": "api.admin.upload_brand_image.not_available.app_error",
-    "translation": "Personaliseren is niet ondersteund, of niet geconfigureerd op deze server"
+    "translation": "Personaliseren is niet geconfigureerd, of niet ondersteund op deze server"
   },
   {
     "id": "api.admin.upload_brand_image.parse.app_error",
@@ -161,7 +161,7 @@
   },
   {
     "id": "api.channel.add_member.user_adding.app_error",
-    "translation": "Kan de gebruiker die het toevoegen heeft gedaan niet vinden"
+    "translation": "Kan de gebruiker, die het toevoegen heeft gedaan, niet vinden"
   },
   {
     "id": "api.channel.add_user.to.channel.failed.app_error",
@@ -209,7 +209,7 @@
   },
   {
     "id": "api.channel.create_default_channels.town_square",
-    "translation": "Dorps plein"
+    "translation": "Dorps Plein"
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
@@ -289,7 +289,7 @@
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "U bent het laatste lid, probeer de privé groep te verwijderen i.p.v. verlaten."
+    "translation": "U bent het laatste lid, probeer de privé groep te verwijderen i.p.v. te verlaten."
   },
   {
     "id": "api.channel.leave.left",
@@ -317,23 +317,31 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Het plaatsen van een komen / gaan bericht %v is mislukt"
+    "translation": "Het plaatsen van een komen/gaan bericht %v is mislukt"
   },
   {
     "id": "api.channel.remove_member.permissions.app_error",
     "translation": "U beschikt niet over juiste de rechten "
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v was removed from the channel."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "Kan de gebruiker niet verwijderen."
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "Gebruiker om toe te voegen kon niet gevonden worden"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
-    "translation": "Dit kanaal is gearchiveerd of verwijderd"
+    "translation": "Het kanaal is gearchiveerd of verwijderd"
   },
   {
     "id": "api.channel.update_channel.deleted.app_error",
-    "translation": "Dit kanaal is gearchiveerd of verwijderd"
+    "translation": "Het kanaal is gearchiveerd of verwijderd"
   },
   {
     "id": "api.channel.update_channel.permission.app_error",
@@ -556,22 +564,46 @@
     "translation": "Bericht verzonden."
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "Toon een lijst met snelkoppelingen"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### Sneltoetsen\n\n#### Navigatie\n\nALT+pijl-OMHOOG: Vorige kanaal of rechtstreeks bericht in de zijbalk links\nALT+pijl-OMLAAG: Volgende kanaal of rechtstreeks bericht in de zijbalk links\nALT+SHIFT+pijl-OMHOOG: Vorige kanaal of rechtstreeks bericht in de linker zijbalk met ongelezen berichten\nALT+SHIFT+pijl-OMLAAG: Volgende kanaal of rechtstreeks bericht in de linker zijbalk met ongelezen berichten\nCTRL/CMD+K): Openen van een snelle kanaal wisselaar dialoog\nCTRL/CMD+SHIFT+A: Open account instellingen\nCTRL/CMD+SHIFT+M: Open recente vermeldingen\n\n#### Bestanden\n\nCTRL/CMD+U: Upload bestand(en)\n\n#### Berichten\n\nESC: Markeer alle berichten in het huidige kanaal als gelezen\nCTRL/CMD+pijl-OMHOOG: (in leeg invoerveld): Herhaal de vorige boodschap of slash opdracht die u hebt ingevoerd\nCTRL/CMD+pijl-OMLAAG: (in leeg invoerveld): Herhaal het volgende bericht slash of opdracht die u hebt ingevoerd\npijl-OMHOOG: (in het lege invoerveld): Bewerk uw laatste bericht in het huidige kanaal\n@[karakter]+TAB: automatisch @gebruikersnaam aanvullen dat begint met [karakter]\n:[karakter]+TAB: automatisch emoji aanvullen dat begint met [karakter]\n\n#### De ingebouwde Browser Opdrachten\n\nALT+pijl-LINKS/CMD+[: Vorige kanaal in uw geschiedenis\nALT+pijl-RECHTS/CMD+]: Volgend kanaal in uw geschiedenis\nCTRL/CMD+PLUS: Lettergrootte vergroten (inzoomen)\nCTRL/CMD+MIN: Lettergrootte verkleinen (uitzoomen)\nSHIFT+pijl-OMHOOG (in het invoerveld): Markeer de tekst naar de vorige regel\nSHIFT+pijl-OMLAAG (in het invoerveld): Markeer de tekst naar de volgende regel\nSHIFT+ENTER (in het invoerveld): Maak een nieuwe regel\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### Sneltoetsen\n\n#### Navigatie\n\nALT+pijl-OMHOOG: Vorige kanaal of rechtstreeks bericht in de zijbalk links\nALT+pijl-OMLAAG: Volgende kanaal of rechtstreeks bericht in de zijbalk links\nALT+SHIFT+pijl-OMHOOG: Vorige kanaal of rechtstreeks bericht in de linker zijbalk met ongelezen berichten\nALT+SHIFT+pijl-OMLAAG: Volgende kanaal of rechtstreeks bericht in de linker zijbalk met ongelezen berichten\nCTRL/CMD+K): Openen van een snelle kanaal wisselaar dialoog\nCTRL/CMD+SHIFT+A: Open account instellingen\nCTRL/CMD+SHIFT+M: Open recente vermeldingen\n\n#### Bestanden\n\nCTRL/CMD+U: Upload bestand(en)\n\n#### Berichten\n\nESC: Markeer alle berichten in het huidige kanaal als gelezen\nCTRL/CMD+pijl-OMHOOG: (in leeg invoerveld): Herhaal de vorige boodschap of slash opdracht die u hebt ingevoerd\nCTRL/CMD+pijl-OMLAAG: (in leeg invoerveld): Herhaal het volgende bericht slash of opdracht die u hebt ingevoerd\npijl-OMHOOG: (in het lege invoerveld): Bewerk uw laatste bericht in het huidige kanaal\n@[karakter]+TAB: automatisch @gebruikersnaam aanvullen dat begint met [karakter]\n:[karakter]+TAB: automatisch emoji aanvullen dat begint met [karakter]\n\n#### De ingebouwde Browser Opdrachten\n\nALT+pijl-LINKS/CMD+[: Vorige kanaal in uw geschiedenis\nALT+pijl-RECHTS/CMD+]: Volgend kanaal in uw geschiedenis\nCTRL/CMD+PLUS: Lettergrootte vergroten (inzoomen)\nCTRL/CMD+MIN: Lettergrootte verkleinen (uitzoomen)\nSHIFT+pijl-OMHOOG (in het invoerveld): Markeer de tekst naar de vorige regel\nSHIFT+pijl-OMLAAG (in het invoerveld): Markeer de tekst naar de volgende regel\nSHIFT+ENTER (in het invoerveld): Maak een nieuwe regel\n"
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "Snelkoppelingen"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Voeg ¯\\_(ツ)_/¯ toe aan het bericht"
   },
@@ -628,6 +660,72 @@
     "translation": "Een onbekende fout is opgetreden. Neem contact op met support."
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "Publieke links zijn uitgeschakeld door de systeembeheerder"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "Unable to find status of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "Unable to find channel of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "Direct Bericht"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "Ga naar Bericht"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "Unable to find sender of post for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "U heeft een nieuw bericht.",
+      "other": "U heeft {{.Count}} nieuwe berichten."
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "Unable to find display preferences of recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "Failed to send batched email notification to %v: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}",
+      "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}"
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "Unable to find recipient for batched email notification"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
     "translation": "Kan emoji niet aanmaken. Er bestaat al een emoji met dezelfde naam."
   },
@@ -1028,10 +1126,28 @@
     "translation": "Fout bij het aanmaken van bericht"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "U beschikt niet over juiste de rechten"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} file sent: {{.Filenames}}",
+      "other": "{{.Count}} files sent: {{.Filenames}}"
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} image sent: {{.Filenames}}",
+      "other": "{{.Count}} images sent: {{.Filenames}}"
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "Verwerken van de reguliere expressie voor notificatie (@notificatie) is mislukt, user_id=%v, fout=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "Kon geen bericht sturen naar online leden met @here, err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "Unable to get profile for channel member, user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Niet gelukt om commentaar thread berichten op te halen uit notificaties root_post_id=%v, err=%v"
   },
@@ -2760,6 +2880,18 @@
     "translation": "Tot en met, moet later zijn dan Vanaf"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering 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."
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Ongeldige 'salt' voor wachtwoord reset e-mail instellingen. De salt moet 32 of meer karakters hebben."
   },
@@ -2944,6 +3076,10 @@
     "translation": "Ongeldige URL. Een geldige URl begint met http:// of https://"
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "Site naam moet minder dan of gelijk aan {{.MaxLength}} karakters."
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 932919127..bd1f17b60 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -324,10 +324,18 @@
     "translation": "Você não tem a permissão apropriada "
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v was removed from the channel."
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "Não foi possível remover o usuário."
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "Não foi possível encontrar o usuário a ser adicionado"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "O canal foi deletado ou arquivado"
   },
@@ -556,22 +564,46 @@
     "translation": "Mensagem enviada."
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "Mostrar a lista de atalhos"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda\nALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCTRL+K: Abre uma janela de troca rápida de canal\nCTRL+SHIFT+A: Abre as configurações de conta\nCTRL+SHIFT+M: Abre as menções recentes\n\n#### Arquivos\n\nCTRL+U: Enviar arquivo(s)\n\n#### Mensagens\n\nESC: Marca todas as mensagens no canal atual como lida\nCTRL+CIMA (campo de mensagem vazio): Reimprimir a mensagem anterior ou comando slash digitado\nCTRL+BAIXO (campo de mensagem vazio): Reimprimir a próxima mensagem ou comando slash digitado\nCIMA (campo de mensagem vazio): Edita sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta o @usuário começando com [caracter]\n:[caracter]+TAB: Autocompleta o emoji começando com [caracter]\n\n#### Comandos do Navegador\n\nALT+ESQUERDA: Canal anterior no seu histórico\nALT+DIREITA: Próximo canal no seu histórico\nCTRL+MAIS: Aumentar o tamanho da fonte (zoom in)\nCTRL+MENOS: Reduzir o tamanho da fonte (zoom out)\nSHIFT+CIMA (no campo de mensagem): Selecionar texto da linha anterior\nSHIFT+BAIXO (no campo de mensagem): Selecionar texto da próxima linha\nSHIFT+ENTER (no campo de mensagem): Criar uma nova linha\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda\nALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCMD+K: Abre uma janela de troca rápida de canal\nCMD+SHIFT+A: Abre as configurações de conta\nCMD+SHIFT+M: Abre as menções recentes\n\n#### Arquivos\n\nCMD+U: Enviar arquivo(s)\n\n#### Mensagens\n\nESC: Marca todas as mensagens no canal atual como lida\nCMD+CIMA (campo de mensagem vazio): Reimprimir a mensagem anterior ou comando slash digitado\nCMD+BAIXO (campo de mensagem vazio): Reimprimir a próxima mensagem ou comando slash digitado\nCIMA (campo de mensagem vazio): Edita sua última mensagem no canal atual\n@[caracter]+TAB: Autocompleta o @usuário começando com [caracter]\n:[caracter]+TAB: Autocompleta o emoji começando com [caracter]\n\n#### Comandos do Navegador\n\nCMD+[: Canal anterior no seu histórico\nCMD+]: Próximo canal no seu histórico\nCMD+MAIS: Aumentar o tamanho da fonte (zoom in)\nCMD+MENOS: Reduzir o tamanho da fonte (zoom out)\nSHIFT+CIMA (no campo de mensagem): Selecionar texto da linha anterior\nSHIFT+BAIXO (no campo de mensagem): Selecionar texto da próxima linha\nSHIFT+ENTER (no campo de mensagem): Criar uma nova linha\n"
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "atalhos"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Adiciona ¯\\_(ツ)_/¯ na sua mensagem"
   },
@@ -628,6 +660,72 @@
     "translation": "Ocorreu um erro desconhecido. Por favor contato com o suporte."
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "A tarefa de email em lote do canal de entrada estava cheio. Por favor aumente o EmailBatchingBufferSize."
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "Email em lote foi desabilitado pelo administrador do sistema"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "Tarefa de email em note executada. %v usuário(s) ainda tem notificações pendentes."
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "Não foi possível encontrar o status do destinatário para a notificação de e-mail em lote"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "Não foi possível encontrar o canal de postagem para a notificação de email em lote"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "Mensagem Direta"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "Ir para o Post"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "Não foi possível encontrar o remetente da postagem para a notificação de email em lote"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "Você tem uma nova mensagem.",
+      "other": "Você tem {{.Count}} novas mensagens."
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "Não foi possível encontrar as preferências de exibição do destinatário para notificação de email em lote"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "Failed to send batched email notification to %v: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] Nova Notificação de {{.Day}} {{.Month}}, {{.Year}}",
+      "other": "[{{.SiteName}}] Novas Notificações de {{.Day}} {{.Month}}, {{.Year}}"
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "Não foi possível encontrar o status do destinatário para a notificação de e-mail em lote"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
     "translation": "Não foi possível criar o emoji. Outro emoji com o mesmo nome já existe."
   },
@@ -1028,10 +1126,28 @@
     "translation": "Erro ao criar o post"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "Você não tem a permissão apropriada"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} arquivo enviado: {{.Filenames}}",
+      "other": "{{.Count}} arquivos enviados: {{.Filenames}}"
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} imagem enviada: {{.Filenames}}",
+      "other": "{{.Count}} imagens enviadas: {{.Filenames}}"
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "Não foi possível compilar @mention regex user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "Não foi possível enviar a notificação para os usuários online com @here, err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "Unable to get profile for channel member, user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "Falha ao obter os comentários da mensagem em notificações root_post_id=%v, err=%v"
   },
@@ -2760,6 +2880,18 @@
     "translation": "Para precisa ser maior que De"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering 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."
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "Senha inválida redefinir salt nas configurações de email.  Deve ser de 32 caracteres ou mais."
   },
@@ -2944,6 +3076,10 @@
     "translation": "Site URL deve ser uma URL válida e começar com http:// ou https://"
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "O nome do site deve ser menor ou igual à {{.MaxLength}} caracteres."
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index e8e74e024..f32d68e0a 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -237,11 +237,11 @@
   },
   {
     "id": "api.channel.delete_channel.incoming_webhook.error",
-    "translation": "删除接入webhook出错, id=%v"
+    "translation": "删除传入的webhook出错, id=%v"
   },
   {
     "id": "api.channel.delete_channel.outgoing_webhook.error",
-    "translation": "删除对外webhook出错, id=%v"
+    "translation": "删除传出的webhook出错, id=%v"
   },
   {
     "id": "api.channel.delete_channel.permissions.app_error",
@@ -324,10 +324,18 @@
     "translation": "您没有对应的权限"
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v 已从频道移出。"
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "无法移除用户。"
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "未找到要删除的用户"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "该频道已归档或者被删除"
   },
@@ -556,22 +564,46 @@
     "translation": "消息已发送给用户。"
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "显示快捷键列表"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### 键盘快捷键 \n\n#### 导航\n\nALT+UP：左边侧边栏上一个频道或私信\nALT+DOWN：左边侧边栏下一个频道或私信\nALT+SHIFT+UP：左边侧边栏上一个有未读消息的频道或私信\nALT+SHIFT+DOWN: 左边侧边栏下一个有未读消息的频道或私信\nCTRL+K：打开快速频道切换对话框\nCTRL+SHIFT+A：打开帐号设定\nCTRL+SHIFT+M：打开最近提及\n\n#### 文件\n\nCTRL+U：上传文件\n\n#### 消息\n\nESC：将此频道所有信息标为已读\nCTRL+UP (在空输入框)：重印你上一个输入的消息或指令\nCTRL+DOWN (在空输入框)：重印你下一个输入的消息或指令\nUP (在空输入框)：修改此频道里你上条消息\n@[character]+TAB：自动完成 [character] 开头的 @username\n:[character]+TAB：自动完成 [character] 开头的表情符号\n\n#### 游览器自带指令\n\nALT+LEFT：你历史中上一个频道\nALT+RIGHT：你历史中下一个频道\nCTRL+PLUS：增加字体大小 (放大)\nCTRL+MINUS：减小字体大小 (缩小)\nSHIFT+UP (在输入框)：延伸高亮文字至上一行\nSHIFT+DOWN (在输入框)：延伸高亮文字至下一行\nSHIFT+ENTER (在输入框)：换行\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### 键盘快捷键 \n\n#### 导航\n\nALT+UP：左边侧边栏上一个频道或私信\nALT+DOWN：左边侧边栏下一个频道或私信\nALT+SHIFT+UP：左边侧边栏上一个有未读消息的频道或私信\nALT+SHIFT+DOWN: 左边侧边栏下一个有未读消息的频道或私信\nCTRL+K：打开快速频道切换对话框\nCTRL+SHIFT+A：打开帐号设定\nCTRL+SHIFT+M：打开最近提及\n\n#### 文件\n\nCTRL+U：上传文件\n\n#### 消息\n\nESC：将此频道所有信息标为已读\nCTRL+UP (在空输入框)：重印你上一个输入的消息或指令\nCTRL+DOWN (在空输入框)：重印你下一个输入的消息或指令\nUP (在空输入框)：修改此频道里你上条消息\n@[character]+TAB：自动完成 [character] 开头的 @username\n:[character]+TAB：自动完成 [character] 开头的表情符号\n\n#### 游览器自带指令\n\nALT+LEFT：你历史中上一个频道\nALT+RIGHT：你历史中下一个频道\nCTRL+PLUS：增加字体大小 (放大)\nCTRL+MINUS：减小字体大小 (缩小)\nSHIFT+UP (在输入框)：延伸高亮文字至上一行\nSHIFT+DOWN (在输入框)：延伸高亮文字至下一行\nSHIFT+ENTER (在输入框)：换行\n"
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "快捷键"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "添加 ¯\\_(ツ)_/¯ 到你的消息"
   },
@@ -628,6 +660,72 @@
     "translation": "发生未知错误。请联系我们。"
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "批量电子邮件任务接收频道已满。请提高EmailBatchingBufferSize。"
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "系统管理员禁用了批量电子邮件"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "批量电子邮件已运行。%v 位用户仍有通知未定。"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "无法找到批量电子邮件通知收件人状态"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "无法找到批量电子邮件通知的贴文频道"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "私信"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "转至发文"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "无法找到批量电子邮件通知发送人"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "你有一条新消息。您有{{.Count}}条新消息。",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "无法找到批量电子邮件通知收件人显示偏好"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "发送批量电子邮件通知到 %v 失败: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} 的新通知[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} 的新通知",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "无法找到批量电子邮件通知收件人"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "批量电子邮件任务已开始。每 %v 秒检查待发电子邮件中。"
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
     "translation": "无法创建表情符号。另一个具有相同名称的表情符号已存在。"
   },
@@ -1028,10 +1126,28 @@
     "translation": "创建信息时出错"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "您没有对应的权限"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "{{.Count}} 文件已发送：{{.Filenames}}{{.Count}} 文件已发送：{{.Filenames}}",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "{{.Count}} 图片已发送：{{.Filenames}}{{.Count}} 图片已发送：{{.Filenames}}",
+      "other": ""
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "编译 @提到 正则表达式出错 user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "无法发送通知到的用户在线@here, err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "无法获取频道成员个人资料，user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "在发送通知时获取注解内容时失败 root_post_id=%v, err=%v"
   },
@@ -1237,7 +1357,7 @@
   },
   {
     "id": "api.server.stop_server.stopped.info",
-    "translation": "停止已服务"
+    "translation": "服务器已停止"
   },
   {
     "id": "api.server.stop_server.stopping.info",
@@ -2105,19 +2225,19 @@
   },
   {
     "id": "api.webhook.create_incoming.disabled.app_errror",
-    "translation": "引入的webhooks已被系统管理员禁用。"
+    "translation": "传入的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "对外webhooks已被系统管理员禁用。"
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "同样的频道的对外的webhooks不能具有同样的触发词/回调URLs。"
+    "translation": "同样的频道的传出的webhooks不能具有同样的触发词/回调URLs。"
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
-    "translation": "对外的webhooks只能创建公共频道。"
+    "translation": "传出的webhooks只能创建公共频道。"
   },
   {
     "id": "api.webhook.create_outgoing.permissions.app_error",
@@ -2129,15 +2249,15 @@
   },
   {
     "id": "api.webhook.delete_incoming.disabled.app_errror",
-    "translation": "引入的webhooks已被系统管理员禁用。"
+    "translation": "传入的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.delete_incoming.permissions.app_errror",
-    "translation": "没有权限删除引入webhook"
+    "translation": "没有权限删除传入的webhook"
   },
   {
     "id": "api.webhook.delete_outgoing.disabled.app_error",
-    "translation": "对外的webhooks已被系统管理员禁用。"
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.delete_outgoing.permissions.app_error",
@@ -2145,11 +2265,11 @@
   },
   {
     "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "引入的webhooks已被系统管理员禁用。"
+    "translation": "传入的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "对外的webhooks已被系统管理员禁用。"
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.incoming.debug",
@@ -2157,7 +2277,7 @@
   },
   {
     "id": "api.webhook.incoming.debug.error",
-    "translation": "不能读取存入webhook的负载。"
+    "translation": "不能读取传入的webhook的负载。"
   },
   {
     "id": "api.webhook.init.debug",
@@ -2165,7 +2285,7 @@
   },
   {
     "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "对外的webhooks已被系统管理员禁用。"
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
@@ -2253,7 +2373,7 @@
   },
   {
     "id": "ent.compliance.run_failed.error",
-    "translation": "'{{.FilePath}}'的'{{.JobName}}'任务导出审核失败。"
+    "translation": "导出合规的'{{.JobName}}'在'{{.FilePath}}'的任务失败"
   },
   {
     "id": "ent.compliance.run_finished.info",
@@ -2549,7 +2669,7 @@
   },
   {
     "id": "mattermost.system_admins.error",
-    "translation": "未能从mattermost安全更新信息获取系统管理员."
+    "translation": "未能从Mattermost安全更新信息获取系统管理员。"
   },
   {
     "id": "mattermost.working_dir",
@@ -2760,6 +2880,18 @@
     "translation": "必须比From参数大"
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering is enabled"
+  },
+  {
+    "id": "model.config.is_valid.email_batching_buffer_size.app_error",
+    "translation": "无效的批量电子邮件缓存大小设定。必须为零或者正整数。"
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "无效的批量电子邮件间隔设定。必须至少30秒。"
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "邮箱设定中无效的密码重置盐值。至少32位及以上字符。"
   },
@@ -2869,7 +3001,7 @@
   },
   {
     "id": "model.config.is_valid.login_attempts.app_error",
-    "translation": "服务设置的最大尝试登录数无效.必须是正整数."
+    "translation": "无效的最大尝试登录数服务设置。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
@@ -2944,6 +3076,10 @@
     "translation": "站点网址必须为有效URL并且以 http:// 或 https:// 开头"
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "站点名必须小于或等于 {{.MaxLength}} 个字符。"
   },
@@ -3581,7 +3717,7 @@
   },
   {
     "id": "store.sql_channel.get_member.missing.app_error",
-    "translation": "无法找到与此用户id和频道id相关联的频道。"
+    "translation": "无法找到与此用户id和频道id相关联的频道成员"
   },
   {
     "id": "store.sql_channel.get_member_count.app_error",
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index fec923fe4..80099ab93 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -169,7 +169,7 @@
   },
   {
     "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
-    "translation": "無法將使用者新增到頻道。使用者已被從團隊中移除。"
+    "translation": "無法將使用者新增到頻道。使用者已從團隊中移除。"
   },
   {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
@@ -324,10 +324,18 @@
     "translation": "您沒有適當的權限 "
   },
   {
+    "id": "api.channel.remove_member.removed",
+    "translation": "%v 已從頻道中移除。"
+  },
+  {
     "id": "api.channel.remove_member.unable.app_error",
     "translation": "無法刪除使用者。"
   },
   {
+    "id": "api.channel.remove_member.user.app_error",
+    "translation": "找不到要移除的使用者"
+  },
+  {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
     "translation": "頻道已被封存或刪除"
   },
@@ -465,7 +473,7 @@
   },
   {
     "id": "api.command_expand_collapse.fail.app_error",
-    "translation": "打開預覽時發生錯誤"
+    "translation": "展開預覽時發生錯誤"
   },
   {
     "id": "api.command_join.desc",
@@ -556,22 +564,46 @@
     "translation": "已傳訊給使用者。"
   },
   {
+    "id": "api.command_shortcuts.browser",
+    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser_mac",
+    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
     "id": "api.command_shortcuts.desc",
     "translation": "顯示鍵盤快捷鍵列表"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "translation": "### 鍵盤快捷鍵\n\n#### 瀏覽\n\nALT+UP：側邊欄裡面上一個頻道或直接訊息\nALT+DOWN：側邊欄裡面下一個頻道或直接訊息\nALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\nALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\nCTRL+K：開啟快速切換頻道對話框\nCTRL+SHIFT+A：開啟帳號設定\nCTRL+SHIFT+M：開啟最近提及您的訊息\n\n#### 檔案\n\nCTRL+U：上傳檔案\n\n#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCTRL+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCTRL+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n#### 瀏覽器內建命令\n\nALT+LEFT：瀏覽紀錄的前一個頻道\nALT+RIGHT：瀏覽紀錄的下一個頻道\nCTRL+PLUS：增加字體尺寸(放大)\nCTRL+MINUS：減少字體尺寸(縮小)\nSHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\nSHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\nSHIFT+ENTER (在輸入欄)：新增一行\n"
+    "id": "api.command_shortcuts.files",
+    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.list_mac",
-    "translation": "### 鍵盤快捷鍵\n\n#### 瀏覽\n\nALT+UP：側邊欄裡面上一個頻道或直接訊息\nALT+DOWN：側邊欄裡面下一個頻道或直接訊息\nALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\nALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\nCMD+K：開啟快速切換頻道對話框\nCMD+SHIFT+A：開啟帳號設定\nCMD+SHIFT+M：開啟最近提及您的訊息\n\n#### 檔案\n\nCMD+U：上傳檔案\n\n#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n#### 瀏覽器內建命令\n\nCMD+[：瀏覽紀錄的前一個頻道\nCMD+]：瀏覽紀錄的下一個頻道\nCMD+PLUS：增加字體尺寸(放大)\nCMD+MINUS：減少字體尺寸(縮小)\nSHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\nSHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\nSHIFT+ENTER (在輸入欄)：新增一行\n"
+    "id": "api.command_shortcuts.files_mac",
+    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs_mac",
+    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "快捷鍵"
   },
   {
+    "id": "api.command_shortcuts.nav",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav_mac",
+    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "把 ¯\\_(ツ)_/¯ 加到訊息內"
   },
@@ -628,40 +660,106 @@
     "translation": "發生未知的錯誤。請聯繫支援單位。"
   },
   {
+    "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
+    "translation": "批次郵件的接收頻道已滿。請增加 EmailBatchingBufferSize。"
+  },
+  {
+    "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
+    "translation": "批次郵件已被系統管理員停用"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.finished_running",
+    "translation": "完成批次郵件處理。尚有 %v 使用者的通知等待處理。"
+  },
+  {
+    "id": "api.email_batching.check_pending_emails.status.app_error",
+    "translation": "找不到批次郵件通知收件人的狀態"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.channel.app_error",
+    "translation": "找不到批次郵件通知文章的頻道"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.date",
+    "translation": "{{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.direct_message",
+    "translation": "直接訊息"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.go_to_post",
+    "translation": "前往發文"
+  },
+  {
+    "id": "api.email_batching.render_batched_post.sender.app_error",
+    "translation": "找不到批次郵件通知文章的發文者"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.body_text",
+    "translation": {
+      "one": "您有 1 筆新的訊息。您有 {{.Count}} 筆新的訊息。",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
+    "translation": "找不到批次郵件通知收件人的顯示偏好"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.send.app_error",
+    "translation": "無法寄送批次通知郵件給 %v: %v"
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.subject",
+    "translation": {
+      "one": "[{{.SiteName}}] {{.Year}} {{.Month}} {{.Day}} 的新通知[{{.SiteName}}] {{.Year}} {{.Month}} {{.Day}} 的新通知",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.email_batching.send_batched_email_notification.user.app_error",
+    "translation": "找不到批次郵件通知的收件人"
+  },
+  {
+    "id": "api.email_batching.start.starting",
+    "translation": "開始批次郵件處理。每 %v 秒檢查未處理郵件。"
+  },
+  {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "無法建立顏文字，已存在相同名稱的顏文字。"
+    "translation": "無法建立繪文字，已存在相同名稱的繪文字。"
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "無法新增顏文字。無法理解要求。"
+    "translation": "無法新增繪文字。無法理解要求。"
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "沒有適當的權限建立顏文字"
+    "translation": "沒有適當的權限建立繪文字。"
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "無法建立顏文字。圖片必須小於64KB。"
+    "translation": "無法建立繪文字。圖片必須小於64KB。"
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "沒有適當的權限刪除顏文字"
+    "translation": "沒有適當的權限刪除繪文字。"
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "自訂顏文字已被系統管理員停用。"
+    "translation": "自訂繪文字已被系統管理員停用。"
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "無法解碼顏文字圖像檔案。"
+    "translation": "無法解碼繪文字圖像檔案。"
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "無法讀取顏文字圖像檔案。"
+    "translation": "無法讀取繪文字圖像檔案。"
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "正在初始化顏文字 API 路徑"
+    "translation": "正在初始化繪文字 API 路徑"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -669,11 +767,11 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "無法新增顏文字。檔案必須是PNG、JPEG或GIF。"
+    "translation": "無法新增繪文字。檔案必須是PNG、JPEG或GIF。"
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "無法建立顏文字。圖片長寬皆須小於等於128像素。"
+    "translation": "無法建立繪文字。圖片長寬皆須小於等於128像素。"
   },
   {
     "id": "api.file.file_upload.exceeds",
@@ -857,7 +955,7 @@
   },
   {
     "id": "api.license.add_license.unique_users.app_error",
-    "translation": "此授權只支援 {{.Users}} 位使用者，而您的系統有 {{.Count}} 位使用者。使用者人數是根據電子郵件位址計算. 您可從 站台報告 -> 顯示統計 看到使用者總數量。"
+    "translation": "此授權只支援 {{.Users}} 位使用者，而您的系統有 {{.Count}} 位使用者。使用者人數是根據電子郵件位址計算。使用者總數量在 站台報告 -> 顯示統計。"
   },
   {
     "id": "api.license.init.debug",
@@ -1028,10 +1126,28 @@
     "translation": "建立訊息時遇到錯誤"
   },
   {
+    "id": "api.post.delete_flagged_post.app_error.warn",
+    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+  },
+  {
     "id": "api.post.delete_post.permissions.app_error",
     "translation": "您沒有適當的權限"
   },
   {
+    "id": "api.post.get_message_for_notification.files_sent",
+    "translation": {
+      "one": "已送出 {{.Count}} 個檔案：{{.Filenames}}已送出 {{.Count}} 個檔案：{{.Filenames}}",
+      "other": ""
+    }
+  },
+  {
+    "id": "api.post.get_message_for_notification.images_sent",
+    "translation": {
+      "one": "已送出 {{.Count}} 個圖片：{{.Filenames}}已送出 {{.Count}} 個圖片：{{.Filenames}}",
+      "other": ""
+    }
+  },
+  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "編譯 @mention 正規表示式失敗 user_id=%v, err=%v"
   },
@@ -1096,6 +1212,10 @@
     "translation": "無法寄送 @here 通知給在線使用者 err=%v"
   },
   {
+    "id": "api.post.notification.member_profile.warn",
+    "translation": "無法取得頻道成員資訊 user_id=%v"
+  },
+  {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
     "translation": "在發送通知時取得註解文章失敗 root_post_id=%v err=%v"
   },
@@ -1465,7 +1585,7 @@
   },
   {
     "id": "api.templates.email_change_body.title",
-    "translation": "您已經變更您的電子郵件地址"
+    "translation": "已經變更電子郵件地址"
   },
   {
     "id": "api.templates.email_change_subject",
@@ -1481,7 +1601,7 @@
   },
   {
     "id": "api.templates.email_change_verify_body.title",
-    "translation": "已經變更您的電子郵件地址"
+    "translation": "已經變更電子郵件地址"
   },
   {
     "id": "api.templates.email_change_verify_subject",
@@ -1489,7 +1609,7 @@
   },
   {
     "id": "api.templates.email_footer",
-    "translation": "要更改您的通知偏好設定，請登入您的團隊網站並且至 帳號設定 > 通知。"
+    "translation": "要更改通知偏好設定，請登入團隊網站並且至 帳號設定 > 通知。"
   },
   {
     "id": "api.templates.email_info",
@@ -1529,7 +1649,7 @@
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost 能讓您透過個人電腦與手機分享訊息與檔案，包括快速搜尋以及封存功能。當您加入 <strong>{{.TeamDisplayName}}</strong> 後，您能夠透過下列網址隨時登入到您的新團隊來使用這些功能：<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost 能讓您透過個人電腦與手機分享訊息與檔案，包括快速搜尋以及封存功能。當加入 <strong>{{.TeamDisplayName}}</strong> 後，您能夠透過下列網址隨時登入到新團隊來使用這些功能：<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
   },
   {
     "id": "api.templates.invite_body.info",
@@ -1549,7 +1669,7 @@
   },
   {
     "id": "api.templates.password_change_body.title",
-    "translation": "您的密碼已更新"
+    "translation": "密碼已更新"
   },
   {
     "id": "api.templates.password_change_subject",
@@ -1573,15 +1693,15 @@
   },
   {
     "id": "api.templates.reset_body.info",
-    "translation": "按下方的 \"重設密碼\"來更改您的密碼。<br>如果您不是要重設密碼，請不要理會這封郵件，您的密碼依然維持不變。密碼重設的連結將在 24 小時之後過期。"
+    "translation": "按下方的 \"重設密碼\"來更改您的密碼。<br>如果您並沒有想要重設密碼，請不要理會這封郵件，密碼依然維持不變。密碼重設的連結將在 24 小時之後過期。"
   },
   {
     "id": "api.templates.reset_body.title",
-    "translation": "您已提出了一個密碼重設的要求"
+    "translation": "已提出重設密碼"
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "重新設定您的密碼"
+    "translation": "重新設定密碼"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
@@ -1589,15 +1709,15 @@
   },
   {
     "id": "api.templates.signin_change_email.body.title",
-    "translation": "您已經變更了您的登入方式"
+    "translation": "已變更登入方式"
   },
   {
     "id": "api.templates.signup_team_body.button",
-    "translation": "設定您的團隊"
+    "translation": "設定團隊"
   },
   {
     "id": "api.templates.signup_team_body.info",
-    "translation": "{{ .SiteName }} 是一個讓您所有團隊隨時隨地都能溝通、搜尋與取用的地方。<br>當您的團隊持續不斷的溝通時, 善用 {{ .SiteName }} 能讓您獲益良多--讓我們呼朋引伴吧。"
+    "translation": "{{ .SiteName }} 是一個讓所有團隊隨時隨地都能溝通、搜尋與取用的地方。<br>當團隊持續不斷的溝通時, 善用 {{ .SiteName }} 能讓您獲益良多--讓我們呼朋引伴吧。"
   },
   {
     "id": "api.templates.signup_team_body.title",
@@ -1617,11 +1737,11 @@
   },
   {
     "id": "api.templates.upgrade_30_body.info",
-    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>您的多重帳號已更新</h3>您的 Mattermost 伺服器已升級到版本3.0，從此您可以在多個團隊中使用同一帳號。<br/><br/>升級程式發現伺服器上有您的帳號所以寄信給您。<br/><br/>更新如下：<br/><br/>{{if .EmailChanged }}- `/{{.TeamName}}`帳號中重覆的電子郵件已變更為`{{.Email}}`。您必須使用電子郵件與密碼登入，而您可用此新的電子郵件進行登入。<br/><br/>{{end}}{{if .UsernameChanged }}- `/{{.TeamName}}`站台重覆的使用者名稱變更為`{{.Username}}`以避免與其它的帳號混淆。<br/><br/>{{end}} 建議動作：<br/><br/>建議您用重覆的帳號登入並把主要帳號加到您要繼續使用的團隊、公開頻道與私有群組。<br/><br/>這樣您方可使用主要帳號存取所有公開頻道與私有群組的歷史。您可以用其它重覆的帳號登入存取之前的直接傳送訊息。<br/><br/>更多資訊：<br/><br/>更多關於升到到Mattermost 3.0 的相關資訊，請見: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
+    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>您的多重帳號已更新</h3> Mattermost 伺服器已升級到版本3.0，從此可以在多個團隊中使用同一帳號。<br/><br/>升級程式發現伺服器上有您的帳號所以寄信給您。<br/><br/>更新如下：<br/><br/>{{if .EmailChanged }}- `/{{.TeamName}}`帳號中重覆的電子郵件已變更為`{{.Email}}`。您必須使用電子郵件與密碼登入，可用此新的電子郵件進行登入。<br/><br/>{{end}}{{if .UsernameChanged }}- `/{{.TeamName}}`站台重覆的使用者名稱變更為`{{.Username}}`以避免與其它的帳號混淆。<br/><br/>{{end}} 建議動作：<br/><br/>建議您用重覆的帳號登入並把主要帳號加到要繼續使用的團隊、公開頻道與私有群組。<br/><br/>這樣方可使用主要帳號存取所有公開頻道與私有群組的歷史。可以用其它重覆的帳號登入存取之前的直接傳送訊息。<br/><br/>詳細訊息：<br/><br/>如需關於升到到 Mattermost 3.0 的詳細資訊，請參閱：<a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
-    "translation": "[MATTERMOST] 變更您的帳號以升級至 Mattermost 3.0"
+    "translation": "[MATTERMOST] 升級至 Mattermost 3.0 後帳號的變更"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -1629,11 +1749,11 @@
   },
   {
     "id": "api.templates.username_change_body.title",
-    "translation": "您的使用者名稱已變更"
+    "translation": "使用者名稱已變更"
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "您的使用者名稱已變更為{{.TeamDisplayName}}"
+    "translation": "使用者名稱已變更為{{.TeamDisplayName}}"
   },
   {
     "id": "api.templates.verify_body.button",
@@ -1641,11 +1761,11 @@
   },
   {
     "id": "api.templates.verify_body.info",
-    "translation": "請按下方連結來驗證您的電子郵件地址。"
+    "translation": "請按下方連結來驗證電子郵件地址。"
   },
   {
     "id": "api.templates.verify_body.title",
-    "translation": "您已加入{{ .ServerURL }}"
+    "translation": "已加入{{ .ServerURL }}"
   },
   {
     "id": "api.templates.verify_subject",
@@ -1661,7 +1781,7 @@
   },
   {
     "id": "api.templates.welcome_body.info",
-    "translation": "請按下方連結來驗證您的電子郵件地址。"
+    "translation": "請按下方連結來驗證電子郵件地址。"
   },
   {
     "id": "api.templates.welcome_body.info2",
@@ -1673,11 +1793,11 @@
   },
   {
     "id": "api.templates.welcome_body.title",
-    "translation": "您已加入{{ .ServerURL }}"
+    "translation": "已加入{{ .ServerURL }}"
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "您已加入{{ .ServerURL }}"
+    "translation": "已加入{{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
@@ -1721,7 +1841,7 @@
   },
   {
     "id": "api.user.check_user_login_attempts.too_many.app_error",
-    "translation": "您的帳號已經因為嘗試太多次的錯誤密碼而被鎖定。請重設您的密碼。"
+    "translation": "您的帳號已經因為嘗試太多次的錯誤密碼而被鎖定。請重設密碼。"
   },
   {
     "id": "api.user.check_user_mfa.bad_code.app_error",
@@ -1785,7 +1905,7 @@
   },
   {
     "id": "api.user.create_user.no_open_server",
-    "translation": "本機不開放自由註冊，請從您的管理員處取得邀請。"
+    "translation": "本機不開放自由註冊，請從管理員處取得邀請。"
   },
   {
     "id": "api.user.create_user.save.error",
@@ -1909,7 +2029,7 @@
   },
   {
     "id": "api.user.permanent_delete_user.system_admin.warn",
-    "translation": "您正在刪除系統管理員 %v。您或許需要用命令列工具將另一個帳號設定為系統管理員。"
+    "translation": "正在刪除系統管理員 %v。刪除後您可能需要用命令列工具將另一個帳號設定為系統管理員。"
   },
   {
     "id": "api.user.reset_password.invalid_link.app_error",
@@ -1997,7 +2117,7 @@
   },
   {
     "id": "api.user.update_password.incorrect.app_error",
-    "translation": "您所輸入的 \"目前密碼\" 不正確。請檢查 Caps Lock 是關的並再試一次。"
+    "translation": "輸入的 \"目前密碼\" 不正確。請檢查 Caps Lock 是關的並再試一次。"
   },
   {
     "id": "api.user.update_password.menu",
@@ -2177,7 +2297,7 @@
   },
   {
     "id": "cli.license.critical",
-    "translation": "此功能需要企業版授權，請聯繫您的系統管理員將系統升級為企業版授權。"
+    "translation": "此功能需要企業版授權，請聯繫系統管理員將系統升級為企業版授權。"
   },
   {
     "id": "ent.brand.save_brand_image.decode.app_error",
@@ -2225,7 +2345,7 @@
   },
   {
     "id": "ent.cluster.licence_disable.app_error",
-    "translation": "目前授權不提供叢集功能，請聯繫您的系統管理員將系統升級為企業版授權。"
+    "translation": "目前授權不提供叢集功能，請聯繫系統管理員將系統升級為企業版授權。"
   },
   {
     "id": "ent.cluster.ping_failed.info",
@@ -2249,7 +2369,7 @@
   },
   {
     "id": "ent.compliance.licence_disable.app_error",
-    "translation": "目前授權不提供規範功能，請聯繫您的系統管理員將系統升級為企業版授權。"
+    "translation": "目前授權不提供規範功能，請聯繫系統管理員將系統升級為企業版授權。"
   },
   {
     "id": "ent.compliance.run_failed.error",
@@ -2269,7 +2389,7 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "目前授權不提供限制自訂顏文字，請聯繫您的系統管理員將系統升級為企業版授權。"
+    "translation": "目前授權不提供限制自訂繪文字，請聯繫系統管理員將系統升級為企業版授權。"
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2301,7 +2421,7 @@
   },
   {
     "id": "ent.ldap.do_login.user_filtered.app_error",
-    "translation": "您的 LDAP 帳號沒有使用此 Mattermost 伺服器的權限。請向您的系統管理員詢問確認 LDAP 使用者過濾條件。"
+    "translation": "您的 LDAP 帳號沒有使用此 Mattermost 伺服器的權限。請向系統管理員詢問確認 LDAP 使用者過濾條件。"
   },
   {
     "id": "ent.ldap.do_login.user_not_registered.app_error",
@@ -2353,7 +2473,7 @@
   },
   {
     "id": "ent.mfa.license_disable.app_error",
-    "translation": "您的授權不支援多重因子認證"
+    "translation": "您的授權不支援多重要素驗證"
   },
   {
     "id": "ent.mfa.validate_token.authenticate.app_error",
@@ -2369,15 +2489,15 @@
   },
   {
     "id": "ent.saml.build_request.app_error",
-    "translation": "建立與身分識別提供者連接的要求時發生錯誤。請聯繫您的系統管理員。"
+    "translation": "建立與身分識別提供者連接的要求時發生錯誤。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.build_request.encoding.app_error",
-    "translation": "對與身分識別提供者連接的要求編碼時發生錯誤。請聯繫您的系統管理員。"
+    "translation": "對與身分識別提供者連接的要求編碼時發生錯誤。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.build_request.encoding_signed.app_error",
-    "translation": "對與身分識別提供者連接的已簽章要求編碼時發生錯誤。請聯繫您的系統管理員。"
+    "translation": "對與身分識別提供者連接的已簽章要求編碼時發生錯誤。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.configure.app_error",
@@ -2385,27 +2505,27 @@
   },
   {
     "id": "ent.saml.configure.encryption_not_enabled.app_error",
-    "translation": "由於沒有啟用加密，SAML 登入失敗。請聯繫您的系統管理員。"
+    "translation": "由於沒有啟用加密，SAML 登入失敗。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.configure.load_idp_cert.app_error",
-    "translation": "無法找到身份識別提供者公開憑證檔案。請聯繫您的系統管理員。"
+    "translation": "找不到身份識別提供者公開憑證檔案。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.configure.load_private_key.app_error",
-    "translation": "由於找不到服務提供者私鑰，SAML 登入失敗。請聯繫您的系統管理員。"
+    "translation": "由於找不到服務提供者私鑰，SAML 登入失敗。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.configure.load_public_cert.app_error",
-    "translation": "無法找到服務提供者公開憑證檔案。請聯繫您的系統管理員。"
+    "translation": "找不到服務提供者公開憑證檔案。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.configure.not_encrypted_response.app_error",
-    "translation": "由於身份識別提供者的回應未加密，SAML 登入失敗。請聯繫您的系統管理員。"
+    "translation": "由於身份識別提供者的回應未加密，SAML 登入失敗。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.do_login.decrypt.app_error",
-    "translation": "由於解碼身份識別提供者的回應時發生錯誤，SAML 登入失敗。請聯繫您的系統管理員。"
+    "translation": "由於解碼身份識別提供者的回應時發生錯誤，SAML 登入失敗。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.do_login.empty_response.app_error",
@@ -2413,11 +2533,11 @@
   },
   {
     "id": "ent.saml.do_login.parse.app_error",
-    "translation": "解析身份識別提供者的回應時發生錯誤。請聯繫您的系統管理員。"
+    "translation": "解析身份識別提供者的回應時發生錯誤。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.do_login.validate.app_error",
-    "translation": "驗證身份識別提供者的回應時發生錯誤。請聯繫您的系統管理員。"
+    "translation": "驗證身份識別提供者的回應時發生錯誤。請聯繫系統管理員。"
   },
   {
     "id": "ent.saml.license_disable.app_error",
@@ -2461,7 +2581,7 @@
   },
   {
     "id": "leave_team_modal.desc",
-    "translation": "您將退出所有的公開頻道跟私人群組。如果此團隊是私人的，您將無法重新加入。您確定嘛？"
+    "translation": "將離開所有的公開頻道與私人群組。如果團隊是私人團隊，將無法重新加入。您確定嘛？"
   },
   {
     "id": "leave_team_modal.no",
@@ -2673,7 +2793,7 @@
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "無法附加顏文字資料於要求"
+    "translation": "無法附加繪文字資料於要求"
   },
   {
     "id": "model.client.create_emoji.image.app_error",
@@ -2760,6 +2880,18 @@
     "translation": "\"到\"必須大於\"起始\""
   },
   {
+    "id": "model.config.is_valid.cluster_email_batching.app_error",
+    "translation": "Unable to enable email batching when clustering is enabled"
+  },
+  {
+    "id": "model.config.is_valid.email_batching_buffer_size.app_error",
+    "translation": "電子郵件設定的批次郵件緩衝大小值無效。必須大於等於零。"
+  },
+  {
+    "id": "model.config.is_valid.email_batching_interval.app_error",
+    "translation": "電子郵件設定的批次郵件間隔值無效。必須大於等於30秒。"
+  },
+  {
     "id": "model.config.is_valid.email_reset_salt.app_error",
     "translation": "電子郵件設定中的密碼重設 Salt 無效。必須在32個字元以上。"
   },
@@ -2781,7 +2913,7 @@
   },
   {
     "id": "model.config.is_valid.file_preview_height.app_error",
-    "translation": "檔案設定中的預覽高度無效.。必須為0或者正數。"
+    "translation": "檔案設定中的預覽高度無效。必須為0或者正數。"
   },
   {
     "id": "model.config.is_valid.file_preview_width.app_error",
@@ -2913,7 +3045,7 @@
   },
   {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
-    "translation": "找不到身份識別提供者公開憑證。您是否忘記上傳？"
+    "translation": "找不到身份識別提供者公開憑證。是否忘記上傳？"
   },
   {
     "id": "model.config.is_valid.saml_idp_descriptor_url.app_error",
@@ -2929,11 +3061,11 @@
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
-    "translation": "找不到身份識別提供者私鑰。您是否忘記上傳？"
+    "translation": "找不到身份識別提供者私鑰。是否忘記上傳？"
   },
   {
     "id": "model.config.is_valid.saml_public_cert.app_error",
-    "translation": "找不到服務提供者公開憑證。您是否忘記上傳？"
+    "translation": "找不到服務提供者公開憑證。是否忘記上傳？"
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
@@ -2944,6 +3076,10 @@
     "translation": "站台網址必須使用以 http:// 或 https:// 開頭的有效網址。"
   },
   {
+    "id": "model.config.is_valid.site_url_email_batching.app_error",
+    "translation": "Unable to enable email batching when SiteURL isn't set."
+  },
+  {
     "id": "model.config.is_valid.sitename_length.app_error",
     "translation": "站台名稱至多{{.MaxLength}}個字"
   },
@@ -2973,7 +3109,7 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "無效的顏文字 ID"
+    "translation": "無效的繪文字 ID"
   },
   {
     "id": "model.emoji.name.app_error",
@@ -3281,67 +3417,67 @@
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元。"
+    "translation": "密碼最短必須有{{.Min}}個字元。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_number.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母和一個數字。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母和一個數字。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母和一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母和一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母和一個大寫英文字母。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母和一個大寫英文字母。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個大寫英文字母和一個數字。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個大寫英文字母和一個數字。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個大寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個大寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個大寫英文字母和一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個小寫英文字母、一個大寫英文字母和一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.pwd_number.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個數字。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個數字。"
   },
   {
     "id": "model.user.is_valid.pwd_number_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個數字和一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個數字和一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.pwd_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase_number.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母和一個數字。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母和一個數字。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母、一個數字和一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
-    "translation": "您的密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母和一個符號(\"~!@#$%^&*()\")。"
+    "translation": "密碼最短必須有{{.Min}}個字元且至少有一個大寫英文字母和一個符號(\"~!@#$%^&*()\")。"
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
@@ -3477,7 +3613,7 @@
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "%v 的資料庫結構描述版本無法升級。您不能略過版本."
+    "translation": "%v 的資料庫結構描述版本無法升級。請不要跳過中間版本。"
   },
   {
     "id": "store.sql.short_ciphertext",
@@ -3637,7 +3773,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
-    "translation": "您已達允許加入的頻道總數量限制。"
+    "translation": "已達允許加入的頻道總數量限制。"
   },
   {
     "id": "store.sql_channel.save_channel.previously.app_error",
@@ -3749,27 +3885,27 @@
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "無法刪除顏文字"
+    "translation": "無法刪除繪文字"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "找不到要刪除的顏文字"
+    "translation": "找不到要刪除的繪文字"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "無法取得顏文字"
+    "translation": "無法取得繪文字"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "無法取得顏文字"
+    "translation": "無法取得繪文字"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "無法取得顏文字"
+    "translation": "無法取得繪文字"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "無法儲存顏文字"
+    "translation": "無法儲存繪文字"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -4229,23 +4365,23 @@
   },
   {
     "id": "store.sql_user.get_by_auth.missing_account.app_error",
-    "translation": "在此團隊中找不到符合您採用的認證型態的帳號，此團隊或許需要從團隊擁有者取得邀請才可加入。"
+    "translation": "在此團隊中找不到符合您認證型態的帳號，此團隊需要從團隊擁有者取得邀請才可加入。"
   },
   {
     "id": "store.sql_user.get_by_auth.other.app_error",
-    "translation": "尋找您採用的認證型態的帳號時遇到錯誤。"
+    "translation": "根據認證型態尋找帳號時遇到錯誤。"
   },
   {
     "id": "store.sql_user.get_by_username.app_error",
-    "translation": "在此團隊中找不到符合您的使用者名稱的帳號，此團隊或許需要從團隊擁有者取得邀請才可加入。"
+    "translation": "在此團隊中找不到符合您的使用者名稱之帳號，此團隊需要從團隊擁有者取得邀請才可加入。"
   },
   {
     "id": "store.sql_user.get_for_login.app_error",
-    "translation": "找不到符合您的認證的帳號，此團隊或許需要從團隊擁有者取得邀請才可加入。"
+    "translation": "找不到符合您的認證之帳號，此團隊需要從團隊擁有者取得邀請才可加入。"
   },
   {
     "id": "store.sql_user.get_for_login.multiple_users",
-    "translation": "找到數個相符於您採用的認證的帳號，所以無法讓您登入，請聯繫系統管理員。"
+    "translation": "找到數個相符於您的認證之帳號，所以無法讓您登入，請聯繫系統管理員。"
   },
   {
     "id": "store.sql_user.get_profiles.app_error",
@@ -4269,7 +4405,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "在此團隊中找不到符合您的電子郵件的帳號，此團隊或許需要從團隊擁有者取得邀請才可加入。"
+    "translation": "在此團隊中找不到符合您的電子郵件之帳號，此團隊需要從團隊擁有者取得邀請才可加入。"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",
@@ -4297,7 +4433,7 @@
   },
   {
     "id": "store.sql_user.save.max_accounts.app_error",
-    "translation": "此團隊已達最大使用者數量上限。請聯絡您的系統管理員調大數量限制。"
+    "translation": "此團隊已達最大使用者數量上限。請聯絡系統管理員調大數量限制。"
   },
   {
     "id": "store.sql_user.save.member_count.app_error",
@@ -4565,7 +4701,7 @@
   },
   {
     "id": "web.check_browser_compatibility.app_error",
-    "translation": "無法支援您目前的瀏覽器，請升級到下列任一瀏覽器: Google Chrome 21 以上版本、Internet Explorer 11 以上版本、FireFox 14 以上版本、Safari 9 以上版本"
+    "translation": "無法支援目前的瀏覽器，請升級到下列任一瀏覽器: Google Chrome 21 以上版本、Internet Explorer 11 以上版本、FireFox 14 以上版本、Safari 9 以上版本"
   },
   {
     "id": "web.claim_account.team.error",