translations PR 20161128 (#4666)

11 files changed, 523 insertions, 83 deletions

diff --git a/i18n/de.json b/i18n/de.json
index c3cbe03d0..8057a6fa8 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -441,11 +441,11 @@
   },
   {
     "id": "api.command.team_mismatch.app_error",
-    "translation": "Cannot update commands across teams"
+    "translation": "Kann Befehle nicht über Teams hinweg aktualisieren"
   },
   {
     "id": "api.command.update.app_error",
-    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+    "translation": "Die Berechtigungen für den Aktualisierungsbefehl sind ungeeignet"
   },
   {
     "id": "api.command_away.desc",
@@ -593,11 +593,11 @@
   },
   {
     "id": "api.command_offline.desc",
-    "translation": "Setzen Sie Ihren Status auf Offline"
+    "translation": "Setzen Sie Ihren Status auf offline"
   },
   {
     "id": "api.command_offline.name",
-    "translation": "Offline"
+    "translation": "offline"
   },
   {
     "id": "api.command_offline.success",
@@ -605,11 +605,11 @@
   },
   {
     "id": "api.command_online.desc",
-    "translation": "Setzen Sie Ihren Status auf Online"
+    "translation": "Setzen Sie Ihren Status auf online"
   },
   {
     "id": "api.command_online.name",
-    "translation": "Online"
+    "translation": "online"
   },
   {
     "id": "api.command_online.success",
@@ -617,11 +617,11 @@
   },
   {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Eingebaute Browser Befehle\n\nAlt+Links: Vorheriger Kanal in Ihrem Verlauf\nAlt+Rechts: Nächster Kanal in Ihrem Verlauf\nStrg+Plus: Schriftgröße vergrößern (hineinzoomen)\nStrg+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
+    "translation": "#### Eingebaute Browser-Befehle\n\nAlt+Links: Vorheriger Kanal in Ihrem Verlauf\nAlt+Rechts: Nächster Kanal in Ihrem Verlauf\nStrg+Plus: Schriftgröße vergrößern (hineinzoomen)\nStrg+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Eingebaute Browser Befehle\n\nCmd+[: Vorheriger Kanal in Ihrem Verlauf\nCmd+]: Nächster Kanal in Ihrem Verlauf\nCmd+Plus: Schriftgröße erhöhen (hineinzoomen)\nCmd+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
+    "translation": "#### Eingebaute Browser-Befehle\n\nCmd+[: Vorheriger Kanal in Ihrem Verlauf\nCmd+]: Nächster Kanal in Ihrem Verlauf\nCmd+Plus: Schriftgröße erhöhen (hineinzoomen)\nCmd+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -637,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mitteilungen\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nStrg+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nStrg+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Die letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n#[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\\\n"
+    "translation": "#### Mitteilungen\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nStrg+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash-Befehl anzeigen\nStrg+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash-Befehl anzeigen\nHoch (in leerem Eingabefeld): Die letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n~[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Nachrichten\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nCmd+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash Befehl anzeigen\nCmd+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash Befehl anzeigen\nHoch (in leerem Eingabefeld): Ihre letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n#[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n "
+    "translation": "#### Nachrichten\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nCmd+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash-Befehl anzeigen\nCmd+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash-Befehl anzeigen\nHoch (in leerem Eingabefeld): Ihre letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n~[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -791,7 +791,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Das Emoji konnte nicht erstellt werden. Das Bild darf maximal 64 KB groß sein."
+    "translation": "Das Emoji konnte nicht erstellt werden. Das Bild darf maximal 1 MB groß sein."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -822,8 +822,20 @@
     "translation": "Das Emoji kann nicht erstellt werden. Die Datei muss vom Typ PNG, JPEG oder GIF sein."
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Das Emoji konnte nicht erstellt werden. Das Bild darf maximal 128 x 128 pixel groß sein."
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Konnte Emoji nicht erstellen. Es trat ein Fehler beim Dekodieren des Bildes auf."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Konnte Emoji nicht erstellen. Es trat ein Fehler beim Umwandeln des Bildes auf."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Konnte Emoji nicht erstellen. Es trat ein Fehler beim Dekodieren des GIF auf."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Konnte Emoji nicht erstellen. Es trat ein Fehler beim Umwandeln des GIF auf."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -991,7 +1003,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
+    "translation": "Datei über den maximalen Dimensionen konnte nicht hochgeladen werden: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -1255,7 +1267,7 @@
   },
   {
     "id": "api.post.create_post.root_id.app_error",
-    "translation": "Ungültiger Root-ID Parameter"
+    "translation": "Ungültiger RootId Parameter"
   },
   {
     "id": "api.post.create_webhook_post.creating.app_error",
@@ -1263,7 +1275,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Konnte markierte Nachrichten Einstellungen beim entfernen der Nachricht nicht löschen, err=%v"
+    "translation": "Konnte markierte Nachrichten Einstellungen beim Entfernen der Nachricht nicht löschen, err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "Es trat ein Fehler beim Löschen von Dateien für die Nachricht auf, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all wurde deaktiviert, da der Kanal mehr als {{.Users}} Benutzer hat."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel wurde deaktiviert, da der Kanal mehr als {{.Users}} Benutzer hat."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here wurde deaktiviert, da der Kanal mehr als {{.Users}} Benutzer hat."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} Datei versendet: {{.Filenames}}",
@@ -1333,7 +1357,7 @@
   },
   {
     "id": "api.post.init.debug",
-    "translation": "Initialisieren Nachrichten API Routen"
+    "translation": "Initialisiere API-Routen für Nachrichten"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
@@ -1489,7 +1513,7 @@
   },
   {
     "id": "api.server.start_server.listening.info",
-    "translation": "Server ist online auf %v"
+    "translation": "Server hört auf %v"
   },
   {
     "id": "api.server.start_server.rate.info",
@@ -1525,7 +1549,7 @@
   },
   {
     "id": "api.server.stop_server.stopping.info",
-    "translation": "Stoppe Server..."
+    "translation": "Server wird heruntergefahren..."
   },
   {
     "id": "api.slackimport.slack_add_bot_user.email_pwd",
@@ -1541,7 +1565,7 @@
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Fehler beim hinzufügen des Benutzers zum Kanal: {{.Username}}\r\n"
+    "translation": "Fehler beim Hinzufügen des Benutzers zum Kanal: {{.Username}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
@@ -1620,6 +1644,10 @@
     "translation": "Benutzer mit vorhandenem Account verbunden: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Kann Benutzer nicht importieren: {{.Username}}\r\n"
   },
