translations PR 20161212 (#4774)

11 files changed, 389 insertions, 69 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 05c2e27ab..704f3187b 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -468,6 +468,10 @@
     "translation": "Schließen"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "Die /echo-Nachricht konnte nicht erstellt werden, err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "Erweitern"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Es ist ein Fehler beim Erweitern der Vorschauen aufgetreten"
   },
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [Details: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "Sie haben nicht die erforderlichen Zugriffsrechte"
   },
@@ -1405,7 +1417,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.get_teams.error",
-    "translation": "Fehler beim Abrufen der Teams während des Senden von Teamübergreifender DM user_id=%v, err=%v"
+    "translation": "Fehler beim Abrufen der Teams während des Senden von teamübergreifender DM user_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.mention_body",
@@ -1697,7 +1709,7 @@
   },
   {
     "id": "api.slackimport.slack_import.note1",
-    "translation": "- Einige Nachrichten wurden eventuell nicht importiert da sie nicht von diesem Importer unterstützt werden.\r\n"
+    "translation": "- Einige Nachrichten wurden eventuell nicht importiert, da sie nicht von diesem Importer unterstützt werden.\r\n"
   },
   {
     "id": "api.slackimport.slack_import.note2",
@@ -1721,35 +1733,35 @@
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Zip Datei konnte nicht geöffnet werden"
+    "translation": "Zip-Datei konnte nicht geöffnet werden"
   },
   {
     "id": "api.slackimport.slack_parse_channels.error",
-    "translation": "Fehler beim verarbeiten der Slack Kanäle. Import könnte trotzdem funktionieren."
+    "translation": "Fehler beim Verarbeiten der Slack-Kanäle. Import könnte trotzdem funktionieren."
   },
   {
     "id": "api.slackimport.slack_parse_posts.error",
-    "translation": "Fehler beim Verarbeiten einiger Slach Nachrichten. Import könnte trotzdem funktionieren."
+    "translation": "Fehler beim Verarbeiten einiger Slack-Nachrichten. Import könnte trotzdem funktionieren."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.display_name_too_long.warn",
-    "translation": "Slack Importer: Kanal {{.ChannelName}} hat einen zu langen Anzeigenamen. Er wird beim Import gekürzt."
+    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat einen zu langen Anzeigenamen. Er wird beim Import gekürzt."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.header_too_long.warn",
-    "translation": "Slack Importer: Kanal {{.ChannelName}} hat eine zu lange Überschrift. Sie wird beim Import gekürzt."
+    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat eine zu lange Überschrift. Sie wird beim Import gekürzt."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.name_too_long.warn",
-    "translation": "Slack Importer: Kanal {{.ChannelName}} hat einen zu langen Namen. Er wird beim Import gekürzt."
+    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat einen zu langen Namen. Er wird beim Import gekürzt."
   },
   {
     "id": "api.slackimport.slack_sanitise_channel_properties.purpose_too_long.warn",
-    "translation": "Slack Importer: Kanal {{.ChannelName}} hat einen zu langen Zweck. Er wird beim Import gekürzt."
+    "translation": "Slack-Importer: Kanal {{.ChannelName}} hat einen zu langen Zweck. Er wird beim Import gekürzt."
   },
   {
     "id": "api.status.init.debug",
-    "translation": "Initialisieren Status API Routen"
+    "translation": "Initialisiere Status-API-Routen"
   },
   {
     "id": "api.status.last_activity.error",
@@ -1761,11 +1773,11 @@
   },
   {
     "id": "api.team.create_team.email_disabled.app_error",
-    "translation": "Team Anmeldung mit einer E-Mail Adresse ist ausgeschaltet."
+    "translation": "Anmeldung mit einer E-Mail-Adresse ist deaktiviert."
   },
   {
     "id": "api.team.create_team_from_signup.email_disabled.app_error",
-    "translation": "Team Anmeldung mit einer E-Mail Adresse ist ausgeschaltet."
+    "translation": "Anmeldung mit einer E-Mail Adresse ist deaktiviert."
   },
   {
     "id": "api.team.create_team_from_signup.expired_link.app_error",
@@ -1781,11 +1793,11 @@
   },
   {
     "id": "api.team.email_teams.sending.error",
-    "translation": "Fehler während dem Senden einer E-Mail ist aufgetreten: err=%v"
+    "translation": "Es ist ein Fehler beim Senden einer E-Mail aufgetreten: err=%v"
   },
   {
     "id": "api.team.get_invite_info.not_open_team",
-    "translation": "Die Einaldung ist ungültig, weil das ein offenes Team ist."
+    "translation": "Die Einladung ist ungültig, weil dies kein offenes Team ist."
   },
   {
     "id": "api.team.import_team.admin.app_error",
@@ -1801,7 +1813,7 @@
   },
   {
     "id": "api.team.import_team.no_file.app_error",
-    "translation": "keine Datei unter 'file' in der Anfrage"
+    "translation": "Keine Datei unter 'file' in der Anfrage"
   },
   {
     "id": "api.team.import_team.open.app_error",
@@ -1813,7 +1825,7 @@
   },
   {
     "id": "api.team.import_team.unavailable.app_error",
-    "translation": "Dateigröße nicht vorhanden"
+    "translation": "Dateigröße nicht verfügbar"
   },
   {
     "id": "api.team.init.debug",
@@ -1853,7 +1865,7 @@
   },
   {
     "id": "api.team.is_team_creation_allowed.disabled.app_error",
-    "translation": "Teamerstellung wurde ausgeschaltet. Bitte fragen bei Sie Ihren Administrator nach um Details zu erfahren."
+    "translation": "Teamerstellung wurde deaktiviert. Bitte fragen Sie Ihren Administrator, um Details zu erfahren."
   },
   {
     "id": "api.team.is_team_creation_allowed.domain.app_error",
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} hat Sie eingeladen dem Team {{ .TeamDisplayName }} auf {{.SiteName}} beizutreten"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "Ihr Passwort wurde aktualisiert für {{.TeamDisplayName}} bei {{ .TeamURL }} durch {{.Method}}.<br>Falls Sie diese Änderung nicht veranlasst haben wenden Sie sich bitte an den Systemadministrator."
   },
