* Updating user access token UI

Updating help text

Updating tokenlistClass

Updating string for token

Updating translations

Updating translations

Updating translations

* Updating translations

* Minor UI fix

* Update manage_tokens_modal.jsx

* Update user_settings_security.jsx

* Update en.json

* Fix merge conflicts
Этот коммит содержится в:
Asaad Mahmood
2017-08-07 05:23:16 +05:00
коммит произвёл Corey Hulen
родитель 178ccd16cb
Коммит 9eb8d93a0d
7 изменённых файлов: 104 добавлений и 96 удалений

Просмотреть файл

@@ -764,9 +764,9 @@
"admin.select_team.close": "Close",
"admin.select_team.select": "Select",
"admin.select_team.selectTeam": "Select Team",
"admin.service.userAccessTokensTitle": "Enable User Access Tokens: ",
"admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">user access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create user access tokens, go to the <strong>System Console > Users</strong> page.",
"admin.service.userAccessTokensNameLabel": "Name: ",
"admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ",
"admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens, go to the <strong>System Console > Users</strong> page.",
"admin.service.userAccessTokensDescLabel": "Name: ",
"admin.service.userAccessTokensIdLabel": "Token ID: ",
"admin.service.attemptDescription": "Number of login attempts allowed before a user is locked out and required to reset their password via email.",
"admin.service.attemptExample": "E.g.: \"10\"",
@@ -979,24 +979,24 @@
"admin.team_analytics.activeUsers": "Active Users With Posts",
"admin.team_analytics.totalPosts": "Total Posts",
"admin.true": "true",
"admin.manage_tokens.userAccessTokensNone": "No user access tokens.",
"admin.manage_tokens.manageTokensTitle": "Manage User Access Tokens",
"admin.manage_tokens.userAccessTokensDescription": "User access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">user access tokens</a>.",
"admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
"admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
"admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
"admin.manage_roles.saveError": "Unable to save roles.",
"admin.manage_roles.additionalRoles": "Select additional permissions for the account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Read more about roles and permissions</a>.",
"admin.manage_roles.postAllRoleTitle": "post:all",
"admin.manage_roles.postAllRole": "Access to post to all Mattermost channels including direct messages.",
"admin.manage_roles.postAllPublicRoleTitle": "post:channels",
"admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
"admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">user access tokens</a>.",
"admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
"admin.manage_roles.systemAdmin": "System Admin",
"admin.manage_roles.systemMember": "Member",
"admin.manage_roles.manageRolesTitle": "Manage Roles",
"admin.manage_roles.cancel": "Cancel",
"admin.manage_roles.save": "Save",
"admin.user_item.userAccessTokenPostAll": "(with post:all user access tokens)",
"admin.user_item.userAccessTokenPostAllPublic": "(with post:channels user access tokens)",
"admin.user_item.userAccessTokenYes": "(with user access tokens)",
"admin.user_item.userAccessTokenPostAll": "(with post:all personal access tokens)",
"admin.user_item.userAccessTokenPostAllPublic": "(with post:channels personal access tokens)",
"admin.user_item.userAccessTokenYes": "(with personal access tokens)",
"admin.user_item.authServiceEmail": "<strong>Sign-in Method:</strong> Email",
"admin.user_item.authServiceNotEmail": "<strong>Sign-in Method:</strong> {service}",
"admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
@@ -1352,7 +1352,7 @@
"delete_channel.cancel": "Cancel",
"delete_channel.confirm": "Confirm DELETE Channel",
"delete_channel.del": "Delete",
"delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. Are you sure you wish to delete the {display_name} channel?",
"delete_channel.question": "This will delete the channel from the team and make its contents inaccessible for all users. <br /><br />Are you sure you wish to delete the <strong>{display_name}</strong> channel?",
"delete_post.cancel": "Cancel",
"delete_post.comment": "Comment",
"delete_post.confirm": "Confirm {term} Delete",
@@ -2480,27 +2480,28 @@
"user.settings.push_notification.send": "Send mobile push notifications",
"user.settings.push_notification.status": "Trigger push notifications when",
"user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
"user.settings.tokens.confirmCreateTitle": "Create System Admin User Access Token",
"user.settings.tokens.confirmCreateMessage": "You are generating a user access token with System Admin permissions. Are you sure want to create this token?",
"user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token",
"user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?",
"user.settings.tokens.confirmCreateButton": "Yes, Create",
"user.settings.tokens.confirmDeleteTitle": "Delete {name} Token?",
"user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. Are you sure want to delete this token?",
"user.settings.tokens.confirmDeleteTitle": "Delete Token?",
"user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. <br /><br />Are you sure want to delete the <strong>{description}</strong> token?",
"user.settings.tokens.confirmDeleteButton": "Yes, Delete",
"user.settings.tokens.tokenId": "Token ID: ",
"user.settings.tokens.delete": "Delete",
"user.settings.tokens.userAccessTokensNone": "No user access tokens.",
"user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">User access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
"user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">User access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
"user.settings.tokens.name": "Name: ",
"user.settings.tokens.nameDescription": "Give a name for your token, so you remember what its used for. A token is generated after you hit \"Save\".",
"user.settings.tokens.userAccessTokensNone": "No personal access tokens.",
"user.settings.tokens.description": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>.",
"user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">Personal access tokens</a> function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">authenticate against the REST API</a>. Create new tokens on your desktop.",
"user.settings.tokens.name": "Token Description: ",
"user.settings.tokens.nameHelp": "Enter a description for your token to remember what it does.",
"user.settings.tokens.nameRequired": "Please enter a description.",
"user.settings.tokens.save": "Save",
"user.settings.tokens.cancel": "Cancel",
"user.settings.tokens.id": "ID: ",
"user.settings.tokens.token": "Token: ",
"user.settings.tokens.copy": "Please copy the token below. You won't be able to see it again!",
"user.settings.tokens.id": "Token ID: ",
"user.settings.tokens.token": "Access Token: ",
"user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!",
"user.settings.tokens.create": "Create New Token",
"user.settings.tokens.title": "User Access Tokens",
"user.settings.tokens.clickToEdit": "Click 'Edit' to manage your user access tokens",
"user.settings.tokens.title": "Personal Access Tokens",
"user.settings.tokens.clickToEdit": "Click 'Edit' to manage your personal access tokens",
"user.settings.security.active": "Active",
"user.settings.security.close": "Close",
"user.settings.security.currentPassword": "Current Password",