daily translations 20160614 (#3340)

6 files changed, 663 insertions, 103 deletions

diff --git a/i18n/de.json b/i18n/de.json
index ac58b9740..c18908f83 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -572,6 +572,54 @@
     "translation": "Ein unbekannter Fehler ist aufgetreten. Bitte kontaktieren Sie den Support."
   },
   {
+    "id": "api.emoji.create.duplicate.app_error",
+    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+  },
+  {
+    "id": "api.emoji.create.parse.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum file size."
+  },
+  {
+    "id": "api.emoji.create.permissions.app_error",
+    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+  },
+  {
+    "id": "api.emoji.create.too_large.app_error",
+    "translation": "Unable to create emoji. Could not understand request."
+  },
+  {
+    "id": "api.emoji.delete.permissions.app_error",
+    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+  },
+  {
+    "id": "api.emoji.disabled.app_error",
+    "translation": "Befehle wurden durch den Systemadministrator deaktiviert."
+  },
+  {
+    "id": "api.emoji.get_image.decode.app_error",
+    "translation": "Unable to decode image file for emoji."
+  },
+  {
+    "id": "api.emoji.get_image.read.app_error",
+    "translation": "Unable to read image file for emoji."
+  },
+  {
+    "id": "api.emoji.init.debug",
+    "translation": "Initialisieren Datei-Api-Routen"
+  },
+  {
+    "id": "api.emoji.storage.app_error",
+    "translation": "Dateispeicher wurde nicht vollständig konfiguriert. Bitte konfigurieren Sie diesen entweder für S3 oder einen lokalen Server mit Dateispeicher."
+  },
+  {
+    "id": "api.emoji.upload.image.app_error",
+    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+  },
+  {
+    "id": "api.emoji.upload.large_image.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+  },
+  {
     "id": "api.export.json.app_error",
     "translation": "Konvertierung zu json nicht möglich"
   },
@@ -1561,7 +1609,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "Es ist bereits ein Benutzer mit Ihrem {{.Service}} Account verbunden"
+    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -1952,6 +2000,14 @@
     "translation": "Ausgehende webhooks wurden vom System Administrator deaktiviert."
   },
   {
+    "id": "api.webhook.incoming.debug",
+    "translation": "Eingehender Webhook erhalten. Inhalt="
+  },
+  {
+    "id": "api.webhook.incoming.debug.error",
+    "translation": "Konnte Payload des eingehenden Webhooks nicht verarbeiten."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Initialisieren webhook-Api-Routen"
   },
@@ -2312,6 +2368,18 @@
     "translation": "Beim Verbinden mit dem Server ist ein Fehler aufgetreten"
   },
   {
+    "id": "model.client.create_emoji.emoji.app_error",
+    "translation": "Unable to attach emoji data to request"
+  },
+  {
+    "id": "model.client.create_emoji.image.app_error",
+    "translation": "Unable to attach image to request"
+  },
+  {
+    "id": "model.client.create_emoji.writer.app_error",
+    "translation": "Unable to write request"
+  },
+  {
     "id": "model.client.login.app_error",
     "translation": "Authentifizierungstoken stimmten nicht überein"
   },
@@ -2488,6 +2556,26 @@
     "translation": "Ungültige maximale Anzahl an offenen Verbindungen in SQL Einstellungen.  Muss eine positive Zahl sein."
   },
   {
+    "id": "model.emoji.create_at.app_error",
+    "translation": "Erstellt am muss eine gültige Zeit sein"
+  },
+  {
+    "id": "model.emoji.creator_id.app_error",
+    "translation": "Ungültige Ersteller ID"
+  },
+  {
+    "id": "model.emoji.id.app_error",
+    "translation": "Ungültige root ID"
+  },
+  {
+    "id": "model.emoji.name.app_error",
+    "translation": "Name muss 2 oder mehr Kleinbuchstaben haben"
+  },
+  {
+    "id": "model.emoji.update_at.app_error",
+    "translation": "Aktualisier am muss eine gültige Zeit sein"
+  },
+  {
     "id": "model.file_info.get.gif.app_error",
     "translation": "Konnte GIF nicht dekodieren."
   },
@@ -3184,6 +3272,30 @@
     "translation": "Beim Speichern des Compliance-Berichtes wurde ein Fehler festgestellt"
   },
   {
+    "id": "store.sql_emoji.delete.app_error",
+    "translation": "Wir konnten die Nachricht nicht löschen"
+  },
+  {
+    "id": "store.sql_emoji.delete.no_results",
+    "translation": "We couldn’t find the emoji to delete"
+  },
+  {
+    "id": "store.sql_emoji.get.app_error",
+    "translation": "Wir konnten die Nachricht nicht finden"
+  },
+  {
+    "id": "store.sql_emoji.get_all.app_error",
+    "translation": "Wir konnten die Nachricht nicht finden"
+  },
+  {
+    "id": "store.sql_emoji.get_by_name.app_error",
+    "translation": "Wir konnten die Nachricht nicht finden"
+  },
+  {
+    "id": "store.sql_emoji.save.app_error",
+    "translation": "Wir konnten die Nachricht nicht speichern"
+  },
+  {
     "id": "store.sql_license.get.app_error",
     "translation": "Wir konnten die Lizenz nicht finden"
   },
