summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2017-03-07 06:18:31 -0300
committerGeorge Goldberg <george@gberg.me>2017-03-07 09:18:31 +0000
commitd2325d4bcfa22505e02a544616facedec4f56c28 (patch)
tree701d9fbb4ed2ce6262be95df7674298739ea1b18 /webapp/i18n/en.json
parent579ad305e1b319f07ed48d3a8c749674fdd58133 (diff)
downloadchat-d2325d4bcfa22505e02a544616facedec4f56c28.tar.gz
chat-d2325d4bcfa22505e02a544616facedec4f56c28.tar.bz2
chat-d2325d4bcfa22505e02a544616facedec4f56c28.zip
translations PR 20170306 (#5666)
* translations PR 20170306 * Fix platform zh_TW.json
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json9
1 files changed, 7 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 53f7a7f3e..de5beaf67 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1490,8 +1490,8 @@
"installed_oauth_apps.add": "Add OAuth 2.0 Application",
"installed_oauth_apps.callbackUrls": "Callback URLs (One Per Line)",
"installed_oauth_apps.cancel": "Cancel",
- "installed_oauth_apps.description": "Description",
"installed_oauth_apps.delete.confirm": "This action permanently deletes the OAuth 2.0 application and breaks any integrations using it. Are you sure you want to delete it?",
+ "installed_oauth_apps.description": "Description",
"installed_oauth_apps.empty": "No OAuth 2.0 Applications found",
"installed_oauth_apps.header": "OAuth 2.0 Applications",
"installed_oauth_apps.help": "Create OAuth 2.0 applications to securely integrate bots and third-party applications with Mattermost. Please see {link} to learn more.",
@@ -1646,13 +1646,18 @@
"more_channels.prev": "Previous",
"more_channels.title": "More Channels",
"more_direct_channels.close": "Close",
+ "more_direct_channels.message": "Message",
"more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.",
"more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.",
- "more_direct_channels.message": "Message",
"more_direct_channels.title": "Direct Messages",
"msg_typing.areTyping": "{users} and {last} are typing...",
"msg_typing.isTyping": "{user} is typing...",
"msg_typing.someone": "Someone",
+ "multiselect.go": "Go",
+ "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
+ "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
+ "multiselect.numRemaining": "You can add {num, number} more",
+ "multiselect.placeholder": "Search and add members",
"navbar.addMembers": "Add Members",
"navbar.click": "Click here",
"navbar.delete": "Delete Channel...",