@@ -2557,7 +2585,7 @@
   },
   {
     "id": "api.webrtc.init.debug",
-    "translation": "Initialisiere WebRTC API Routen "
+    "translation": "Initialisiere WebRTC API Routen"
   },
   {
     "id": "api.webrtc.register_token.app_error",
@@ -2681,7 +2709,7 @@
   },
   {
     "id": "ent.ldap.create_fail",
-    "translation": "Unable to create LDAP user."
+    "translation": "Konnte LDAP Benutzer nicht erstellen."
   },
   {
     "id": "ent.ldap.disabled.app_error",
@@ -2740,6 +2768,14 @@
     "translation": "Ungültiger AD/LDAP Filter"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Fehler bei Authentifizierung des MFA Tokens"
   },
@@ -3316,6 +3352,10 @@
     "translation": "Ungültige maximale Dateigröße in Dateieinstellungen. Muss 0 oder eine positive Zahl sein."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "Ungültige maximale Anzahl an Benachrichtigungen pro Kanal in Teameinstellungen.  Muss eine positive Zahl sein."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Ungültige maximale Anzahl an Benutzers pro Team in Teameinstellungen.  Muss eine positive Zahl sein."
   },
@@ -4168,6 +4208,10 @@
     "translation": "Wir konnten die Kanalmitglieder nicht speichern"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "Es trat ein Fehler beim Suchen nach Kanälen auf"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "Konnte zuletzt betrachten Zeitpunkt nicht aktualisieren"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 9981b29b9..89cf6b267 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -676,18 +676,6 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
