daily translations 20160530 (#3169)

7 files changed, 76 insertions, 56 deletions

diff --git a/i18n/ja.json b/i18n/ja.json
index 3029f2d68..d7f01dcae 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -77,7 +77,7 @@
   },
   {
     "id": "api.admin.test_email.missing_server",
-    "translation": "SMTP Server is required"
+    "translation": "SMTPサーバーが必要です"
   },
   {
     "id": "api.admin.test_email.subject",
@@ -305,7 +305,7 @@
   },
   {
     "id": "api.command.duplicate_trigger.app_error",
-    "translation": "This trigger word is already in use. Please choose another word."
+    "translation": "このトリガーワードは既に使われています。他の単語を選んでください。"
   },
   {
     "id": "api.command.execute_command.debug",
@@ -349,7 +349,7 @@
   },
   {
     "id": "api.command_echo.delay.app_error",
-    "translation": "遅延時間は10000秒より短かく設定してください"
+    "translation": "遅延時間は10000秒より短く設定してください"
   },
   {
     "id": "api.command_echo.desc",
@@ -1445,7 +1445,7 @@
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
-    "translation": "MFA is not available for this account type"
+    "translation": "MFAはこのアカウントタイプでは使用できません"
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
@@ -1865,7 +1865,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": "同一のチャンネルからの外向きのウェブフックには、同一のトリガーワード/コールバックURLを指定できません。"
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
@@ -3781,7 +3781,7 @@
   },
   {
     "id": "utils.license.validate_license.not_long.error",
-    "translation": "署名済みのライセンスが短過ぎます"
+    "translation": "署名済みのライセンスが十分に長くありません"
   },
   {
     "id": "utils.license.validate_license.signing.error",
diff --git a/i18n/pt.json b/i18n/pt.json
index 5c7d29398..a67d79591 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -77,7 +77,7 @@
   },
   {
     "id": "api.admin.test_email.missing_server",
-    "translation": "SMTP Server is required"
+    "translation": "Servidor SMTP é obrigatório"
   },
   {
     "id": "api.admin.test_email.subject",
@@ -305,7 +305,7 @@
   },
   {
     "id": "api.command.duplicate_trigger.app_error",
-    "translation": "This trigger word is already in use. Please choose another word."
+    "translation": "Esta palavra gatilho já está em uso. Por favor escolha outra palavra."
   },
   {
     "id": "api.command.execute_command.debug",
@@ -1445,7 +1445,7 @@
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
-    "translation": "MFA is not available for this account type"
+    "translation": "MFA não está disponível para este tipo de conta"
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
@@ -1865,7 +1865,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": "Webhooks de saída do mesmo canal não pode ter as mesmas palavras gatilho/URLs de retorno de chamada."
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 14f8ba343..e33a8f156 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -545,10 +545,10 @@
   "admin.user_item.teamAdmin": "Team Admin",
   "analytics.chart.loading": "Loading...",
   "analytics.chart.meaningful": "Not enough data for a meaningful representation.",
-  "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
-  "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.activeUsers": "Active Users With Posts",
   "analytics.system.channelTypes": "Channel Types",
+  "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
+  "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.postTypes": "Posts, Files and Hashtags",
   "analytics.system.privateGroups": "Private Groups",
   "analytics.system.publicChannels": "Public Channels",
@@ -830,8 +830,8 @@
   "email_verify.verified": "{siteName} Email Verified",
   "email_verify.verifiedBody": "<p>Your email has been verified! Click <a href={url}>here</a> to log in.</p>",
   "email_verify.verifyFailed": "Failed to verify your email.",
-  "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
   "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
+  "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
   "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
   "error_bar.preview_mode": "Preview Mode: Email notifications have not been configured",
   "file_attachment.download": "Download",
@@ -1232,8 +1232,8 @@
   "user.settings.advance.embed_preview": "Show preview snippet of links below message",
   "user.settings.advance.embed_toggle": "Show toggle for all embed previews",
   "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
-  "user.settings.advance.formattingTitle": "Enable Post Formatting",
   "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
+  "user.settings.advance.formattingTitle": "Enable Post Formatting",
   "user.settings.advance.markdown_preview": "Show markdown preview option in message input box",
   "user.settings.advance.off": "Off",
   "user.settings.advance.on": "On",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 7c6eb98b1..ed17af05b 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -81,6 +81,7 @@
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "Se require al menos un canal válido o una lista de palabras gatilladoras",
   "admin.audits.reload": "Recargar",
   "admin.audits.title": "Auditorías del Servidor",
+  "admin.banner.heading": "Note:",
   "admin.compliance.directoryDescription": "Directorio en el que se escriben los informes de cumplimiento. Si se deja en blanco, se utilizará ./data/.",
   "admin.compliance.directoryExample": "Ej \"./data/\"",
   "admin.compliance.directoryTitle": "Ubicación del Directorio de Cumplimiento:",
@@ -178,7 +179,7 @@
   "admin.email.smtpUsernameExample": "Ej: \"admin@tuempresa.com\", \"AKIADTOVBGERKLCBV\"",
   "admin.email.smtpUsernameTitle": "Usuario SMTP:",
   "admin.email.testing": "Probando...",
-  "admin.false": "false",
+  "admin.false": "falso",
   "admin.gitab.clientSecretDescription": "Utilizar este valor vía instrucciones suministradas anteriormente para iniciar sesión en GitLab.",
   "admin.gitlab.EnableHtmlDesc": "<ol><li>Inicia sesión con tu cuenta en GitLab y dirigete a Profile Settings -> Applications.</li><li>Ingresa los URIs \"<your-mattermost-url>/login/gitlab/complete\" (ejemplo: http://localhost:8065/login/gitlab/complete) y \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Luego utiliza los valores de los campos \"Secret\" e \"Id\" de GitLab y completa las opciones que abajo se presentan.</li><li>Completa las dirección URLs abajo. </li></ol>",
   "admin.gitlab.authDescription": "Ingresar <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize). Asegurate que si utilizas HTTPS o HTTPS tus URLS sean correctas",
@@ -240,7 +241,6 @@
   "admin.image.thumbWidthExample": "Ej \"120\"",
   "admin.image.thumbWidthTitle": "Ancho de imágen miniatura:",
   "admin.ldap.bannerDesc": "Si el atributo de un usuario cambia en el servidor LDAP será actualizado la próxima vez que el usuario ingrese sus credenciales para iniciar sesión en Mattermost. Esto incluye si un usuario se inactiva o se remueve en el servidor LDAP. Sincronización con servidores LDAP está planificado para futuras versiones.",
-  "admin.ldap.bannerHeading": "Nota:",
   "admin.ldap.baseDesc": "El DN Base es el Nombre Distinguido de la ubicación donde Mattermost debe comenzar a buscar a los usuarios en el árbol del LDAP.",
   "admin.ldap.baseEx": "Ej \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "DN Base:",
@@ -344,13 +344,13 @@
   "admin.rate.queriesTitle": "Número de consultas por minuto:",
   "admin.rate.remoteDescription": "Cuando es verdadero, límite de velocidad para el accedo a la API desde dirección IP.",
   "admin.rate.remoteTitle": "Variar por direcciones remotas: ",
-  "admin.recycle.button": "Recycle Database Connections",
-  "admin.recycle.loading": " Recycling...",
-  "admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
-  "admin.regenerate": "Re-Generate",
-  "admin.reload.button": "Reload Configuration From Disk",
-  "admin.reload.loading": " Loading...",
-  "admin.reload.reloadFail": "Reloading unsuccessful: {error}",
+  "admin.recycle.button": "Reciclar Conexiones de Base de Datos",
+  "admin.recycle.loading": " Reciclando...",
+  "admin.recycle.reloadFail": "Reciclaje fallido: {error}",
+  "admin.regenerate": "Regenerar",
+  "admin.reload.button": "Recargar Configuración desde el Disco",
+  "admin.reload.loading": " Cargando...",
+  "admin.reload.reloadFail": "Recarga fallida: {error}",
   "admin.reset_password.close": "Cerrar",
   "admin.reset_password.newPassword": "Nueva contraseña",
   "admin.reset_password.select": "Seleccionar",
@@ -519,7 +519,7 @@
   "admin.team.userCreationTitle": "Habilitar Creación de Usuarios: ",
   "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total de Mensajes",
-  "admin.true": "true",
+  "admin.true": "verdadero",
   "admin.userList.title": "Usuarios para {team}",
   "admin.userList.title2": "Usuarios para {team} ({count})",
   "admin.user_item.authServiceEmail": ", <strong>Método de inicio de sesión:</strong> Correo electrónico",
@@ -547,6 +547,8 @@
   "analytics.chart.meaningful": "No hay suficiente data para tener una representación significativa.",
   "analytics.system.activeUsers": "Usuarios Activos con Mensajes",
   "analytics.system.channelTypes": "Tipos de Canales",
+  "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
+  "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.postTypes": "Mesajes, Archivos y Hashtags",
   "analytics.system.privateGroups": "Grupos Privados",
   "analytics.system.publicChannels": "Canales Públicos",
@@ -828,6 +830,9 @@
   "email_verify.verified": "{siteName} Correo electrónico verificado",
   "email_verify.verifiedBody": "<p>Tu correo electrónico ha sido verificado!! Pincha <a href={url}>aquí</a> para iniciar sesión.</p>",
   "email_verify.verifyFailed": "Falla al verificar tu correo electrónico.",
+  "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
+  "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
+  "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
   "error_bar.preview_mode": "Modo de prueba: Las notificaciones por correo electrónico no han sido configuradas",
   "file_attachment.download": "Descargar",
   "file_info_preview.size": "Tamaño ",
@@ -837,8 +842,8 @@
   "file_upload.limited": "Se pueden subir un máximo de {count} archivos. Por favor envía otros mensajes para adjuntar más archivos.",
   "file_upload.pasted": "Imagen Pegada el ",
   "filtered_user_list.any_team": "Todos los Usuarios",
-  "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}",
-  "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total",
+  "filtered_user_list.count": "{count} {count, plural, =0 {0 miembros} one {miembro} other {miembros}}",
+  "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 miembros} one {miembro} other {miembros}} de {total} Total",
   "filtered_user_list.member": "Miembro",
   "filtered_user_list.search": "Buscar miembros",
   "filtered_user_list.show": "Filtro:",
@@ -1226,9 +1231,9 @@
   "upload_overlay.info": "Arrastra un archivo para subirlo.",
   "user.settings.advance.embed_preview": "Mostrar la previsualización de enlaces",
   "user.settings.advance.embed_toggle": "Capacidad de Mostrar/Esconder las previsualizaciones",
-  "user.settings.advance.enabled": "habilitada(s)",
-  "user.settings.advance.feature": " Característica ",
-  "user.settings.advance.features": " Características ",
+  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
+  "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
+  "user.settings.advance.formattingTitle": "Enable Post Formatting",
   "user.settings.advance.markdown_preview": "Mostrar la previsualización de mensajes escritos con markdown",
   "user.settings.advance.off": "Apagado",
   "user.settings.advance.on": "Encendido",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 05153d844..33557a56d 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -81,6 +81,7 @@
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "Un canal valide ou une liste de mot-clé est demander",
   "admin.audits.reload": "Rafraîchir",
   "admin.audits.title": "Activité de l'utilisateur",
+  "admin.banner.heading": "Note:",
   "admin.compliance.directoryDescription": "Répertoire des rapports de conformité. Si non spécifié :  ./data/ .",
   "admin.compliance.directoryExample": "Ex : \"./data/\"",
   "admin.compliance.directoryTitle": "Répertoire des éléments de conformité :",
@@ -240,7 +241,6 @@
   "admin.image.thumbWidthExample": "Exemple : \"120\"",
   "admin.image.thumbWidthTitle": "Largeur des vignettes :",
   "admin.ldap.bannerDesc": "Si une propriété de l'utilisateur est modifiée sur le serveur LDAP, elle sera mise à jour la prochaine fois que l'utilisateur se loguera à Mattermost. Cela concerne également le fait de désactiver ou supprimer un utilisateur du serveur LDAP. La synchronisation continue sera disponible ultérieurement.",
-  "admin.ldap.bannerHeading": "Remarque :",
   "admin.ldap.baseDesc": "Le DN de base est le Distinguished Name à partir du quel Mattermost doit rechercher les utilisateurs dans l'arborescence LDAP.",
   "admin.ldap.baseEx": "Exemple : \"ou=Unit Name, dc=example, dc=com\"",
   "admin.ldap.baseTitle": "DN de base :",
@@ -547,6 +547,8 @@
   "analytics.chart.meaningful": "Pas assez de données pour afficher quelque chose de pertinent.",
   "analytics.system.activeUsers": "Utilisateurs actifs avec messages",
   "analytics.system.channelTypes": "Types de canaux",
+  "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
+  "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.postTypes": "Messages, fichiers et hashtags",
   "analytics.system.privateGroups": "Groupes privés",
   "analytics.system.publicChannels": "Canaux publics",
@@ -828,6 +830,9 @@
   "email_verify.verified": "L'adresse électronique de {siteName} a été vérifié",
   "email_verify.verifiedBody": "<p>Votre adresse électronique a été vérifiée ! <a href={url}>Cliquez ici</a> pour vous connecter.</p>",
   "email_verify.verifyFailed": "Impossible de vérifier votre adresse électronique.",
+  "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
+  "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
+  "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
   "error_bar.preview_mode": "Mode découverte : Les notifications par courriel ne sont pas configurées.",
   "file_attachment.download": "Télécharger",
   "file_info_preview.size": "Taille ",
@@ -1226,9 +1231,9 @@
   "upload_overlay.info": "Faites glisser un fichier pour le télécharger.",
   "user.settings.advance.embed_preview": "Voir un aperçu des liens sous le message",
   "user.settings.advance.embed_toggle": "Voir un aperçu pour tous les messages inclus",
-  "user.settings.advance.enabled": "activé",
-  "user.settings.advance.feature": " Fonctionnalité ",
-  "user.settings.advance.features": " Fonctionnalités ",
+  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
+  "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
+  "user.settings.advance.formattingTitle": "Enable Post Formatting",
   "user.settings.advance.markdown_preview": "Voir l'option d'aperçu du markdown dans la zone de saisie de message",
   "user.settings.advance.off": "Désactivé",
   "user.settings.advance.on": "Activé",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index e15536bde..278fad7d7 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -31,7 +31,7 @@
   "add_command.autocomplete": "自動補完",
   "add_command.autocomplete.help": " このコマンドを自動補完リストに表示します。",
   "add_command.autocompleteDescription": "自動補完の説明",
-  "add_command.autocompleteDescription.help": "自動補完リストのスラッシュコマンドについての追加の短い説明(オプション)",
+  "add_command.autocompleteDescription.help": "自動補完リストのスラッシュコマンドについての追加の短い説明",
   "add_command.autocompleteDescription.placeholder": "例: \"カルテの検索結果を返す\"",
   "add_command.autocompleteHint": "自動補完のヒント",
   "add_command.autocompleteHint.help": "コマンドに必要なパラメーターに関する自動補完リストについてのヒント(オプション)",
@@ -81,6 +81,7 @@
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "有効なチャンネルまたはトリガーワードのリストが必要です",
   "admin.audits.reload": "再読み込み",
   "admin.audits.title": "ユーザーのアクティビティー",
+  "admin.banner.heading": "Note:",
   "admin.compliance.directoryDescription": "コンプライアンスリポートを書き込むディレクトリー。空欄の場合には./data/に書き込みます。",
   "admin.compliance.directoryExample": "例: \"./data/\"",
   "admin.compliance.directoryTitle": "コンプライアンスディレクトリーの場所:",
@@ -240,7 +241,6 @@
   "admin.image.thumbWidthExample": "例: \"120\"",
   "admin.image.thumbWidthTitle": "サムネイルの幅:",
   "admin.ldap.bannerDesc": "LDAPサーバーの情報が変更された場合、次回Mattermostにログインし直した際に、その情報を参照します。これにはユーザーをLDAPサーバーで無効化したり削除したりした場合も含みます。LDAPサーバーとの同期機能は将来のリリースで実装予定です。",
-  "admin.ldap.bannerHeading": "注意:",
   "admin.ldap.baseDesc": "ベースDNはMattermostがLDAPツリーでユーザー検索を始める場所の識別名です。",
   "admin.ldap.baseEx": "例: \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "ベースDN:",
@@ -344,13 +344,13 @@
   "admin.rate.queriesTitle": "1秒間の問い合わせ数:",
   "admin.rate.remoteDescription": "有効な場合、IPアドレスでAPIアクセスを投稿頻度を制限します。",
   "admin.rate.remoteTitle": "リモートアドレスごとに設定する:",
-  "admin.recycle.button": "Recycle Database Connections",
-  "admin.recycle.loading": " Recycling...",
-  "admin.recycle.reloadFail": "接続できません: {error}",
+  "admin.recycle.button": "データベース接続を再利用する",
+  "admin.recycle.loading": " 再利用しています…",
+  "admin.recycle.reloadFail": "再利用できませんでした: {error}",
   "admin.regenerate": "再生成する",
-  "admin.reload.button": "Reload Configuration From Disk",
-  "admin.reload.loading": "読み込み中です…",
-  "admin.reload.reloadFail": "接続できません: {error}",
+  "admin.reload.button": "ディスクから設定を再読み込みする",
+  "admin.reload.loading": " 読み込み中です…",
+  "admin.reload.reloadFail": "再読み込みできませんでした: {error}",
   "admin.reset_password.close": "閉じる",
   "admin.reset_password.newPassword": "新しいパスワード",
   "admin.reset_password.select": "選択する",
@@ -547,6 +547,8 @@
   "analytics.chart.meaningful": "意味のある表示のための十分なデータがありません。",
   "analytics.system.activeUsers": "投稿実績のあるアクティブユーザー",
   "analytics.system.channelTypes": "チャンネル形式",
+  "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
+  "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.postTypes": "投稿、ファイル、ハッシュタグ",
   "analytics.system.privateGroups": "非公開グループ",
   "analytics.system.publicChannels": "公開チャンネル",
@@ -828,6 +830,9 @@
   "email_verify.verified": "{siteName}電子メールが確認されました",
   "email_verify.verifiedBody": "<p>あなたの電子メールアドレスは確認されました! <a href={url}>here</a>をクロックしてログインしてください。</p>",
   "email_verify.verifyFailed": "電子メールアドレスが確認できませんでした。",
+  "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
+  "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
+  "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
   "error_bar.preview_mode": "プレビューモード: 電子メール通知は設定されていません",
   "file_attachment.download": "ダウンロードする",
   "file_info_preview.size": "サイズ ",
@@ -1226,9 +1231,9 @@
   "upload_overlay.info": "ファイルをアップロードするためにドラッグアンドドロップします。",
   "user.settings.advance.embed_preview": "メッセージの下部にリンク先のプレビューを表示する",
   "user.settings.advance.embed_toggle": "全ての埋め込まれたプレビューの表示非表示を切り替える",
-  "user.settings.advance.enabled": "有効",
-  "user.settings.advance.feature": " 機能 ",
-  "user.settings.advance.features": " 機能 ",
+  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
+  "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
+  "user.settings.advance.formattingTitle": "Enable Post Formatting",
   "user.settings.advance.markdown_preview": "メッセージ入力ボックスでMarkdownプレビューオプションを表示する",
   "user.settings.advance.off": "オフ",
   "user.settings.advance.on": "オン",
diff --git a/webapp/i18n/pt.json b/webapp/i18n/pt.json
index df177c475..bda9d982a 100644
--- a/webapp/i18n/pt.json
+++ b/webapp/i18n/pt.json
@@ -81,6 +81,7 @@
   "add_outgoing_webhook.triggerWordsOrChannelRequired": "Um canal válido ou uma lista de palavras gatilho é necessário",
   "admin.audits.reload": "Recarregar",
   "admin.audits.title": "Atividade de Usuário",
+  "admin.banner.heading": "Note:",
   "admin.compliance.directoryDescription": "Diretório o qual os relatórios compliance são gravados. Se estiver em branco, será usado ./data/.",
   "admin.compliance.directoryExample": "Ex \"./data/\"",
   "admin.compliance.directoryTitle": "Localização do Diretório de Compliance:",
@@ -240,7 +241,6 @@
   "admin.image.thumbWidthExample": "Ex \"120\"",
   "admin.image.thumbWidthTitle": "Largura do Thumbnail:",
   "admin.ldap.bannerDesc": "Se um atributo de usuário de mudar no servidor LDAP, ele será atualizado na próxima vez que o usuário inserir suas credenciais para iniciar sessão no Mattermost. Isso inclui se um usuário estiver inativo ou removido de um servidor LDAP. Sincronização com servidores LDAP está prevista para um lançamento futuro.",
-  "admin.ldap.bannerHeading": "Nota:",
   "admin.ldap.baseDesc": "Base DN é o nome distinto do local onde Mattermost deve começar sua busca para os usuários na árvore LDAP.",
   "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
   "admin.ldap.baseTitle": "BaseDN:",
@@ -324,7 +324,7 @@
   "admin.nav.help": "Ajuda",
   "admin.nav.logout": "Sair",
   "admin.nav.report": "Relatar um Problema",
-  "admin.nav.switch": "Team Selection",
+  "admin.nav.switch": "Seleção de Equipe",
   "admin.privacy.showEmailDescription": "Quando falso, esconde endereço de e-mail dos outros usuários na interface do usuário, incluindo donos da equipe e administradores da equipe. Usado quando o sistema está configurado para gerenciar equipes onde alguns usuários optam por manter suas informações de contato privado.",
   "admin.privacy.showEmailTitle": "Mostrar Endereços de Email: ",
   "admin.privacy.showFullNameDescription": "Quando falso, oculta o nome completo dos usuários dos outros usuários, incluindo donos de equipe e administradores de equipe. Nome de usuário é mostrado no lugar do nome completo.",
@@ -344,13 +344,13 @@
   "admin.rate.queriesTitle": "Número De Consultas Por Segundo:",
   "admin.rate.remoteDescription": "Quando verdadeiro, taxa limite de acesso de API por endereço de IP.",
   "admin.rate.remoteTitle": "Varia Por Endereço Remoto: ",
-  "admin.recycle.button": "Recycle Database Connections",
-  "admin.recycle.loading": " Recycling...",
-  "admin.recycle.reloadFail": "Conexão falhou: {error}",
+  "admin.recycle.button": "Reciclar Conexão do Banco de Dados",
+  "admin.recycle.loading": " Reciclando...",
+  "admin.recycle.reloadFail": "Reciclagem malsucedida: {error}",
   "admin.regenerate": "Re-Gerar",
-  "admin.reload.button": "Reload Configuration From Disk",
-  "admin.reload.loading": "Carregando...",
-  "admin.reload.reloadFail": "Conexão falhou: {error}",
+  "admin.reload.button": "Recarregar Configuração do Disco",
+  "admin.reload.loading": " Carregando...",
+  "admin.reload.reloadFail": "Recarregamento malsucedido: {error}",
   "admin.reset_password.close": "Fechar",
   "admin.reset_password.newPassword": "Nova Senha",
   "admin.reset_password.select": "Selecionar",
@@ -547,6 +547,8 @@
   "analytics.chart.meaningful": "Não há dados suficientes para uma representação significativa.",
   "analytics.system.activeUsers": "Usuários Ativos Com Posts",
   "analytics.system.channelTypes": "Tipos de Canal",
+  "analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
+  "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
   "analytics.system.postTypes": "Posts, Arquivos e Hashtags",
   "analytics.system.privateGroups": "Grupos Privados",
   "analytics.system.publicChannels": "Canais Públicos",
@@ -828,6 +830,9 @@
   "email_verify.verified": "{siteName} Email Verificado",
   "email_verify.verifiedBody": "<p>Seu email foi verificado! Clique <a href={url}>aqui</a> para login.</p>",
   "email_verify.verifyFailed": "Falha ao verificar seu email.",
+  "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details",
+  "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com",
+  "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details",
   "error_bar.preview_mode": "Modo de visualização: Notificações por E-mail não foram configuradas",
   "file_attachment.download": "Download",
   "file_info_preview.size": "Tamanho ",
@@ -1123,7 +1128,7 @@
   "sidebar_right_menu.logout": "Logout",
   "sidebar_right_menu.manageMembers": "Gerenciar Membros",
   "sidebar_right_menu.report": "Relatar um Problema",
-  "sidebar_right_menu.switch_team": "Team Selection",
+  "sidebar_right_menu.switch_team": "Selecionar Equipe",
   "sidebar_right_menu.teamLink": "Obter Link para Convite de Equipe",
   "sidebar_right_menu.teamSettings": "Configurações da Equipe",
   "signup_team.choose": "Equipes que você é um membro: ",
@@ -1226,9 +1231,9 @@
   "upload_overlay.info": "Soltar um arquivo para enviá-lo.",
   "user.settings.advance.embed_preview": "Mostrar pré-visualização dos links abaixo da mensagem",
   "user.settings.advance.embed_toggle": "Exibir mostrar/esconder para todas as pre-visualizações",
-  "user.settings.advance.enabled": "habilitado",
-  "user.settings.advance.feature": " Recursos ",
-  "user.settings.advance.features": " Recursos ",
+  "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
+  "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
+  "user.settings.advance.formattingTitle": "Enable Post Formatting",
   "user.settings.advance.markdown_preview": "Mostrar opção pré-visualização markdown na caixa de entrada de mensagens",
   "user.settings.advance.off": "Desligado",
   "user.settings.advance.on": "On",