diff --git a/i18n/en.json b/i18n/en.json
index f39b3f4b6..fb68f741e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -704,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [details: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -712,10 +716,6 @@
     "translation": "Invalid or expired session, please login again."
   },
   {
-    "id": "api.context.mfa_required.app_error",
-    "translation": "Multi-factor authentication is required on this server."
-  },
-  {
     "id": "api.context.system_permissions.app_error",
     "translation": "You do not have the appropriate permissions (system)"
   },
@@ -1980,36 +1980,36 @@
     "translation": "{{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team on {{.SiteName}}"
   },
   {
-    "id": "api.templates.password_change_body.info",
-    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
-  },
-  {
-    "id": "api.templates.password_change_body.title",
-    "translation": "Your password has been updated"
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
-    "id": "api.templates.password_change_subject",
-    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .SiteName }}"
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
   },
   {
-    "id": "api.templates.mfa_activated_body.info",
-    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
     "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
-    "id": "api.templates.mfa_activated_body.title",
-    "translation": "Multi-factor authentication was added"
-  },
-  {
     "id": "api.templates.mfa_deactivated_body.title",
     "translation": "Multi-factor authentication was removed"
   },
   {
-    "id": "api.templates.mfa_change_subject",
-    "translation": "Your MFA has been updated on {{ .SiteName }}"
+    "id": "api.templates.password_change_body.info",
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.password_change_body.title",
+    "translation": "Your password has been updated"
+  },
+  {
+    "id": "api.templates.password_change_subject",
+    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .SiteName }}"
   },
   {
     "id": "api.templates.post_body.button",
diff --git a/i18n/es.json b/i18n/es.json
index 6bf7b7fa3..2675a2b5d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -468,6 +468,10 @@
     "translation": "colapsar"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "No se pudo crear el /echo mensaje, err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "expandir"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Ha ocurrido un error mientras se expandian las previsualizaciones"
   },
@@ -685,7 +693,7 @@
   },
   {
     "id": "api.context.invalidate_all_caches",
-    "translation": "Purging all caches"
+    "translation": "Purgando todos los cachés"
   },
   {
     "id": "api.context.last_activity_at.error",
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [detalles: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "No tienes los permisos apropiados"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} te ha invitado a unirte al equipo {{ .TeamDisplayName }} en {{.SiteName}}"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "Tu contraseña ha sido cambiada para {{.TeamDisplayName}} en {{ .TeamURL }} por el método de {{.Method}}.<br>Si este cambio no fue realizado por ti, por favor contacta a un administrador del sistema."
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 6a555c9a3..6d9bbdb42 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -468,6 +468,10 @@
     "translation": "réduire"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "Impossible de créer le message /echo, err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "étendre"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Une erreur est survenue lors de l'expansion des aperçus"
   },