diff --git a/i18n/en.json b/i18n/en.json
index f83474030..337678d82 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,10 +48,6 @@
     "translation": "September"
   },
   {
-    "id": "system.message.name",
-    "translation": "System"
-  },
-  {
     "id": "api.admin.file_read_error",
     "translation": "Error reading log file"
   },
@@ -68,26 +64,26 @@
     "translation": "Initializing admin api routes"
   },
   {
-    "id": "api.admin.recycle_db_start.warn",
-    "translation": "Attempting to recycle the database connection"
-  },
-  {
     "id": "api.admin.recycle_db_end.warn",
     "translation": "Finished recycling the database connection"
   },
   {
-    "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>It appears your Mattermost email is setup correctly!"
+    "id": "api.admin.recycle_db_start.warn",
+    "translation": "Attempting to recycle the database connection"
   },
   {
-    "id": "api.admin.test_email.subject",
-    "translation": "Mattermost - Testing Email Settings"
+    "id": "api.admin.test_email.body",
+    "translation": "<br/><br/><br/>It appears your Mattermost email is setup correctly!"
   },
   {
     "id": "api.admin.test_email.missing_server",
     "translation": "SMTP Server is required"
   },
   {
+    "id": "api.admin.test_email.subject",
+    "translation": "Mattermost - Testing Email Settings"
+  },
+  {
     "id": "api.admin.upload_brand_image.array.app_error",
     "translation": "Empty array under 'image' in request"
   },
@@ -304,10 +300,6 @@
     "translation": "Integrations have been limited to admins only."
   },
   {
-    "id": "api.command.duplicate_trigger.app_error",
-    "translation": "This trigger word is already in use. Please choose another word."
-  },
-  {
     "id": "api.command.delete.app_error",
     "translation": "Inappropriate permissions to delete command"
   },
@@ -316,6 +308,10 @@
     "translation": "Commands have been disabled by the system admin."
   },
   {
+    "id": "api.command.duplicate_trigger.app_error",
+    "translation": "This trigger word is already in use. Please choose another word."
+  },
+  {
     "id": "api.command.execute_command.debug",
     "translation": "Executing cmd=%v userId=%v"
   },
@@ -344,6 +340,10 @@
     "translation": "No command trigger found"
   },
   {
+    "id": "api.command.init.debug",
+    "translation": "Initializing command api routes"
+  },
+  {
     "id": "api.command.invite_people.desc",
     "translation": "Send an email invite to your Mattermost team"
   },
@@ -372,14 +372,18 @@
     "translation": "Email invite(s) sent"
   },
   {
-    "id": "api.command.init.debug",
-    "translation": "Initializing command api routes"
-  },
-  {
     "id": "api.command.regen.app_error",
     "translation": "Inappropriate permissions to regenerate command token"
   },
   {
+    "id": "api.command_collapse.desc",
+    "translation": "Turn on auto-collapsing of image previews"
+  },
+  {
+    "id": "api.command_collapse.name",
+    "translation": "collapse"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "Unable to create /echo post, err=%v"
   },
@@ -404,26 +408,18 @@
     "translation": "echo"
   },
   {
-    "id": "api.command_collapse.desc",
-    "translation": "Turn on auto-collapsing of image previews"
-  },
-  {
-    "id": "api.command_collapse.name",
-    "translation": "collapse"
-  },
-  {
     "id": "api.command_expand.desc",
     "translation": "Turn off auto-collapsing of image previews"
   },
   {
-    "id": "api.command_expand_collapse.fail.app_error",
-    "translation": "An error occured while expanding previews"
-  },
-  {
     "id": "api.command_expand.name",
     "translation": "expand"
   },
   {
+    "id": "api.command_expand_collapse.fail.app_error",
+    "translation": "An error occured while expanding previews"
+  },
+  {
     "id": "api.command_join.desc",
     "translation": "Join the open channel"
   },
