diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-30 07:57:44 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-30 07:57:44 -0400 |
| commit | fe5db123744c380bdddb36f196dd6cf7518d41cf (patch) | |
| tree | d632ef9a576b1c6df54bc92c7f016e0f83bae7b8 /webapp/i18n/en.json | |
| parent | e1bebb2d776b12d6e1461e06f318e79fcb93ea2c (diff) | |
| download | chat-fe5db123744c380bdddb36f196dd6cf7518d41cf.tar.gz chat-fe5db123744c380bdddb36f196dd6cf7518d41cf.tar.bz2 chat-fe5db123744c380bdddb36f196dd6cf7518d41cf.zip | |
PLT-3080 Added ability to disable formatting for debugging and updated marked to fix errors (#3141)
* Removed injectIntl from user_settings_advanced.jsx
* Added setting to disable formatting for debugging
* Updated fork of marked
Diffstat (limited to 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 609de5a75..34d8fed5f 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1226,9 +1226,9 @@ "upload_overlay.info": "Drop a file to upload it.", "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.enabled": "enabled", - "user.settings.advance.feature": " Feature ", - "user.settings.advance.features": " Features ", + "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.markdown_preview": "Show markdown preview option in message input box", "user.settings.advance.off": "Off", "user.settings.advance.on": "On", |