summaryrefslogtreecommitdiff
path: root/src/locales
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2015-01-21 15:22:23 +0000
committerJohn McLear <john@mclear.co.uk>2015-01-21 15:22:23 +0000
commit920ec9c5530480eac346e450c3953c3a00fca7de (patch)
tree77879f6a00cfb60f5baa6bb217d90bb173bdfc5f /src/locales
parenta58507e8111b402eedbbccebbf383b1013d12e4a (diff)
parent13eff60dfea7b5ddcca15f9c4c4adab18c3e7dfe (diff)
downloadetherpad-lite-920ec9c5530480eac346e450c3953c3a00fca7de.zip
Merge pull request #2467 from ether/chat-and-users
Show users and Chat at the same time
Diffstat (limited to 'src/locales')
-rw-r--r--src/locales/en.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/locales/en.json b/src/locales/en.json
index 7f5846fd..de309ba1 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -32,6 +32,7 @@
"pad.settings.padSettings": "Pad Settings",
"pad.settings.myView": "My View",
"pad.settings.stickychat": "Chat always on screen",
+ "pad.settings.chatAndUsers": "Show Chat and Users",
"pad.settings.colorcheck": "Authorship colors",
"pad.settings.linenocheck": "Line numbers",
"pad.settings.rtlcheck": "Read content from right to left?",