@@ -512,28 +508,28 @@
     "translation": "Messaged user."
   },
   {
-    "id": "api.command_shrug.desc",
-    "translation": "Adds ¯\\_(ツ)_/¯ to your message"
+    "id": "api.command_shortcuts.desc",
+    "translation": "Displays a list of keyboard shortcuts"
   },
   {
-    "id": "api.command_shrug.hint",
-    "translation": "[message]"
+    "id": "api.command_shortcuts.list",
+    "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/CMD+K: Open a quick channel switcher dialog\nCTRL/CMD+SHIFT+A: Open account settings\nCTRL/CMD+SHIFT+M: Open recent mentions\n\n#### Files\n\nCTRL/CMD+U: Upload file(s)\n\n#### Messages\n\nCTRL/CMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL/CMD+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#### Built-in Browser Commands\n\nALT+LEFT/CMD+[: Previous channel in your history\nALT+RIGHT/CMD+]: Next channel in your history\nCTRL/CMD+PLUS: Increase font size (zoom in)\nCTRL/CMD+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_shrug.name",
-    "translation": "shrug"
+    "id": "api.command_shortcuts.name",
+    "translation": "shortcuts"
   },
   {
-    "id": "api.command_shortcuts.desc",
-    "translation": "Displays a list of keyboard shortcuts"
+    "id": "api.command_shrug.desc",
+    "translation": "Adds ¯\\_(ツ)_/¯ to your message"
   },
   {
-    "id": "api.command_shortcuts.name",
-    "translation": "shortcuts"
+    "id": "api.command_shrug.hint",
+    "translation": "[message]"
   },
   {
-    "id": "api.command_shortcuts.list",
-    "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/CMD+K: Open a quick channel switcher dialog\nCTRL/CMD+SHIFT+A: Open account settings\nCTRL/CMD+SHIFT+M: Open recent mentions\n\n#### Files\n\nCTRL/CMD+U: Upload file(s)\n\n#### Messages\n\nCTRL/CMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL/CMD+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#### Built-in Browser Commands\n\nALT+LEFT/CMD+[: Previous channel in your history\nALT+RIGHT/CMD+]: Next channel in your history\nCTRL/CMD+PLUS: Increase font size (zoom in)\nCTRL/CMD+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_shrug.name",
+    "translation": "shrug"
   },
   {
     "id": "api.context.404.app_error",
@@ -612,6 +608,10 @@
     "translation": "Unable to read image file for emoji."
   },
   {
+    "id": "api.emoji.init.debug",
+    "translation": "Initializing emoji api routes"
+  },
+  {
     "id": "api.emoji.storage.app_error",
     "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
   },
@@ -624,10 +624,6 @@
     "translation": "Unable to create emoji. Image exceeds maximum dimensions."
   },
   {
-    "id": "api.emoji.init.debug",
-    "translation": "Initializing emoji api routes"
-  },
-  {
     "id": "api.export.json.app_error",
     "translation": "Unable to convert to json"
   },
@@ -1024,22 +1020,22 @@
     "translation": "New Direct Message"
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " mentioned you in "
-  },
-  {
     "id": "api.post.send_notifications_and_forget.push_in",
     "translation": " in "
   },
   {
-    "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " posted in "
+    "id": "api.post.send_notifications_and_forget.push_mention",
+    "translation": " mentioned you in "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
     "translation": " sent you a direct message"
   },
   {
+    "id": "api.post.send_notifications_and_forget.push_non_mention",
+    "translation": " posted in "
+  },
+  {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
     "translation": "Sending push notification to %v wi msg of '%v'"
   },
@@ -1348,18 +1344,6 @@
     "translation": "Your email address has changed for {{.TeamDisplayName}}"
   },
   {
-    "id": "api.templates.username_change_body.info",
-    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}.<br>If you did not make this change, please contact the system administrator."
-  },
-  {
-    "id": "api.templates.username_change_body.title",
-    "translation": "You updated your username"
-  },
-  {
-    "id": "api.templates.username_change_subject",
-    "translation": "Your username has changed for {{.TeamDisplayName}}"
-  },
-  {
     "id": "api.templates.email_change_verify_body.button",
     "translation": "Verify Email"
   },
@@ -1508,6 +1492,18 @@
     "translation": "[MATTERMOST] Changes to your account for Mattermost 3.0 Upgrade"
   },
   {
+    "id": "api.templates.username_change_body.info",
+    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}.<br>If you did not make this change, please contact the system administrator."
+  },
+  {
+    "id": "api.templates.username_change_body.title",
+    "translation": "You updated your username"
+  },
+  {
+    "id": "api.templates.username_change_subject",
+    "translation": "Your username has changed for {{.TeamDisplayName}}"
+  },
+  {
     "id": "api.templates.verify_body.button",
     "translation": "Verify Email"
   },
@@ -1548,6 +1544,10 @@
     "translation": "You joined {{ .TeamDisplayName }}"
   },
   {
+    "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
+    "translation": "MFA is not available for this account type"
+  },
+  {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
     "translation": "Failed to add direct channel preferences for user user_id=%s, team_id=%s, err=%v"
   },
@@ -1840,10 +1840,6 @@
     "translation": "MFA not configured or available on this server"
   },
   {
-    "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
-    "translation": "MFA is not available for this account type"
-  },
-  {
     "id": "api.user.update_password.context.app_error",
     "translation": "Update password failed because context user_id did not match props user_id"
   },
@@ -2108,16 +2104,16 @@
     "translation": "User not registered on LDAP server"
   },
   {
-    "id": "ent.ldap.validate_filter.app_error",
-    "translation": "Invalid LDAP Filter"
+    "id": "ent.ldap.syncdone.info",
+    "translation": "LDAP Synchronization completed"
   },
   {
     "id": "ent.ldap.syncronize.get_all.app_error",
     "translation": "Unable to get all users using LDAP"
   },
   {
-    "id": "ent.ldap.syncdone.info",
-    "translation": "LDAP Synchronization completed"
+    "id": "ent.ldap.validate_filter.app_error",
+    "translation": "Invalid LDAP Filter"
   },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