-    "id": "api.post.disabled_here",
-    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
-  },
-  {
-    "id": "api.post.disabled_all",
-    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
-  },
-  {
-    "id": "api.post.disabled_channel",
-    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
-  },
-  {
     "id": "api.context.invalid_team_url.debug",
     "translation": "TeamURL accessed when not valid. Team URL should not be used in api functions or those that are team independent"
   },
@@ -1302,6 +1290,18 @@
     "translation": "Encountered error when deleting files for post, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} file sent: {{.Filenames}}",
@@ -2696,14 +2696,6 @@
     "translation": "System Console is set to read-only when High Availability is enabled."
   },
   {
-    "id": "ent.metrics.starting.info",
-    "translation": "Metrics and profiling server is listening on %v"
-  },
-  {
-    "id": "ent.metrics.stopping.info",
-    "translation": "Metrics and profiling server is stopping on %v"
-  },
-  {
     "id": "ent.cluster.starting.info",
     "translation": "Cluster internode communication is listening on %v with hostname=%v id=%v"
   },
@@ -2796,6 +2788,14 @@
     "translation": "Invalid AD/LDAP Filter"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Error attempting to authenticate MFA token"
   },
@@ -3368,14 +3368,14 @@
     "translation": "Invalid maximum channels per team for team settings.  Must be a positive number."
   },
   {
-    "id": "model.config.is_valid.max_notify_per_channel.app_error",
-    "translation": "Invalid maximum notifications per channel for team settings.  Must be a positive number."
-  },
-  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Invalid max file size for file settings. Must be a zero or positive number."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "Invalid maximum notifications per channel for team settings.  Must be a positive number."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Invalid maximum users per team for team settings.  Must be a positive number."
   },
@@ -4080,10 +4080,6 @@
     "translation": "We couldn't get channel type counts"
   },
   {
-    "id": "store.sql_channel.search.app_error",
-    "translation": "We encountered an error searching channels"
-  },
-  {
     "id": "store.sql_channel.check_open_channel_permissions.app_error",
     "translation": "We couldn't check the permissions"
   },
@@ -4252,6 +4248,10 @@
     "translation": "We couldn't save the channel member"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "We encountered an error searching channels"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "We couldn't set the last viewed at time"
   },
diff --git a/i18n/es.json b/i18n/es.json
index dd3a0aeba..c8d366f6f 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -791,7 +791,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "No se pudo crear el emoticon. La imagen debe tener un tamaño inferior a 64 KB."
+    "translation": "No se puede crear el emoticon. La imagen debe tener un tamaño inferior a 1 MB."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -822,8 +822,20 @@
     "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 emoticon. La imagen debe tener un máximo de 128 x 128 pixels."
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "No se puede crear el emoticon. Se ha producido un error al intentar decodificar la imagen."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "No se puede crear el emoticon. Se ha producido un error al intentar codificar la imagen."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "No se puede crear el emoticon. Se ha producido un error al intentar decodificar la imagen GIF."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "No se puede crear el emoticon. Se ha producido un error al intentar codificar la imagen GIF."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "Se encontró un error al eliminar los archivos del mensaje, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all ha sido desactivado debido a que el canal tiene más de {{.Users}} usuarios."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel ha sido desactivado debido a que el canal tiene más de {{.Users}} usuarios."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here ha sido desactivado debido a que el canal tiene más de {{.Users}} usuarios."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} archivo enviado: {{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "Combinado el usuario con una cuenta existente: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "No se pudo importar el usuario: {{.Username}}\r\n"
   },
@@ -2740,6 +2768,14 @@
     "translation": "Filtro de AD/LDAP inválido"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Las métricas y los perfiles de servidor está escuchando en %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Las métricas y los perfiles de servidor se detuvieron en %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Error intentando autenticar el token MFA"
   },