@@ -696,6 +704,10 @@
     "translation": "%v : %v code=%v rid=%v uid=%v ip=%v %v [détails : %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "Vous n'avez pas les permissions appropriées"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} vous a invité à rejoindre l'équipe {{ .TeamDisplayName }} sur {{.SiteName}}"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "Vous avez mis à jour votre mot de passe pour {{.TeamDisplayName}} sur {{.TeamURL}} pour {{.Method}}.<br>Si cette modification n'a pas été effectuée par vous, veuillez prendre contact avec votre administrateur système."
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 35eba1ffa..c19db1839 100644
--- a/i18n/ja.json
+++ b/i18n/ja.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",
@@ -468,6 +468,10 @@
     "translation": "折りたたみ"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "/echoを投稿することができません err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "展開"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "プレビューの展開中にエラーが発生しました"
   },
@@ -685,7 +693,7 @@
   },
   {
     "id": "api.context.invalidate_all_caches",
-    "translation": "Purging all caches"
+    "translation": "全てのキャッシュを破棄しています"
   },
   {
     "id": "api.context.last_activity_at.error",
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [詳細: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "あなたには必要な権限が付与されていません"
   },
@@ -799,7 +811,7 @@
   },
   {
     "id": "api.emoji.delete.delete_reactions.app_error",
-    "translation": "Unable to delete reactions when deleting emoji with emoji name %v"
+    "translation": "絵文字名 %v の絵文字を削除する際にリアクションを削除できません"
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
@@ -831,19 +843,19 @@
   },
   {
     "id": "api.emoji.upload.large_image.decode_error",
-    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+    "translation": "絵文字を作成できません。画像をデコードする際にエラーが発生しました。"
   },
   {
     "id": "api.emoji.upload.large_image.encode_error",
-    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+    "translation": "絵文字を作成できません。画像をエンコードする際にエラーが発生しました。"
   },
   {
     "id": "api.emoji.upload.large_image.gif_decode_error",
-    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+    "translation": "絵文字を作成できません。GIF画像をデコードする際にエラーが発生しました。"
   },
   {
     "id": "api.emoji.upload.large_image.gif_encode_error",
-    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
+    "translation": "絵文字を作成できません。GIF画像をエンコードする際にエラーが発生しました。"
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1011,7 +1023,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",
@@ -1295,15 +1307,15 @@
   },
   {
     "id": "api.post.disabled_all",
-    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+    "translation": "チャンネルに{{.Users}}以上のユーザーがいるため@allは無効化されています。"
   },
   {
     "id": "api.post.disabled_channel",
-    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+    "translation": "チャンネルに{{.Users}}以上のユーザーがいるため@channelは無効化されています。"
   },
   {
     "id": "api.post.disabled_here",
-    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+    "translation": "チャンネルに{{.Users}}以上のユーザーがいるため@hereは無効化されています。"
   },
   {
     "id": "api.post.get_message_for_notification.files_sent",
@@ -1513,19 +1525,19 @@
   },
   {
     "id": "api.reaction.delete_reaction.mismatched_channel_id.app_error",
-    "translation": "Failed to delete reaction when channel id in URL doesn't match post id in URL"
+    "translation": "URL内のチャンネルIDがURL内の投稿IDと一致しないため、リアクションを削除できませんでした"
   },
   {
     "id": "api.reaction.list_reactions.mismatched_channel_id.app_error",
-    "translation": "Failed to get reactions when channel id in URL doesn't match post id in URL"
+    "translation": "URL内のチャンネルIDとURL内の投稿IDが一致しないため、リアクションを取得できませんでした"
   },
   {
     "id": "api.reaction.save_reaction.mismatched_channel_id.app_error",
-    "translation": "Failed to save reaction when channel id in URL doesn't match post id in URL"
+    "translation": "URL内のチャンネルIDとURL内の投稿IDが一致しないため、リアクションを保存できませんでした"
   },
   {
     "id": "api.reaction.send_reaction_event.post.app_error",
-    "translation": "Failed to get post when sending websocket event for reaction"
+    "translation": "リアクションに対するウェブソケットイベントを送信する際に、投稿を取得することができませんでした"
   },
   {
     "id": "api.saml.save_certificate.app_error",
@@ -1669,7 +1681,7 @@
   },
   {
     "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"
+    "translation": "既存のアカウント{{.Email}}, {{.Username}} とユーザーをマージしようとしましたが、このチームにユーザーを追加できませんでした。\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }}が{{.SiteName}}の{{ .TeamDisplayName }}に参加するように招待しています。"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "{{.Method}}によって{{ .TeamURL }}の{{.TeamDisplayName}}のパスワードが更新されました。<br>あなたが変更したのでなければ、システム管理者へ問い合わせてください。"
   },
