translations PR 20180521 (#1690)

assets/base/i18n/en.json

@@ -627,14 +627,17 @@
   "admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost. When set, users will not be able to edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their own first name in Account Settings.",
   "admin.ldap.firstnameAttrEx": "E.g.: \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "First Name Attribute:",
-  "admin.ldap.idAttrDesc": "The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change, such as username or uid. If a user's ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the \"AD/LDAP Username\" field on the sign in page. Normally this attribute is the same as the \"Username Attribute\" field above. If your team typically uses domain\\\\username to sign in to other services with AD/LDAP, you may choose to put domain\\\\username in this field to maintain consistency between sites.",
-  "admin.ldap.idAttrEx": "E.g.: \"sAMAccountName\"",
+  "admin.ldap.idAttrDesc": "The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change. If a user's ID Attribute changes, it will create a new Mattermost account unassociated with their old one. If you need to change this after users have already logged in, you can use the CLI tool \"platform ldap idmigrate\"",
+  "admin.ldap.idAttrEx": "E.g.: \"objectGUID\"",
   "admin.ldap.idAttrTitle": "ID Attribute: ",
   "admin.ldap.jobExtraInfo": "Scanned {ldapUsers} LDAP users, updated {updateCount}, deactivated {deleteCount}",
   "admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost. When set, users will not be able to edit their last name, since it is synchronized with the LDAP server. When left blank, users can set their own last name in Account Settings.",
   "admin.ldap.lastnameAttrEx": "E.g.: \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
   "admin.ldap.ldap_test_button": "AD/LDAP Test",
+  "admin.ldap.loginAttrDesc": "The attribute in the AD/LDAP server that will be used by AD/LDAP users to login to Mattermost. This is the value used to log in to Mattermost in the \"AD/LDAP Username\" field on the sign in page. Normally this attribute is the same as the \"Username Attribute\" field above. If your team typically uses domain\\username to sign in to other services with AD/LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.",
+  "admin.ldap.loginAttrTitle": "Login ID Attribute: ",
+  "admin.ldap.loginIdAttrEx": "E.g.: \"sAMAccountName\"",
   "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"AD/LDAP Username\".",
   "admin.ldap.loginNameEx": "E.g.: \"AD/LDAP Username\"",
   "admin.ldap.loginNameTitle": "Login Field Name:",
@@ -667,7 +670,7 @@
   "admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
   "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
   "admin.ldap.testSuccess": "AD/LDAP Test Successful",
-  "admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
+  "admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the Login ID Attribute.",
   "admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "E.g.: \"(objectClass=user)\"",
   "admin.ldap.userFilterTitle": "User Filter:",
@@ -945,8 +948,6 @@
   "admin.service.corsTitle": "Enable cross-origin requests from:",
   "admin.service.developerDesc": "When true, JavaScript errors are shown in a purple bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "Enable Developer Mode: ",
-  "admin.service.enableAPIv3": "Allow use of API v3 endpoints:",
-  "admin.service.enableAPIv3Description": "Set to false to disable all version 3 endpoints of the REST API. Integrations that rely on API v3 will fail and can then be identified for migration to API v4. API v3 is deprecated and will be removed in the near future. See <a href='https://api.mattermost.com' target='_blank'>https://api.mattermost.com</a> for details.",
   "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
   "admin.service.enforceMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.forward80To443": "Forward port 80 to 443:",
@@ -1501,6 +1502,35 @@
   "claim.oauth_to_email.pwdNotMatch": "Password do not match.",
   "claim.oauth_to_email.switchTo": "Switch {type} to email and password",
   "claim.oauth_to_email.title": "Switch {type} Account to Email",
+  "combined_system_message.added_to_channel.many_expanded": "{users} and {lastUser} were <b>added to the channel</b> by {actor}.",
+  "combined_system_message.added_to_channel.one": "{firstUser} <b>added to the channel</b> by {actor}.",
+  "combined_system_message.added_to_channel.one_you": "You were <b>added to the channel</b> by {actor}.",
+  "combined_system_message.added_to_channel.two": "{firstUser} and {secondUser} <b>added to the channel</b> by {actor}.",
+  "combined_system_message.added_to_team.many_expanded": "{users} and {lastUser} were <b>added to the team</b> by {actor}.",
+  "combined_system_message.added_to_team.one": "{firstUser} <b>added to the team</b> by {actor}.",
+  "combined_system_message.added_to_team.one_you": "You were <b>added to the team</b> by {actor}.",
+  "combined_system_message.added_to_team.two": "{firstUser} and {secondUser} <b>added to the team</b> by {actor}.",
+  "combined_system_message.joined_channel.many_expanded": "{users} and {lastUser} <b>joined the channel</b>.",
+  "combined_system_message.joined_channel.one": "{firstUser} <b>joined the channel</b>.",
+  "combined_system_message.joined_channel.two": "{firstUser} and {secondUser} <b>joined the channel</b>.",
+  "combined_system_message.joined_team.many_expanded": "{users} and {lastUser} <b>joined the team</b>.",
+  "combined_system_message.joined_team.one": "{firstUser} <b>joined the team</b>.",
+  "combined_system_message.joined_team.two": "{firstUser} and {secondUser} <b>joined the team</b>.",
+  "combined_system_message.left_channel.many_expanded": "{users} and {lastUser} <b>left the channel</b>.",
+  "combined_system_message.left_channel.one": "{firstUser} <b>left the channel</b>.",
+  "combined_system_message.left_channel.two": "{firstUser} and {secondUser} <b>left the channel</b>.",
+  "combined_system_message.left_team.many_expanded": "{users} and {lastUser} <b>left the team</b>.",
+  "combined_system_message.left_team.one": "{firstUser} <b>left the team</b>.",
+  "combined_system_message.left_team.two": "{firstUser} and {secondUser} <b>left the team</b>.",
+  "combined_system_message.removed_from_channel.many_expanded": "{users} and {lastUser} were <b>removed from the channel</b>.",
+  "combined_system_message.removed_from_channel.one": "{firstUser} was <b>removed from the channel</b>.",
+  "combined_system_message.removed_from_channel.one_you": "You were <b>removed from the channel</b>.",
+  "combined_system_message.removed_from_channel.two": "{firstUser} and {secondUser} were <b>removed from the channel</b>.",
+  "combined_system_message.removed_from_team.many_expanded": "{users} and {lastUser} were <b>removed from the team</b>.",
+  "combined_system_message.removed_from_team.one": "{firstUser} was <b>removed from the team</b>.",
+  "combined_system_message.removed_from_team.one_you": "You were <b>removed from the team</b>.",
+  "combined_system_message.removed_from_team.two": "{firstUser} and {secondUser} were <b>removed from the team</b>.",
+  "combined_system_message.you": "You",
   "confirm_modal.cancel": "Cancel",
   "connecting_screen": "Connecting",
   "convert_channel.cancel": "No, cancel",
@@ -1933,6 +1963,16 @@
   "invite_member.sending": " Sending",
   "invite_member.teamInviteLink": "You can also invite people using the {link}.",
   "katex.error": "Couldn't compile your Latex code. Please review the syntax and try again.",
+  "last_users_message.added_to_channel.type": "were <b>added to the channel</b> by {actor}.",
+  "last_users_message.added_to_team.type": "were <b>added to the team</b> by {actor}.",
+  "last_users_message.first": "{firstUser} and ",
+  "last_users_message.joined_channel.type": "<b>joined the channel</b>.",
+  "last_users_message.joined_team.type": "<b>joined the team</b>.",
+  "last_users_message.left_channel.type": "<b>left the channel</b>.",
+  "last_users_message.left_team.type": "<b>left the team</b>.",
+  "last_users_message.others": "{numOthers} others ",
+  "last_users_message.removed_from_channel.type": "were <b>removed from the channel</b>.",
+  "last_users_message.removed_from_team.type": "were <b>removed from the team</b>.",
   "ldap_signup.find": "Find my teams",
   "ldap_signup.ldap": "Create team with AD/LDAP Account",
   "ldap_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
@@ -2715,10 +2755,11 @@
   "suggestion.mention.unread.channels": "Unread Channels",
   "suggestion.search.private": "Private Channels",
   "suggestion.search.public": "Public Channels",
+  "system_notice.adminVisible": "Only visible to System Admins",
   "system_notice.body.api3": "If you’ve created or installed integrations in the last two years, find out how <a href=\"https://about.mattermost.com/default-apiv3-deprecation-guide\" target=\"_blank\">upcoming changes</a> may affect them.",
   "system_notice.dont_show": "Don't show again",
   "system_notice.remind_me": "Remind me later",
-  "system_notice.title": "<strong>System Message</strong><br>from Mattermost",
+  "system_notice.title": "<strong>Notice</strong><br>from Mattermost",
   "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
   "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total, number} total",
   "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total, number} total",