@@ -3309,13 +3345,17 @@
   },
   {
     "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "Número inválido del máximo de canales por equipo en la configuración de equipo.  Debe ser un número positivo."
+    "translation": "Número máximo de canales por equipo es inválido en la configuración de equipo.  Debe ser un número positivo."
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "El tamaño máximo de archivo para la configuración de archivos es inválido. Debe ser un cero o un número positivo."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "Número máximo de notificaciones por canal es inválido en la configuración de equipo.  Debe ser un número positivo."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Número inválido del máximo de usuarios por equipo en la configuración de equipo.  Debe ser un número positivo."
   },
@@ -4168,6 +4208,10 @@
     "translation": "No pudimos guardar el miembro del canal"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "Encontramos un error buscando en los canales"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "No se pudo establecer el tiempo de la última vista"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 4e65a8598..b51a47a53 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -822,8 +822,20 @@
     "translation": "Impossible de créer l'émoticône. Le fichier doit être un PNG, JPG ou GIF."
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Impossible de créer l'émoticône. L'image doit faire au plus 128x128 pixels."
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "Une erreur s'est produite lors de la suppression des fichiers liés au message, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} fichier envoyé: {{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "L'utilisateur a été fusionné avec le compte existant: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Impossible d'importer l'utilisateur : {{.Username}}\r\n"
   },
@@ -2740,6 +2768,14 @@
     "translation": "Filtre LDAP Invalide"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Erreur tentative d'authentification MFA token"
   },
@@ -3316,6 +3352,10 @@
     "translation": "Taille de fichier max invalide pour les paramètres du fichier. Doit être zéro ou un entier positif."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "Le nombre maximum de canaux par équipe défini dans les paramètres d'équipe est invalide. Doit être un entier positif."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Nombre maximum d'utilisateurs par équipe invalide dans les paramètres d'équipes. Doit être un entier positif."
   },
@@ -4168,6 +4208,10 @@
     "translation": "Nous n'avons pas pu enregistrer le membre du canal"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "Nous avons rencontré une erreur durant la mise à jour du canal"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "Nous n'avons pas pu mettre à jour la date de dernier affichage."
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 33db3ee86..a3b1e06d4 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -822,8 +822,20 @@
     "translation": "絵文字を作成できません。ファイルはPNGまたはJPEG、GIFにしてください。"
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "絵文字を作成できません。画像は128x128ピクセル以内である必要があります。"
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "投稿のファイルを削除する際にエラーが発生しました post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} ファイル送信: {{.Filenames}}{{.Count}} ファイル送信: {{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "既に存在するユーザーとマージしました: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "ユーザーをインポートできません: {{.Username}}\r\n"
   },
@@ -2740,6 +2768,14 @@
     "translation": "不正なAD/LDAPフィルターです"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "MFAトークンを認証できません"
   },
@@ -3316,6 +3352,10 @@
     "translation": "ファイル設定の最大ファイルサイズが不正です。ゼロ以上の数を指定してください。"
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "チーム設定のチーム毎の最大チャンネル数が不正です。正の数を指定してください。"
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "チーム設定のチーム毎の最大ユーザー数が不正です。正の数を指定してください。"
   },
@@ -4168,6 +4208,10 @@
     "translation": "チャンネルのメンバーを保存できませんでした"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "チャンネルを更新する際にエラーが発生しました"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "最終閲覧日時を更新できませんでした"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 4be42dd57..347f4edc4 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -822,8 +822,20 @@
     "translation": "이모티콘을 만들 수 없습니다. PNG, JPEG, GIF 파일 이어야 합니다."
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "이모티콘을 생성할 수 없습니다. 이미지 최대크기는 128px * 128px 입니다."
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "게시글에 대한 파일을 삭제할 때 에러가 발생되었습니다, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}}개 파일 발송됨: {{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "기존 사용자 정보와 병합됩니다: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "불러올 수 없는 사용자: {{.Username}}\r\n"
   },