@@ -2793,11 +2825,11 @@
   },
   {
     "id": "ent.metrics.starting.info",
-    "translation": "Metrics and profiling server is listening on %v"
+    "translation": "メトリクスとプロファイリングのサーバーは%vで接続待ちです"
   },
   {
     "id": "ent.metrics.stopping.info",
-    "translation": "Metrics and profiling server is stopping on %v"
+    "translation": "メトリクスとプロファイリングのサーバーは%vで停止しています"
   },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
@@ -4621,43 +4653,43 @@
   },
   {
     "id": "store.sql_reaction.delete.begin.app_error",
-    "translation": "Unable to open transaction while deleting reaction"
+    "translation": "リアクションの削除中はトランザクションを開けません"
   },
   {
     "id": "store.sql_reaction.delete.commit.app_error",
-    "translation": "Unable to commit transaction while deleting reaction"
+    "translation": "リアクションの削除中はトランザクションをコミットできません"
   },
   {
     "id": "store.sql_reaction.delete.save.app_error",
-    "translation": "Unable to delete reaction"
+    "translation": "リアクションを削除できません"
   },
   {
     "id": "store.sql_reaction.delete_all_with_emoj_name.delete_reactions.app_error",
-    "translation": "Unable to delete reactions with the given emoji name"
+    "translation": "指定された絵文字名のリアクションは削除できません"
   },
   {
     "id": "store.sql_reaction.delete_all_with_emoj_name.get_reactions.app_error",
-    "translation": "Unable to get reactions with the given emoji name"
+    "translation": "指定された絵文字名のリアクションを取得できません"
   },
   {
     "id": "store.sql_reaction.delete_all_with_emoji_name.update_post.warn",
-    "translation": "Unable to update Post.HasReactions while removing reactions post_id=%v, error=%v"
+    "translation": "リアクションの削除中にPost.HasReactionsは更新できません post_id=%v, error=%v"
   },
   {
     "id": "store.sql_reaction.get_for_post.app_error",
-    "translation": "Unable to get reactions for post"
+    "translation": "投稿に対するリアクションを取得できません"
   },
   {
     "id": "store.sql_reaction.save.begin.app_error",
-    "translation": "Unable to open transaction while saving reaction"
+    "translation": "リアクションの保存中はトランザクションを開けません"
   },
   {
     "id": "store.sql_reaction.save.commit.app_error",
-    "translation": "Unable to commit transaction while saving reaction"
+    "translation": "リアクションの保存中はトランザクションをコミットできません"
   },
   {
     "id": "store.sql_reaction.save.save.app_error",
-    "translation": "Unable to save reaction"
+    "translation": "リアクションを保存できません"
   },
   {
     "id": "store.sql_session.analytics_session_count.app_error",
diff --git a/i18n/ko.json b/i18n/ko.json
index 44f389c5b..9fe1948a9 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -468,6 +468,10 @@
     "translation": "닫기"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "/echo 글을 생성할 수 없습니다, err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "확장"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "미리보기를 확장하는 중 오류가 발생하였습니다"
   },
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [details: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "작업을 할 수 있는 권한이 없습니다"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team on {{.SiteName}}"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "{{.TeamDisplayName}}의 비밀번호가 변경되었습니다. {{.TeamURL}} {{.Method}}<br>의도하지 않은 변경인 경우, 시스템 관리자에게 문의해보세요."
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 695166aff..d4dbbda34 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -468,6 +468,10 @@
     "translation": "invouwen"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "Bericht /echo kan niet gemaakt worden, fout=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "uitvouwen"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Er is een fout opgetreden tijdens het vergroten van de voorbeelden"
   },
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [details: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "U beschikt niet over juiste de rechten"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} heeft U uitgenodigd om lid te worden van team {{ .TeamDisplayName }} op {{.SiteName}}"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "Uw wachtwoord is bijgewerkt voor {{.TeamDisplayName}} op {{.teamURL}} via {{.Method}}.<br>Als deze aanpassing niet door U uitgevoerd was, neem contact op met uw systeembeheerder."
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 1da4ff437..a817507e4 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -468,6 +468,10 @@
     "translation": "recolher"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "Não é possível criar o post /echo, err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "expandir"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Um erro ocorreu ao expandir o preview"
   },
