diff options
author | enahum <nahumhbl@gmail.com> | 2016-07-05 12:38:09 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-05 12:38:09 -0400 |
commit | 8b918efd3fba4d0f8efc576ce03df36de4ea8648 (patch) | |
tree | 5513d9419134af994afb62281c065a3dbed4644a /webapp/i18n/en.json | |
parent | ff5b429eb57964c5c6ff15a1bf92e176694c3022 (diff) | |
download | chat-8b918efd3fba4d0f8efc576ce03df36de4ea8648.tar.gz chat-8b918efd3fba4d0f8efc576ce03df36de4ea8648.tar.bz2 chat-8b918efd3fba4d0f8efc576ce03df36de4ea8648.zip |
daily translations 20160704 (#3481)
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r-- | webapp/i18n/en.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index afe32ae0e..d6f340ab2 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -322,7 +322,10 @@ "admin.ldap.lastnameAttrTitle": "Last Name Attribute:", "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"LDAP Username\".", "admin.ldap.loginNameEx": "Ex \"LDAP Username\"", - "admin.ldap.loginNameTitle": "Sign-in Field Default Text:", + "admin.ldap.loginNameTitle": "Login Field Name:", + "admin.ldap.maxPageSizeEx": "Ex \"2000\"", + "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.", + "admin.ldap.maxPageSizeTitle": "Maximum Page Size", "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.", "admin.ldap.nicknameAttrEx": "Ex \"nickname\"", "admin.ldap.nicknameAttrTitle": "Nickname Attribute:", @@ -333,9 +336,6 @@ "admin.ldap.queryDesc": "The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.", "admin.ldap.queryEx": "Ex \"60\"", "admin.ldap.queryTitle": "Query Timeout (seconds):", - "admin.ldap.maxPageSizeTitle": "Maximum Page Size", - "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.", - "admin.ldap.maxPageSizeEx": "Ex \"2000\"", "admin.ldap.serverDesc": "The domain or IP address of LDAP server.", "admin.ldap.serverEx": "Ex \"10.0.0.23\"", "admin.ldap.serverTitle": "LDAP Server:", @@ -1205,9 +1205,9 @@ "rhs_comment.del": "Delete", "rhs_comment.edit": "Edit", "rhs_comment.permalink": "Permalink", - "rhs_header.details": "Message Details", - "rhs_header.closeSidebarTooltip": "Close Sidebar", "rhs_header.backToResultsTooltip": "Back to Search Results", + "rhs_header.closeSidebarTooltip": "Close Sidebar", + "rhs_header.details": "Message Details", "rhs_header.expandSidebarTooltip": "Expand Sidebar", "rhs_header.shrinkSidebarTooltip": "Shrink Sidebar", "rhs_root.del": "Delete", @@ -1265,10 +1265,10 @@ "signup_team.disabled": "Team creation has been disabled. Please contact an administrator for access.", "signup_team.join_open": "Open teams you can join: ", "signup_team.noTeams": "There are no teams included in the Team Directory and team creation has been disabled.", - "signup_team.no_teams": "No teams have been created. Please contact your administrator.", - "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".", "signup_team.no_open_teams": "No open teams have been created. Please ask your administrator for an invite.", "signup_team.no_open_teams_canCreate": "No open teams have been created. Please ask your administrator for an invite or create a new team.", + "signup_team.no_teams": "No teams have been created. Please contact your administrator.", + "signup_team.no_teams_canCreate": "No teams have been created. You may create one by clicking \"Create a new team\".", "signup_team.none": "No team creation method has been enabled. Please contact an administrator for access.", "signup_team_complete.completed": "You've already completed the signup process for this invitation or this invitation has expired.", "signup_team_confirm.checkEmail": "Please check your email: <strong>{email}</strong><br />Your email contains a link to set up your team", |