@@ -2740,6 +2768,14 @@
     "translation": "잘못된 AD/LDAP 필터"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Error attempting to authenticate MFA token"
   },
@@ -3316,6 +3352,10 @@
     "translation": "잘못된 파일 최대 용량 설정입니다. 0보다 큰 값이여야 합니다."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "팀 설정에 대한 잘못된 팀 당 최대 채널 값입니다. 0보다 큰 값이여야 합니다."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Invalid maximum users per team for team settings.  Must be a positive number."
   },
@@ -4168,6 +4208,10 @@
     "translation": "채널을 찾을 수 없습니다"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "We encountered an error updating the channel"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "We couldn't set the last viewed at time"
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 8adeb063a..e4c7cb832 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -822,8 +822,20 @@
     "translation": "Kon emoticon niet aanmaken. Bestand moet een PNG, JPEG of GIF zijn."
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Kon emoticon niet aanmaken. Afbeelding moet minstens 128 bij 128 pixels groot zijn."
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "Encountered error when deleting files for post, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} bestand verzonden: {{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "Samengevoegd met bestaand account: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Kan gebruiker niet importeren: {{.Username}}\r\n"
   },
@@ -2740,6 +2768,14 @@
     "translation": "Ongeldig AD/LDAP filter"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Probleem bij het authenticeren met een MFA token"
   },
@@ -3316,6 +3352,10 @@
     "translation": "Ongeldige maximale bestandsgrootte voor bestands-instellingen. Moet nul of groter zijn."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "Ongeldig maximaal aantal gebruikers per team bij team instellingen. Moet een getal groter dan 0 zijn."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Ongeldig maximaal aantal gebruikers per team bij team instellingen. Moet een getal groter dan 0 zijn."
   },
@@ -4168,6 +4208,10 @@
     "translation": "Het kanaal lid kan niet opgeslagen worden"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "Er is een fout opgetreden tijdens het bijwerken van het kanaal"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "De laatst bekeken tijd kon niet worden bijgewerkt"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 27d060b36..0c7f0711b 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -791,7 +791,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Não foi possível criar o emoji. A imagem tem que ser menor que 64 KB em tamanho."
+    "translation": "Não foi possível criar o emoji. A imagem tem que ser menor que 1 MB em tamanho."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -822,8 +822,20 @@
     "translation": "Não foi possível criar o emoji. Arquivo precisa ser um PNG, JPEG ou GIF."
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Não foi possível criar o emoji. A imagem deve ser, no máximo 128 por 128 pixels."
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Não foi possível criar o emoji. Um error ocorreu enquanto tentava decodificar a imagem."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Não foi possível criar o emoji. Um erro ocorreu enquanto tentava codificar a imagem."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Não foi possível criar o emoji. Um erro ocorreu enquanto tentava decodificar uma imagem GIF."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Não foi possível criar o emoji. Um erro ocorreu enquanto tentava codificar uma imagem GIF."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "Erro encontrado ao deletar arquivos para postar, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all foi desabilitado devido ao canal ter mais de {{.Users}} usuários."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel foi desabilitado devido ao canal ter mais de {{.Users}} usuários."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here foi desabilitado devido ao canal ter mais de {{.Users}} usuários."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} arquivo enviado: {{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "Mesclado usuário com conta existente: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Não foi possível importar o usuário: {{.Username}}\r\n"
   },
@@ -2740,6 +2768,14 @@
     "translation": "Filtro AD/LDAP Inválido"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Servidor de métricas e profiling está escutando na porta %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Servidor de métricas e profiling está parando na porta %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Erro ao tentar autenticar o token MFA"
   },
