summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-12-22 10:52:20 -0300
committerGitHub <noreply@github.com>2016-12-22 10:52:20 -0300
commit257a2234c431caf98abb0b9b1791672ae59a17fe (patch)
tree3f9387d3d6829bbf094eafe6ee66c54c25c0085e /webapp/i18n/en.json
parent84c6e376fab7de7d74c103a5dea49f331e827311 (diff)
downloadchat-257a2234c431caf98abb0b9b1791672ae59a17fe.tar.gz
chat-257a2234c431caf98abb0b9b1791672ae59a17fe.tar.bz2
chat-257a2234c431caf98abb0b9b1791672ae59a17fe.zip
translations PR 20161219 (#4838)
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json10
1 files changed, 5 insertions, 5 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 5d1b710d7..7428d1039 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -435,8 +435,8 @@
"admin.ldap.portDesc": "The port Mattermost will use to connect to the AD/LDAP server. Default is 389.",
"admin.ldap.portEx": "E.g.: \"389\"",
"admin.ldap.portTitle": "AD/LDAP Port:",
- "admin.ldap.positionAttrEx": "E.g.: \"title\"",
"admin.ldap.positionAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the position field in Mattermost.",
+ "admin.ldap.positionAttrEx": "E.g.: \"title\"",
"admin.ldap.positionAttrTitle": "Position Attribute:",
"admin.ldap.queryDesc": "The timeout value for queries to the AD/LDAP server. Increase if you are getting timeout errors caused by a slow AD/LDAP server.",
"admin.ldap.queryEx": "E.g.: \"60\"",
@@ -1307,8 +1307,8 @@
"get_link.copy": "Copy Link",
"get_post_link_modal.help": "The link below allows authorized users to see your post.",
"get_post_link_modal.title": "Copy Permalink",
- "get_public_link_modal.title": "Copy Public Link",
"get_public_link_modal.help": "The link below allows anyone to see this file without being registered on this server.",
+ "get_public_link_modal.title": "Copy Public Link",
"get_team_invite_link_modal.help": "Send teammates the link below for them to sign-up to this team site. The Team Invite Link can be shared with multiple teammates as it does not change unless it's regenerated in Team Settings by a Team Admin.",
"get_team_invite_link_modal.helpDisabled": "User creation has been disabled for your team. Please ask your Team Administrator for details.",
"get_team_invite_link_modal.title": "Team Invite Link",
@@ -1658,14 +1658,14 @@
"posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
"reaction.clickToAdd": "(click to add)",
"reaction.clickToRemove": "(click to remove)",
+ "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
"reaction.reacted": "{users} {reactionVerb} with {emoji}",
- "reaction.reactionVerb.you": "reacted",
"reaction.reactionVerb.user": "reacted",
"reaction.reactionVerb.users": "reacted",
+ "reaction.reactionVerb.you": "reacted",
"reaction.reactionVerb.youAndUsers": "reacted",
- "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
- "reaction.usersReacted": "{users} and {lastUser}",
"reaction.usersAndOthersReacted": "{users} and {otherUsers, number} other {otherUsers, plural, one {user} other {users}}",
+ "reaction.usersReacted": "{users} and {lastUser}",
"reaction.you": "You",
"removed_channel.channelName": "the channel",
"removed_channel.from": "Removed from ",