@@ -2528,6 +2524,10 @@
     "translation": "Invalid maximum login attempts for service 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_users.app_error",
     "translation": "Invalid maximum users per team for team settings.  Must be a positive number."
   },
@@ -2556,10 +2556,6 @@
     "translation": "Invalid maximum idle connection for SQL 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.sql_max_conn.app_error",
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
@@ -3292,11 +3288,11 @@
     "translation": "We couldn't get the emoji"
   },
   {
-    "id": "store.sql_emoji.get_by_name.app_error",
+    "id": "store.sql_emoji.get_all.app_error",
     "translation": "We couldn't get the emoji"
   },
   {
-    "id": "store.sql_emoji.get_all.app_error",
+    "id": "store.sql_emoji.get_by_name.app_error",
     "translation": "We couldn't get the emoji"
   },
   {
@@ -3632,14 +3628,14 @@
     "translation": "We couldn't find the existing team"
   },
   {
-    "id": "store.sql_team.get_member.missing.app_error",
-    "translation": "No team member found for that user id and team id"
-  },
-  {
     "id": "store.sql_team.get_member.app_error",
     "translation": "We couldn't get the team member"
   },
   {
+    "id": "store.sql_team.get_member.missing.app_error",
+    "translation": "No team member found for that user id and team id"
+  },
+  {
     "id": "store.sql_team.get_members.app_error",
     "translation": "We couldn't get the team members"
   },
@@ -3704,6 +3700,10 @@
     "translation": "We encountered an error finding the account"
   },
   {
+    "id": "store.sql_user.get_all_using_auth_service.other.app_error",
+    "translation": "We encountered an error trying to find all the accounts using a specific authentication type."
+  },
+  {
     "id": "store.sql_user.get_by_auth.missing_account.app_error",
     "translation": "We couldn't find an existing account matching your authentication type for this team. This team may require an invite from the team owner to join."
   },
@@ -3712,10 +3712,6 @@
     "translation": "We encountered an error trying to find the account by authentication type."
   },
   {
-    "id": "store.sql_user.get_all_using_auth_service.other.app_error",
-    "translation": "We encountered an error trying to find all the accounts using a specific authentication type."
-  },
-  {
     "id": "store.sql_user.get_by_username.app_error",
     "translation": "We couldn't find an existing account matching your username for this team. This team may require an invite from the team owner to join."
   },
@@ -3924,6 +3920,10 @@
     "translation": "We couldn't update the webhook"
   },
   {
+    "id": "system.message.name",
+    "translation": "System"
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Error decoding config file={{.Filename}}, err={{.Error}}"
   },
diff --git a/i18n/es.json b/i18n/es.json
index e6d393acf..a3df51c6f 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -572,6 +572,54 @@
     "translation": "Ocurrió un error inesperado. Por favor contacta a soporte."
   },
   {
+    "id": "api.emoji.create.duplicate.app_error",
+    "translation": "No se puede crear el emoji. Ya existe otro emoji con el mismo nombre."
+  },
+  {
+    "id": "api.emoji.create.parse.app_error",
+    "translation": "No se puede crear el emoji. La imagen supera el máximo de tamaño de archivo."
+  },
+  {
+    "id": "api.emoji.create.permissions.app_error",
+    "translation": "Permisos inapropiados para crear el emoji."
+  },
+  {
+    "id": "api.emoji.create.too_large.app_error",
+    "translation": "No se puede crear el emoji. No se comprendió la solicitud."
+  },
+  {
+    "id": "api.emoji.delete.permissions.app_error",
+    "translation": "Permisos inapropiados para eliminar el emoji."
+  },
+  {
+    "id": "api.emoji.disabled.app_error",
+    "translation": "Los emojis 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."
+  },
+  {
+    "id": "api.emoji.get_image.read.app_error",
+    "translation": "No se puede leer el archivo de imagen para emoji."
+  },
+  {
+    "id": "api.emoji.init.debug",
+    "translation": "Inicializando rutas del API para los emoji"
+  },
+  {
+    "id": "api.emoji.storage.app_error",
+    "translation": "No ha sido configurado apropiadamente el almacenamiento. Por favor configuralo para utilizar ya sea S3 o almacenamiento local."
+  },
+  {
+    "id": "api.emoji.upload.image.app_error",
+    "translation": "No se puede crear el emoji. El archivo debe ser un archivo PNG, JPEG o GIF."
+  },
+  {
+    "id": "api.emoji.upload.large_image.app_error",
+    "translation": "No se puede crear el emoji. Imagen supera las dimensiones máximas."
+  },
+  {
     "id": "api.export.json.app_error",
     "translation": "No se puede convertir a JSON"
   },