@@ -3316,6 +3352,10 @@
     "translation": "Tamanho máximo do arquivo inválido nas configurações de arquivo. Deve ser zero ou um número positivo."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "Número inválido para máximo de notificações por canal para a configuração da equipe.  Deve ser um número positivo."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Inválido máximo de usuários por equipe em configurações de equipe.  Deve ser um número positivo."
   },
@@ -4168,6 +4208,10 @@
     "translation": "Não foi possível salvar o membro do canal"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "Encontramos um erro ao procurar pelos canais"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "Não foi possível atualizar a última visualização no tempo"
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index c98f11f89..f9b03d9ea 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -441,11 +441,11 @@
   },
   {
     "id": "api.command.team_mismatch.app_error",
-    "translation": "Cannot update commands across teams"
+    "translation": "Невозможно обновить команды через команды"
   },
   {
     "id": "api.command.update.app_error",
-    "translation": "Несоответствующие права для команды удаления"
+    "translation": "Несоответствующие права для обновления команды"
   },
   {
     "id": "api.command_away.desc",
@@ -791,7 +791,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Не удалось создать смайлик. Размер изображения должен быть меньше 64KB."
+    "translation": "Невозможно создать смайлик. Изображение должно быть не более 1 Мб."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -822,8 +822,20 @@
     "translation": "Не удалось создать эмодзи. Должен быть PNG, JPEG или GIF файл."
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Не удалось создать эмодзи. Изображение должно быть не больше 128 на 128 пикселей."
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Невозможно создать смайлик. Произошла ошибка при декодировании изображения."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Невозможно создать смайлик. Произошла ошибка при кодировании изображения."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Невозможно создать смайлик. Произошла ошибка при декодировании GIF изображения."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Невозможно создать смайлик. Произошла ошибка при кодирования GIF изображения."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -991,7 +1003,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
+    "translation": "Размер файла превышает максимальный размер и не может быть загружен: {{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "Возникла ошибка при удалении файлов из сообщения, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel был отключен, поскольку количество пользователей превышает {{.Users}}."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} файл отправлен: {{.Filenames}}{{.Count}} файлов отправлено: {{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "Пользователь был слит с существующей учетной записью: {{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Невозможно импортировать пользователя: {{.Username}}\r\n"
   },
@@ -1693,7 +1721,7 @@
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинное имя. Оно будет укорочено при импорте."
+    "translation": "Менеджер импорта Slack: Канал {{.ChannelName}} имеет слишком длинное описание. Оно будет укорочено при импорте."
   },
   {
     "id": "api.status.init.debug",
@@ -2681,7 +2709,7 @@
   },
   {
     "id": "ent.ldap.create_fail",
-    "translation": "Unable to create LDAP user."
+    "translation": "Невозможно создать пользователя LDAP."
   },
   {
     "id": "ent.ldap.disabled.app_error",
@@ -2740,6 +2768,14 @@
     "translation": "Неверный фильтр AD/LDAP"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "Ошибка при попытке аутентификации маркера MFA"
   },
@@ -3316,6 +3352,10 @@
     "translation": "Неверный максимальный размер файла в настройках файлов. Число должно быть неотрицательным."
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "Неверное максимальное количество пользователей на команду. Число должно быть положительным."
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "Неверное максимальное количество пользователей на команду в настройках команд. Число должно быть положительным."
   },
@@ -4168,6 +4208,10 @@
     "translation": "Не удалось сохранить участника канала"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "Возникла проблема при поиске канала"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "Не удалось установить время последнего просмотра на"
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 0a40d528e..29d6596bc 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -822,8 +822,20 @@
     "translation": "无法创建表情符号。文件类型必须是PNG，JPEG，或GIF。"
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "无法创建表情符。图片长宽不能超过128像素。"
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "删除信息的文件时遇到错误, post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "{{.Count}} 文件已发送：{{.Filenames}}{{.Count}} 文件已发送：{{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "合并用户到现有帐号：{{.Email}}, {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "不能导入用户: {{.Username}}\r\n"
   },
@@ -2740,6 +2768,14 @@
     "translation": "无效的 AD/LDAP 筛选器"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "尝试验证多重验证令牌时出现错误"
   },