@@ -685,7 +693,7 @@
   },
   {
     "id": "api.context.invalidate_all_caches",
-    "translation": "Purging all caches"
+    "translation": "Purgar todos os caches"
   },
   {
     "id": "api.context.last_activity_at.error",
@@ -696,6 +704,10 @@
     "translation": "%v:%v código=%v rid=%v uid=%v ip=%v %v [detalhes: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "Você não tem a permissão apropriada"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} convidou você para se juntar a Equipe {{ .TeamDisplayName }} no {{.SiteName}}"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "Sua senha foi atualizada para {{.TeamDisplayName}} no {{ .TeamURL }} pelo {{.Method}}.<br>Se está mudança não foi iniciada por você, por favor entre em contato com o seu administrado do sistema."
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index d002b3389..8841c2de4 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -468,6 +468,10 @@
     "translation": "cвернуть"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "Невозможно создать /echo post, err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "расширить"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "Произошла ошибка при расширении предварительного просмотра"
   },
@@ -685,7 +693,7 @@
   },
   {
     "id": "api.context.invalidate_all_caches",
-    "translation": "Purging all caches"
+    "translation": "Очистка всех кэшей"
   },
   {
     "id": "api.context.last_activity_at.error",
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [details: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "У вас нет соответствующих прав"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} приглашает Вас присоединиться к команде {{ .TeamDisplayName }} на {{.SiteName}}"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "Ваш пароль был обновлен для команды {{.TeamDisplayName}} на {{ .TeamURL }} через {{.Method}}.<br>Если это изменение не было сделано Вами, пожалуйста, обратитесь к системному администратору."
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index b3e5d1310..53c382836 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -468,6 +468,10 @@
     "translation": "折叠"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "不能创建 /echo 帖文，err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "展开"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "放大预览时发生了错误"
   },
@@ -685,7 +693,7 @@
   },
   {
     "id": "api.context.invalidate_all_caches",
-    "translation": "Purging all caches"
+    "translation": "清除所有缓存"
   },
   {
     "id": "api.context.last_activity_at.error",
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [详情: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "您没有对应的权限"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} 邀请您加入 {{ .TeamDisplayName }} 团队在 {{.SiteName}}"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "您的密码已经被更新 {{.TeamDisplayName}} 在 {{ .TeamURL }} 通过 {{.Method}}.<br>如果这个变更不是由你发起的，请联系你的系统管理员."
   },
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index cf88c1cdb..607cf9502 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -468,6 +468,10 @@
     "translation": "折疊"
   },
   {
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
+  },
+  {
     "id": "api.command_echo.create.app_error",
     "translation": "無法建立 /echo 訊息 err=%v"
   },
@@ -500,6 +504,10 @@
     "translation": "展開"
   },
   {
+    "id": "api.command_expand.success",
+    "translation": "Image links now expand by default"
+  },
+  {
     "id": "api.command_expand_collapse.fail.app_error",
     "translation": "展開預覽時發生錯誤"
   },
@@ -696,6 +704,10 @@
     "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [細節: %v]"
   },
   {
+    "id": "api.context.mfa_required.app_error",
+    "translation": "Multi-factor authentication is required on this server."
+  },
+  {
     "id": "api.context.permissions.app_error",
     "translation": "您沒有適當的權限"
   },
@@ -1968,6 +1980,26 @@
     "translation": "{{ .SenderName }} 已經邀請您加入 {{.SiteName}} 上的 {{ .TeamDisplayName }} 團隊"
   },
   {
+    "id": "api.templates.mfa_activated_body.info",
+    "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_activated_body.title",
+    "translation": "Multi-factor authentication was added"
+  },
+  {
+    "id": "api.templates.mfa_change_subject",
+    "translation": "Your MFA has been updated on {{ .SiteName }}"
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.info",
+    "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.mfa_deactivated_body.title",
+    "translation": "Multi-factor authentication was removed"
+  },
+  {
     "id": "api.templates.password_change_body.info",
     "translation": "您在 {{ .TeamURL }} 上的 {{.TeamDisplayName}} 密碼已經由  {{.Method}} 更新。<br>如果這不是您所變更的，請聯繫系統管理員。"
   },