@@ -1561,7 +1609,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "Ya existe un usuario vinculado con tu cuenta de {{.Service}}"
+    "translation": "Ya existe una cuenta asociada a esa dirección de correo electrónico utilizando un método de inicio de sesión diferente a {{.Servicio}}. Por favor inicia sesión utilizando {{.Auth}}."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -1952,6 +2000,14 @@
     "translation": "Webhooks de Salida han sido deshabilitados por el administrador del sistema."
   },
   {
+    "id": "api.webhook.incoming.debug",
+    "translation": "Recibido webhook de entrada. Contenido="
+  },
+  {
+    "id": "api.webhook.incoming.debug.error",
+    "translation": "No se pudo leer la carga del webhook de entrada."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Inicializando rutas del API para los Webhooks"
   },
@@ -2312,6 +2368,18 @@
     "translation": "Encontramos un error mientras conectabamos al servidor"
   },
   {
+    "id": "model.client.create_emoji.emoji.app_error",
+    "translation": "No se puede asociar datos del emoji a la solicitud"
+  },
+  {
+    "id": "model.client.create_emoji.image.app_error",
+    "translation": "No se puede asociar la imagen a la solicitud"
+  },
+  {
+    "id": "model.client.create_emoji.writer.app_error",
+    "translation": "No se puede escribir la solicitud"
+  },
+  {
     "id": "model.client.login.app_error",
     "translation": "Token de autenticación no coincidió"
   },
@@ -2488,6 +2556,26 @@
     "translation": "Inválida cantidad de conexiones abiertas para la configuración de SQL.  Debe ser un número positivo."
   },
   {
+    "id": "model.emoji.create_at.app_error",
+    "translation": "Create debe ser un tiempo válido"
+  },
+  {
+    "id": "model.emoji.creator_id.app_error",
+    "translation": "Id del creador inválido"
+  },
+  {
+    "id": "model.emoji.id.app_error",
+    "translation": "Id del emoji no es válido"
+  },
+  {
+    "id": "model.emoji.name.app_error",
+    "translation": "Debe tener de 1 hasta 64 caracteres alfanuméricos en minúscula"
+  },
+  {
+    "id": "model.emoji.update_at.app_error",
+    "translation": "Update debe ser un tiempo válido"
+  },
+  {
     "id": "model.file_info.get.gif.app_error",
     "translation": "No se pudo decodificar el gif."
   },
@@ -3184,6 +3272,30 @@
     "translation": "Se ha detectado un error al guardar el informe de cumplimiento"
   },
   {
+    "id": "store.sql_emoji.delete.app_error",
+    "translation": "No pudimos eliminar el emoji"
+  },
+  {
+    "id": "store.sql_emoji.delete.no_results",
+    "translation": "No pudimos encontrar el emoji a eliminar"
+  },
+  {
+    "id": "store.sql_emoji.get.app_error",
+    "translation": "No pudimos obtener el emoji"
+  },
+  {
+    "id": "store.sql_emoji.get_all.app_error",
+    "translation": "No pudimos obtener el emoji"
+  },
+  {
+    "id": "store.sql_emoji.get_by_name.app_error",
+    "translation": "No pudimos obtener el emoji"
+  },
+  {
+    "id": "store.sql_emoji.save.app_error",
+    "translation": "No pudimos guardar el emoji"
+  },
+  {
     "id": "store.sql_license.get.app_error",
     "translation": "Encontramos un error al obtener la licencia"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 56374ad77..0cae56cd1 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -349,19 +349,19 @@
   },
   {
     "id": "api.command.invite_people.fail",
-    "translation": "Encountered an error sending email invite(s)"
+    "translation": "Un problème s'est produit à l'envoi du courriel d'invitation"
   },
   {
     "id": "api.command.invite_people.hint",
-    "translation": "[name@domain.com ...]"
+    "translation": "[nom@domaine.com…]"
   },
   {
     "id": "api.command.invite_people.name",
-    "translation": "invite_people"
+    "translation": "inviter_personne"
   },
   {
     "id": "api.command.invite_people.no_email",
-    "translation": "Please specify one or more valid email addresses"
+    "translation": "Veuillez fournir au moins une adresse mail valide"
   },
   {
     "id": "api.command.invite_people.sent",
@@ -373,11 +373,11 @@
   },
   {
     "id": "api.command_collapse.desc",
-    "translation": "Turn on auto-collapsing of image previews"
+    "translation": "Activer la réduction automatique des aperçus d'images"
   },
   {
     "id": "api.command_collapse.name",
-    "translation": "collapse"
+    "translation": "réduire"
   },
   {
     "id": "api.command_echo.create.app_error",
@@ -405,7 +405,7 @@
   },
   {
     "id": "api.command_expand.desc",
-    "translation": "Turn off auto-collapsing of image previews"
+    "translation": "Désactiver la réduction automatique des aperçus d'images"
   },
   {
     "id": "api.command_expand.name",
@@ -413,7 +413,7 @@
   },
   {
     "id": "api.command_expand_collapse.fail.app_error",
-    "translation": "An error occured while expanding previews"
+    "translation": "Une erreur est survenue lors de l'expansion des aperçus"
   },
   {
     "id": "api.command_join.desc",
@@ -572,6 +572,54 @@
     "translation": "Une erreur inconnue est survenue. Veuillez contacter le support."
   },
   {
+    "id": "api.emoji.create.duplicate.app_error",
+    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+  },
+  {
+    "id": "api.emoji.create.parse.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum file size."
+  },
+  {
+    "id": "api.emoji.create.permissions.app_error",
+    "translation": "Droits insuffisants pour supprimer la commande"
+  },
+  {
+    "id": "api.emoji.create.too_large.app_error",
+    "translation": "Unable to create emoji. Could not understand request."
+  },
+  {
+    "id": "api.emoji.delete.permissions.app_error",
+    "translation": "Droits insuffisants pour supprimer la commande"
+  },
+  {
+    "id": "api.emoji.disabled.app_error",
+    "translation": "Les commandes ont été désactivées par l'administrateur."
+  },
+  {
+    "id": "api.emoji.get_image.decode.app_error",
+    "translation": "Unable to decode image file for emoji."
+  },
+  {
+    "id": "api.emoji.get_image.read.app_error",
+    "translation": "Unable to read image file for emoji."
+  },
+  {
+    "id": "api.emoji.init.debug",
+    "translation": "Initialisation des routes de l'api des messages"
+  },
+  {
+    "id": "api.emoji.storage.app_error",
+    "translation": "Le stockage de fichier n'est pas configuré correctement. Veuillez le paramétrer soit pour utiliser S3 soit le système de fichier local du serveur."
+  },
+  {
+    "id": "api.emoji.upload.image.app_error",
+    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+  },
+  {
+    "id": "api.emoji.upload.large_image.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+  },
+  {
     "id": "api.export.json.app_error",
     "translation": "Impossible de convertir en json"
   },
@@ -1493,7 +1541,7 @@
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
-    "translation": "MFA is not available for this account type"
+    "translation": "Le MFA n'est pas disponible pour ce type de compte"
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
@@ -1561,7 +1609,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "Un utilisateur existant est déjà connecté à votre {{.Service}} compte"
+    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -1913,7 +1961,7 @@
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "Outgoing webhooks from the same channel cannot have the same trigger words/callback URLs."
+    "translation": "Les webhooks sortants d'un même canal ne peuvent pas avoir les mêmes mots de déclenchement/URLs de rappel."
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
@@ -1952,6 +2000,14 @@
     "translation": "Les webhooks sortants ont été désactivés par l'administrateur système."
   },
   {
+    "id": "api.webhook.incoming.debug",
+    "translation": "Incoming webhook received. Content="
+  },
+  {
+    "id": "api.webhook.incoming.debug.error",
+    "translation": "Could not read payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Initialisation des routes de l'api webhook"
   },