@@ -3316,6 +3352,10 @@
     "translation": "文件设置中最大大小无效。必须是0或者正整数。"
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "团队设置中频道最大用户数无效，必须是正整数。"
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "团队设置中每团队的最大用户数无效。必须是正整数。"
   },
@@ -4168,6 +4208,10 @@
     "translation": "我们无法保存这个频道成员"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "我们无法更新这个频道"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "我们不能更新最后查看时间"
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 8652c1f6e..2099aa6ee 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -441,7 +441,7 @@
   },
   {
     "id": "api.command.team_mismatch.app_error",
-    "translation": "Cannot update commands across teams"
+    "translation": "無法更新不同團隊的指令"
   },
   {
     "id": "api.command.update.app_error",
@@ -637,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCTRL+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCTRL+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n#[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCTRL+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCTRL+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n~[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n#[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n~[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -791,7 +791,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "無法建立繪文字。圖片必須小於64KB。"
+    "translation": "無法建立繪文字。圖片必須小於1 MB。"
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -822,8 +822,20 @@
     "translation": "無法新增繪文字。檔案必須是PNG、JPEG或GIF。"
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "無法建立繪文字。圖片長寬皆須小於等於128像素。"
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "無法建立繪文字。嘗試解碼圖片時發生錯誤。"
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "無法建立繪文字。嘗試編碼圖片時發生錯誤。"
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "無法建立繪文字。嘗試解碼 gif 圖片時發生錯誤。"
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "無法建立繪文字。嘗試編碼 gif 圖片時發生錯誤。"
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -991,7 +1003,7 @@
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}"
+    "translation": "無法上傳超過最大尺寸的檔案：{{.Filename}}"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
@@ -1274,6 +1286,18 @@
     "translation": "刪除文章的檔案時遭遇錯誤：post_id=%v, err=%v"
   },
   {
+    "id": "api.post.disabled_all",
+    "translation": "由於頻道使用者超過 {{.Users}} 人，已停用@all。"
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "由於頻道使用者超過 {{.Users}} 人，已停用@channel。"
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "由於頻道使用者超過 {{.Users}} 人，已停用@here。"
+  },
+  {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
       "one": "已送出 {{.Count}} 個檔案：{{.Filenames}}已送出 {{.Count}} 個檔案：{{.Filenames}}",
@@ -1620,6 +1644,10 @@
     "translation": "將使用者與現有帳號合併：{{.Email}}，{{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "無法匯入使用者： {{.Username}}\r\n"
   },
@@ -2681,7 +2709,7 @@
   },
   {
     "id": "ent.ldap.create_fail",
-    "translation": "Unable to create LDAP user."
+    "translation": "無法建立 LDAP 使用者。"
   },
   {
     "id": "ent.ldap.disabled.app_error",
@@ -2740,6 +2768,14 @@
     "translation": "無效的 AD/LDAP Filter"
   },
   {
+    "id": "ent.metrics.starting.info",
+    "translation": "計量與分析伺服器正在 %v 上監聽"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "%v 上的計量與分析伺服器正在停止"
+  },
+  {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "嘗試認證多重要素驗證 Token 時遇到錯誤"
   },
@@ -3316,6 +3352,10 @@
     "translation": "檔案設定中的最大大小無效。必須為0或者正數。"
   },
   {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "團隊設定中的單一團隊最高通知數無效。必須為正數。"
+  },
+  {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "團隊設定中的單一團隊最高使用者數無效。必須為正數。"
   },
@@ -4168,6 +4208,10 @@
     "translation": "無法儲存頻道成員"
   },
   {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "搜尋頻道時遇到錯誤"
+  },
+  {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "無法更新最後瀏覽時間"
   },