More translation fixes

components/admin_console/admin_definition.jsx

@@ -447,8 +447,8 @@ export default {
  label_default: 'Compliance Report Directory:',
  help_text: t('admin.compliance.directoryDescription'),
  help_text_default: 'Directory to which compliance reports are written. If blank, will be set to ./data/.',
- placeholder: t('admin.sql.maxOpenExample'),
- placeholder_default: 'E.g.: "10"',
+ placeholder: t('admin.compliance.directoryExample'),
+ placeholder_default: 'E.g.: "./data/"',
  isDisabled: needsUtils.stateValueFalse('ComplianceSettings.Enable'),
  isHidden: needsUtils.not(needsUtils.hasLicense),
  },
@@ -2136,6 +2136,17 @@ export default {
  placeholder_default: 'E.g.: "AKIADTOVBGERKLCBV"',
  isDisabled: needsUtils.not(needsUtils.stateValueEqual('FileSettings.DriverName', FILE_STORAGE_DRIVER_S3)),
  },
+ {
+ type: Constants.SettingsTypes.TYPE_TEXT,
+ key: 'FileSettings.AmazonS3Endpoint',
+ label: t('admin.image.amazonS3EndpointTitle'),
+ label_default: 'Amazon S3 Endpoint:',
+ help_text: t('admin.image.amazonS3EndpointDescription'),
+ help_text_default: 'Hostname of your S3 Compatible Storage provider. Defaults to "s3.amazonaws.com".',
+ placeholder: t('admin.image.amazonS3EndpointExample'),
+ placeholder_default: 'E.g.: "s3.amazonaws.com"',
+ isDisabled: needsUtils.not(needsUtils.stateValueEqual('FileSettings.DriverName', FILE_STORAGE_DRIVER_S3)),
+ },
  {
  type: Constants.SettingsTypes.TYPE_TEXT,
  key: 'FileSettings.AmazonS3SecretAccessKey',
@@ -2659,3 +2670,25 @@ export default {
  },
  },
 };
+
+t('admin.field_names.allowBannerDismissal');
+t('admin.field_names.bannerColor');
+t('admin.field_names.bannerText');
+t('admin.field_names.bannerTextColor');
+t('admin.field_names.enableBanner');
+t('admin.field_names.enableCommands');
+t('admin.field_names.enableConfirmNotificationsToChannel');
+t('admin.field_names.enableIncomingWebhooks');
+t('admin.field_names.enableOAuthServiceProvider');
+t('admin.field_names.enableOutgoingWebhooks');
+t('admin.field_names.enablePostIconOverride');
+t('admin.field_names.enablePostUsernameOverride');
+t('admin.field_names.enableUserAccessTokens');
+t('admin.field_names.enableUserCreation');
+t('admin.field_names.maxChannelsPerTeam');
+t('admin.field_names.maxNotificationsPerChannel');
+t('admin.field_names.maxUsersPerTeam');
+t('admin.field_names.postEditTimeLimit');
+t('admin.field_names.restrictCreationToDomains');
+t('admin.field_names.restrictDirectMessage');
+t('admin.field_names.teammateNameDisplay');

components/admin_console/permission_schemes_settings/permission_schemes_settings.jsx

@@ -273,6 +273,10 @@ t('admin.permissions.group.send_invites.description');
 t('admin.permissions.group.send_invites.name');
 t('admin.permissions.group.teams.description');
 t('admin.permissions.group.teams.name');
+t('admin.permissions.group.edit_posts.description');
+t('admin.permissions.group.edit_posts.name');
+t('admin.permissions.group.teams_team_scope.description');
+t('admin.permissions.group.teams_team_scope.name');
 t('admin.permissions.permission.assign_system_admin_role.description');
 t('admin.permissions.permission.assign_system_admin_role.name');
 t('admin.permissions.permission.create_direct_channel.description');
@@ -347,6 +351,8 @@ t('admin.permissions.permission.upload_file.description');
 t('admin.permissions.permission.upload_file.name');
 t('admin.permissions.permission.view_team.description');
 t('admin.permissions.permission.view_team.name');