@@ -2312,6 +2368,18 @@
     "translation": "Une erreur est survenue durant la connexion au serveur"
   },
   {
+    "id": "model.client.create_emoji.emoji.app_error",
+    "translation": "Unable to attach emoji data to request"
+  },
+  {
+    "id": "model.client.create_emoji.image.app_error",
+    "translation": "Unable to attach image to request"
+  },
+  {
+    "id": "model.client.create_emoji.writer.app_error",
+    "translation": "Unable to write request"
+  },
+  {
     "id": "model.client.login.app_error",
     "translation": "Les jetons d’authentification ne correspondent pas"
   },
@@ -2488,6 +2556,26 @@
     "translation": "Nombre maximum de connexions ouvertes invalide dans les paramètres SQL. Doit être un entier positif."
   },
   {
+    "id": "model.emoji.create_at.app_error",
+    "translation": "La date de création doit être une date valide"
+  },
+  {
+    "id": "model.emoji.creator_id.app_error",
+    "translation": "Id créateur invalide"
+  },
+  {
+    "id": "model.emoji.id.app_error",
+    "translation": "Id racine invalide"
+  },
+  {
+    "id": "model.emoji.name.app_error",
+    "translation": "Le nom doit être composé d'au moins 2 caractères alphanumériques en minuscules."
+  },
+  {
+    "id": "model.emoji.update_at.app_error",
+    "translation": "La date de mise à jour doit être une date valide"
+  },
+  {
     "id": "model.file_info.get.gif.app_error",
     "translation": "Impossible de décoder le gif."
   },
