summaryrefslogtreecommitdiffstats
path: root/web/static
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-07 13:53:56 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-07 13:53:56 -0500
commitb8b38c0c7269210451dc5fee81ef28ed4e8ae183 (patch)
treed76420eb9fd14f37781ed127bb316757475da121 /web/static
parent0387ac799792fdd0684b863bb029813bbb3eccf7 (diff)
parent5884495a85cf92c338ab003305d1433df059884c (diff)
downloadchat-b8b38c0c7269210451dc5fee81ef28ed4e8ae183.tar.gz
chat-b8b38c0c7269210451dc5fee81ef28ed4e8ae183.tar.bz2
chat-b8b38c0c7269210451dc5fee81ef28ed4e8ae183.zip
Merge pull request #2340 from rodrigocorsi2/PLT-2076
PLT-2076: Add help text below the input box when a user starts typing
Diffstat (limited to 'web/static')
-rw-r--r--web/static/i18n/en.json6
-rw-r--r--web/static/i18n/pt.json6
2 files changed, 12 insertions, 0 deletions
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 114b6bdb5..03b21e944 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -1054,9 +1054,15 @@
"team_signup_welcome.validEmailError": "Please enter a valid email address",
"team_signup_welcome.welcome": "Welcome to:",
"team_signup_welcome.yes": "Yes, this address is correct",
+ "textbox.bold": "**bold**",
"textbox.edit": "Edit message",
"textbox.help": "Help",
+ "textbox.inlinecode": "`inline code`",
+ "textbox.italic": "_italic_",
+ "textbox.preformatted": "```preformatted```",
"textbox.preview": "Preview",
+ "textbox.quote": ">quote",
+ "textbox.strike": "strike",
"tutorial_intro.allSet": "You’re all set",
"tutorial_intro.end": "Click “Next” to enter Town Square. This is the first channel teammates see when they sign up. Use it for posting updates everyone needs to know.",
"tutorial_intro.invite": "Invite teammates",
diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json
index eaec8ba78..c38ae86c6 100644
--- a/web/static/i18n/pt.json
+++ b/web/static/i18n/pt.json
@@ -1049,9 +1049,15 @@
"team_signup_welcome.validEmailError": "Por favor entre um endereço de e-mail válido",
"team_signup_welcome.welcome": "Bem-vindo:",
"team_signup_welcome.yes": "Sim, este endereço de email está correto",
+ "textbox.bold": "**negrito**",
"textbox.edit": "Editar mensagem",
"textbox.help": "Ajuda",
+ "textbox.inlinecode": "`código`",
+ "textbox.italic": "_itálico_",
+ "textbox.preformatted": "```pre-formatado```",
"textbox.preview": "Pré-visualização",
+ "textbox.quote": ">citado",
+ "textbox.strike": "tachado",
"tutorial_intro.allSet": "Está tudo pronto",
"tutorial_intro.end": "Clique em “Próximo” para entrar Town Square. Este é o primeiro canal que sua equipe de trabalho vê quando eles se inscrevem. Use para postar atualizações que todos precisam saber.",
"tutorial_intro.invite": "Convidar pessoas para equipe",