+t('admin.permissions.permission.edit_others_posts.description');
+t('admin.permissions.permission.edit_others_posts.name');
 t('admin.permissions.roles.all_users.name');
 t('admin.permissions.roles.channel_admin.name');
 t('admin.permissions.roles.channel_user.name');

components/integrations/abstract_outgoing_webhook.jsx

@@ -508,7 +508,7 @@ export default class AbstractOutgoingWebhook extends React.Component {
  />
  <div className='form__help'>
  <FormattedMessage
- id='add_incoming_webhook.username.help'
+ id='add_outgoing_webhook.username.help'
  defaultMessage='Choose the username this integration will post as. Usernames can be up to 22 characters, and may contain lowercase letters, numbers and the symbols "-", "_", and ".".'
  />
  </div>

i18n/en.json

@@ -149,6 +149,7 @@
  "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly",
  "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word",
  "add_outgoing_webhook.username": "Username",
+ "add_outgoing_webhook.username.help": "Choose the username this integration will post as. Usernames can be up to 22 characters, and may contain lowercase letters, numbers and the symbols \"-\", \"_\", and \".\".",
  "add_teams_to_scheme.confirmation.accept": "Yes, Move Team",
  "add_teams_to_scheme.confirmation.message": "This team is already selected in another team scheme, are you sure you want to move it to this team scheme?",
  "add_teams_to_scheme.confirmation.title": "Team Override Scheme Change?",
@@ -228,6 +229,7 @@
  "admin.compliance_table.type": "Type",
  "admin.compliance_table.userId": "Requested By",
  "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
+ "admin.compliance.directoryExample": "E.g.: \"./data/\"",
  "admin.compliance.directoryTitle": "Compliance Report Directory:",
  "admin.compliance.enableDailyDesc": "When true, Mattermost will generate a daily compliance report.",
  "admin.compliance.enableDailyTitle": "Enable Daily Report:",
@@ -432,6 +434,27 @@
  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
  "admin.email.testing": "Testing...",
  "admin.false": "false",
+ "admin.field_names.allowBannerDismissal": "Allow banner dismissal",
+ "admin.field_names.bannerColor": "Banner color",
+ "admin.field_names.bannerText": "Banner text",
+ "admin.field_names.bannerTextColor": "Banner text color",
+ "admin.field_names.enableBanner": "Enable Announcement banner",
+ "admin.field_names.enableCommands": "Enable Custom Slash Commands",
+ "admin.field_names.enableConfirmNotificationsToChannel": "Show @channel and @all confirmation dialog",
+ "admin.field_names.enableIncomingWebhooks": "Enable Incoming Webhooks",
+ "admin.field_names.enableOAuthServiceProvider": "Enable OAuth 2.0 Service Provider",
+ "admin.field_names.enableOutgoingWebhooks": "Enable Outgoing Webhooks",
+ "admin.field_names.enablePostIconOverride": "Enable integrations to override profile picture icons",
+ "admin.field_names.enablePostUsernameOverride": "Enable integrations to override usernames",
+ "admin.field_names.enableUserAccessTokens": "Enable Personal Access Tokens",
+ "admin.field_names.enableUserCreation": "Enable Account Creation",
+ "admin.field_names.maxChannelsPerTeam": "Max Channels Per Team",
+ "admin.field_names.maxNotificationsPerChannel": "Max Notifications Per Channel",
+ "admin.field_names.maxUsersPerTeam": "Max Users Per Team",
+ "admin.field_names.postEditTimeLimit": "Edit post time limit",
+ "admin.field_names.restrictCreationToDomains": "Restrict account creation to specified email domains",
+ "admin.field_names.restrictDirectMessage": "Enable users to open Direct Message channels with",
+ "admin.field_names.teammateNameDisplay": "Teammate Name Display",
  "admin.file_upload.chooseFile": "Choose File",
  "admin.file_upload.noFile": "No file uploaded",
  "admin.file_upload.uploadFile": "Upload",
@@ -490,6 +513,9 @@
  "admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
  "admin.image.amazonS3BucketExample": "E.g.: \"mattermost-media\"",
  "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
+ "admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to \"s3.amazonaws.com\".",
+ "admin.image.amazonS3EndpointExample": "E.g.: \"s3.amazonaws.com\"",
+ "admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
  "admin.image.amazonS3IdDescription": "(Optional) Only required if you do not want to authenticate to S3 using an [IAM role](!https://about.mattermost.com/default-iam-role). Enter the Access Key ID provided by your Amazon EC2 administrator.",
  "admin.image.amazonS3IdExample": "E.g.: \"AKIADTOVBGERKLCBV\"",
  "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
@@ -704,6 +730,8 @@
  "admin.permissions.documentationLinkText": "documentation",
  "admin.permissions.group.delete_posts.description": "Delete own and others' posts.",
  "admin.permissions.group.delete_posts.name": "Delete Posts",
+ "admin.permissions.group.edit_posts.description": "Edit own and others' posts.",
+ "admin.permissions.group.edit_posts.name": "Edit Posts",
  "admin.permissions.group.integrations.description": "Manage OAuth 2.0, slash commands, webhooks and emoji.",
  "admin.permissions.group.integrations.name": "Integrations & Customizations",
  "admin.permissions.group.posts.description": "Write, edit and delete posts.",
@@ -716,6 +744,8 @@
  "admin.permissions.group.reactions.name": "Post Reactions",
  "admin.permissions.group.send_invites.description": "Add team members, send email invites and share team invite link.",
  "admin.permissions.group.send_invites.name": "Add Team Members",
+ "admin.permissions.group.teams_team_scope.description": "Manage team members.",
+ "admin.permissions.group.teams_team_scope.name": "Teams",
  "admin.permissions.group.teams.description": "Create teams and manage members.",
  "admin.permissions.group.teams.name": "Teams",
  "admin.permissions.inherited_from": "Inherited from <a>{name}</a>.",
@@ -746,6 +776,8 @@
  "admin.permissions.permission.delete_public_channel.name": "Archive Channels",
  "admin.permissions.permission.edit_other_users.description": "Edit other users",
  "admin.permissions.permission.edit_other_users.name": "Edit other users",
+ "admin.permissions.permission.edit_others_posts.description": "Allow users to edit others' posts.",
+ "admin.permissions.permission.edit_others_posts.name": "Edit Others' Posts",
  "admin.permissions.permission.edit_post.description": "{editTimeLimitButton} after posting, allow users to edit their own posts.",
  "admin.permissions.permission.edit_post.name": "Edit Own Posts",
  "admin.permissions.permission.import_team.description": "Import team",
@@ -1344,8 +1376,8 @@
  "analytics.team.totalPosts": "Total Posts",
  "analytics.team.totalUsers": "Total Active Users",
  "announcement_bar.error.email_verification_required": "Check your email at {email} to verify the address. Cannot find the email?",
- "announcement_bar.error.license_expired": "",
- "announcement_bar.error.license_expiring": "",
+ "announcement_bar.error.license_expired": "Enterprise license is expired and some features may be disabled. <a href='{link}' target='_blank'>Please renew</a>.",
+ "announcement_bar.error.license_expiring": "Enterprise license expires on {date}. <a href='{link}' target='_blank'>Please renew</a>.",
  "announcement_bar.error.past_grace": "Enterprise license is expired and some features may be disabled. Please contact your System Administrator for details.",
  "announcement_bar.error.preview_mode": "Preview Mode: Email notifications have not been configured",
  "announcement_bar.error.send_again": "Send again",
@@ -2978,4 +3010,4 @@
  "webrtc.unsupported": "{username} client does not support video calls.",
  "yourcomputer": "Your computer",
  "youtube_video.notFound": "Video not found"
-}
+}