@@ -3184,6 +3272,30 @@
     "translation": "Nous avons rencontré une erreur durant l'enregistrement du rapport de conformité"
   },
   {
+    "id": "store.sql_emoji.delete.app_error",
+    "translation": "Nous n'avons pas pu supprimer le message"
+  },
+  {
+    "id": "store.sql_emoji.delete.no_results",
+    "translation": "We couldn’t find the emoji to delete"
+  },
+  {
+    "id": "store.sql_emoji.get.app_error",
+    "translation": "Nous n'avons pas pu obtenir le message"
+  },
+  {
+    "id": "store.sql_emoji.get_all.app_error",
+    "translation": "Nous n'avons pas pu obtenir le message"
+  },
+  {
+    "id": "store.sql_emoji.get_by_name.app_error",
+    "translation": "Nous n'avons pas pu obtenir le message"
+  },
+  {
+    "id": "store.sql_emoji.save.app_error",
+    "translation": "Nous n'avons pas pu enregistrer le message"
+  },
+  {
     "id": "store.sql_license.get.app_error",
     "translation": "Nous avons rencontré une erreur durant le chargement de la licence"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 43cc5ca1d..b48aad932 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -572,6 +572,54 @@
     "translation": "詳細不明なエラーが発生しました。サポートに問い合わせしてください。"
   },
   {
+    "id": "api.emoji.create.duplicate.app_error",
+    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+  },
+  {
+    "id": "api.emoji.create.parse.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum file size."
+  },
+  {
+    "id": "api.emoji.create.permissions.app_error",
+    "translation": "削除コマンドに必要な権限が付与されていません"
+  },
+  {
+    "id": "api.emoji.create.too_large.app_error",
+    "translation": "Unable to create emoji. Could not understand request."
+  },
+  {
+    "id": "api.emoji.delete.permissions.app_error",
+    "translation": "削除コマンドに必要な権限が付与されていません"
+  },
+  {
+    "id": "api.emoji.disabled.app_error",
+    "translation": "コマンドがシステム管理者によって無効化されています。"
+  },
+  {
+    "id": "api.emoji.get_image.decode.app_error",
+    "translation": "Unable to decode image file for emoji."
+  },
+  {
+    "id": "api.emoji.get_image.read.app_error",
+    "translation": "Unable to read image file for emoji."
+  },
+  {
+    "id": "api.emoji.init.debug",
+    "translation": "POST APIルートを初期化しています"
+  },
+  {
+    "id": "api.emoji.storage.app_error",
+    "translation": "ファイルストレージが正しく設定されていません。S3またはローカルサーバーファイルストレージを設定してください。"
+  },
+  {
+    "id": "api.emoji.upload.image.app_error",
+    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+  },
+  {
+    "id": "api.emoji.upload.large_image.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+  },
+  {
     "id": "api.export.json.app_error",
     "translation": "JSONに変換できません"
   },
@@ -1561,7 +1609,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "あなたの{{.Service}}に既に紐付けられたユーザーが存在しています"
+    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -1952,6 +2000,14 @@
     "translation": "外向きのウェブフックはシステム管理者によって無効にされています。"
   },
   {
+    "id": "api.webhook.incoming.debug",
+    "translation": "内向きのウェブフックを受信。内容="
+  },
+  {
+    "id": "api.webhook.incoming.debug.error",
+    "translation": "Could not read payload of incoming webhook."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "ウェブフックAPIルートを初期化しています"
   },
@@ -2312,6 +2368,18 @@
     "translation": "サーバーに接続中にエラーになりました"
   },
   {
+    "id": "model.client.create_emoji.emoji.app_error",
+    "translation": "Unable to attach emoji data to request"
+  },
+  {
+    "id": "model.client.create_emoji.image.app_error",
+    "translation": "Unable to attach image to request"
+  },
+  {
+    "id": "model.client.create_emoji.writer.app_error",
+    "translation": "Unable to write request"
+  },
+  {
     "id": "model.client.login.app_error",
     "translation": "認証トークンが一致しません"
   },
@@ -2488,6 +2556,26 @@
     "translation": "SQL設定の最大稼働接続数が不正です。正の数を指定してください。"
   },
   {
+    "id": "model.emoji.create_at.app_error",
+    "translation": "作成日時は有効な時刻にしてください"
+  },
+  {
+    "id": "model.emoji.creator_id.app_error",
+    "translation": "不正なcreator idです"
+  },
+  {
+    "id": "model.emoji.id.app_error",
+    "translation": "不正なルートIDです"
+  },
+  {
+    "id": "model.emoji.name.app_error",
+    "translation": "名前は2文字以上の小文字の英数字にしてください"
+  },
+  {
+    "id": "model.emoji.update_at.app_error",
+    "translation": "更新日時は有効な時刻にしてください"
+  },
+  {
     "id": "model.file_info.get.gif.app_error",
     "translation": "GIFをデコードできません"
   },
@@ -3184,6 +3272,30 @@
     "translation": "コンプライアンスリポート保存する際にエラーが発生しました"
   },
   {
+    "id": "store.sql_emoji.delete.app_error",
+    "translation": "投稿を削除できませんでした"
+  },
+  {
+    "id": "store.sql_emoji.delete.no_results",
+    "translation": "We couldn’t find the emoji to delete"
+  },
+  {
+    "id": "store.sql_emoji.get.app_error",
+    "translation": "投稿を取得できませんでした"
+  },
+  {
+    "id": "store.sql_emoji.get_all.app_error",
+    "translation": "投稿を取得できませんでした"
+  },
+  {
+    "id": "store.sql_emoji.get_by_name.app_error",
+    "translation": "投稿を取得できませんでした"
+  },
+  {
+    "id": "store.sql_emoji.save.app_error",
+    "translation": "投稿を保存できませんでした"
+  },
+  {
     "id": "store.sql_license.get.app_error",
     "translation": "ライセンスを取得する際にエラーが発生しました"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 4aa2a83f7..52268bf35 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -572,6 +572,54 @@
     "translation": "Ocorreu um erro desconhecido. Por favor contato com o suporte."
   },
   {
+    "id": "api.emoji.create.duplicate.app_error",
+    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+  },
+  {
+    "id": "api.emoji.create.parse.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum file size."
+  },
+  {
+    "id": "api.emoji.create.permissions.app_error",
+    "translation": "Permissões inadequadas para deletar o comando"
+  },
+  {
+    "id": "api.emoji.create.too_large.app_error",
+    "translation": "Unable to create emoji. Could not understand request."
+  },
+  {
+    "id": "api.emoji.delete.permissions.app_error",
+    "translation": "Permissões inadequadas para deletar o comando"
+  },
+  {
+    "id": "api.emoji.disabled.app_error",
+    "translation": "Os comandos foram desabilitados para o administrador do sistema."
+  },
+  {
+    "id": "api.emoji.get_image.decode.app_error",
+    "translation": "Unable to decode image file for emoji."
+  },
+  {
+    "id": "api.emoji.get_image.read.app_error",
+    "translation": "Unable to read image file for emoji."
+  },
+  {
+    "id": "api.emoji.init.debug",
+    "translation": "Inicializando post api routes"
+  },
+  {
+    "id": "api.emoji.storage.app_error",
+    "translation": "O armazenamento de arquivos não está configurado corretamente. Por favor, configure o S3 ou o armazenamento de arquivos no servidor local."
+  },
+  {
+    "id": "api.emoji.upload.image.app_error",
+    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+  },
+  {
+    "id": "api.emoji.upload.large_image.app_error",
+    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+  },
+  {
     "id": "api.export.json.app_error",
     "translation": "Não é possível converter para json"
   },
@@ -1561,7 +1609,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "Um usuário existente já está conectado a sua conta {{.Service}}"
+    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -1952,6 +2000,14 @@
     "translation": "Webhooks de saída foram desabilitados pelo administrador do sistema."
   },
   {
+    "id": "api.webhook.incoming.debug",
+    "translation": "Webhook de entrada recebido. Contendo="
+  },
+  {
+    "id": "api.webhook.incoming.debug.error",
+    "translation": "Não foi possível ler o payload do webhook de entrada."
+  },
+  {
     "id": "api.webhook.init.debug",
     "translation": "Inicializando webhook api routes"
   },
@@ -2312,6 +2368,18 @@
     "translation": "Encontramos um erro enquanto conectava ao servidor"
   },
   {
+    "id": "model.client.create_emoji.emoji.app_error",
+    "translation": "Unable to attach emoji data to request"
+  },
+  {
+    "id": "model.client.create_emoji.image.app_error",
+    "translation": "Unable to attach image to request"
+  },
+  {
+    "id": "model.client.create_emoji.writer.app_error",
+    "translation": "Unable to write request"
+  },
+  {
     "id": "model.client.login.app_error",
     "translation": "Tokens de autenticação não são iguais"
   },
@@ -2488,6 +2556,26 @@
     "translation": "Inválido máximo de conexões abertas em configurações SQL.  Deve ser um número positivo."
   },
   {
+    "id": "model.emoji.create_at.app_error",
+    "translation": "Create deve ser um tempo válido"
+  },
+  {
+    "id": "model.emoji.creator_id.app_error",
+    "translation": "Id de criador inválido"
+  },
+  {
+    "id": "model.emoji.id.app_error",
+    "translation": "Id raiz inválida"
+  },
+  {
+    "id": "model.emoji.name.app_error",
+    "translation": "Nome deve ter 2 ou mais caracteres alfanuméricos em minúsculas"
+  },
+  {
+    "id": "model.emoji.update_at.app_error",
+    "translation": "Update deve ser um tempo válido"
+  },
+  {
     "id": "model.file_info.get.gif.app_error",
     "translation": "Não foi possível decodificar o gif."
   },
@@ -3184,6 +3272,30 @@
     "translation": "Encontramos um erro ao salvar o relatório de compliance"
   },
   {
+    "id": "store.sql_emoji.delete.app_error",
+    "translation": "Não foi possível deletar o post"
+  },
+  {
+    "id": "store.sql_emoji.delete.no_results",
+    "translation": "We couldn’t find the emoji to delete"
+  },
+  {
+    "id": "store.sql_emoji.get.app_error",
+    "translation": "Não foi obter o post"
+  },
+  {
+    "id": "store.sql_emoji.get_all.app_error",
+    "translation": "Não foi obter o post"
+  },
+  {
+    "id": "store.sql_emoji.get_by_name.app_error",
+    "translation": "Não foi obter o post"
+  },
+  {
+    "id": "store.sql_emoji.save.app_error",
+    "translation": "Não foi possível salvar o Post"
+  },
+  {
     "id": "store.sql_license.get.app_error",
     "translation": "Encontramos um erro ao obter a licença"
   },