summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorparanbaram <paranbaram@gmail.com>2016-08-23 03:16:38 +0900
committerHarrison Healey <harrisonmhealey@gmail.com>2016-08-22 14:16:38 -0400
commitffff24e6254494aa1b35354034047b4cf98ef504 (patch)
treebe67fbd6ac2935140e21079ab98b099fc0c632ab /webapp
parentec5f9d78892a53d7ae01430261e86ddfd8d4aa00 (diff)
downloadchat-ffff24e6254494aa1b35354034047b4cf98ef504.tar.gz
chat-ffff24e6254494aa1b35354034047b4cf98ef504.tar.bz2
chat-ffff24e6254494aa1b35354034047b4cf98ef504.zip
Change en.json : PLT-3371 (#3825)
* Change en.json : PLT-3371 * Change jsx files for UI text * Change jsx files for UI text
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/privacy_settings.jsx6
-rw-r--r--webapp/components/invite_member_modal.jsx4
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx2
-rw-r--r--webapp/components/user_settings/user_settings_notifications.jsx2
-rw-r--r--webapp/i18n/en.json14
5 files changed, 14 insertions, 14 deletions
diff --git a/webapp/components/admin_console/privacy_settings.jsx b/webapp/components/admin_console/privacy_settings.jsx
index 0a899635d..ef88a5fa1 100644
--- a/webapp/components/admin_console/privacy_settings.jsx
+++ b/webapp/components/admin_console/privacy_settings.jsx
@@ -56,7 +56,7 @@ export default class PrivacySettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.privacy.showEmailDescription'
- defaultMessage='When false, hides email address of users from other users in the user interface, including team owners and team administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.'
+ defaultMessage='When false, hides email address of users from other users in the user interface, including team owners and Team Administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.'
/>
}
value={this.state.showEmailAddress}
@@ -73,7 +73,7 @@ export default class PrivacySettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.privacy.showFullNameDescription'
- defaultMessage='When false, hides full name of users from other users, including team owners and team administrators. Username is shown in place of full name.'
+ defaultMessage='When false, hides full name of users from other users, including team owners and Team Administrators. Username is shown in place of full name.'
/>
}
value={this.state.showFullName}
@@ -82,4 +82,4 @@ export default class PrivacySettings extends AdminSettings {
</SettingsGroup>
);
}
-} \ No newline at end of file
+}
diff --git a/webapp/components/invite_member_modal.jsx b/webapp/components/invite_member_modal.jsx
index 1ba3b0c4e..e5ac63fc7 100644
--- a/webapp/components/invite_member_modal.jsx
+++ b/webapp/components/invite_member_modal.jsx
@@ -447,7 +447,7 @@ class InviteMemberModal extends React.Component {
<p>
<FormattedMessage
id='invite_member.content'
- defaultMessage='Email is currently disabled for your team, and email invitations cannot be sent. Contact your system administrator to enable email and email invitations.'
+ defaultMessage='Email is currently disabled for your team, and email invitations cannot be sent. Contact your System Administrator to enable email and email invitations.'
/>
</p>
{teamInviteLink}
@@ -459,7 +459,7 @@ class InviteMemberModal extends React.Component {
<p>
<FormattedMessage
id='invite_member.disabled'
- defaultMessage='User creation has been disabled for your team. Please ask your team administrator for details.'
+ defaultMessage='User creation has been disabled for your team. Please ask your Team Administrator for details.'
/>
</p>
</div>
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index 814773344..cc63e4fbf 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -330,7 +330,7 @@ class UserSettingsGeneralTab extends React.Component {
<div className='setting-list__hint text-danger'>
<FormattedMessage
id='user.settings.general.emailHelp2'
- defaultMessage='Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.'
+ defaultMessage='Email has been disabled by your System Administrator. No notification emails will be sent until it is enabled.'
/>
</div>
);
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index 17abfa555..e393bea03 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -365,7 +365,7 @@ export default class NotificationsTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.push_notification.disabled'
- defaultMessage='Disabled by system administrator'
+ defaultMessage='Disabled by System Administrator'
/>
);
} else {
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index e7f744941..b26e33cd6 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -513,9 +513,9 @@
"admin.password.requirementsDescription": "Character types required in a valid password.",
"admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
"admin.password.uppercase": "At least one uppercase letter",
- "admin.privacy.showEmailDescription": "When false, hides email address of users from other users in the user interface, including team owners and team administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.",
+ "admin.privacy.showEmailDescription": "When false, hides email address of users from other users in the user interface, including team owners and Team Administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.",
"admin.privacy.showEmailTitle": "Show Email Address: ",
- "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and team administrators. Username is shown in place of full name.",
+ "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and Team Administrators. Username is shown in place of full name.",
"admin.privacy.showFullNameTitle": "Show Full Name: ",
"admin.rate.enableLimiterDescription": "When true, APIs are throttled at rates specified below.",
"admin.rate.enableLimiterTitle": "Enable Rate Limiting: ",
@@ -1197,7 +1197,7 @@
"get_post_link_modal.help": "The link below allows authorized users to see your post.",
"get_post_link_modal.title": "Copy Permalink",
"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.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",
"installed_commands.header": "Slash Commands",
"help.attaching.downloading": "#### Downloading Files\nDownload an attached file by clicking the download icon next to the file thumbnail or by opening the file previewer and clicking **Download**.",
@@ -1367,8 +1367,8 @@
"invite_member.addAnother": "Add another",
"invite_member.autoJoin": "People invited automatically join the <strong>{channel}</strong> channel.",
"invite_member.cancel": "Cancel",
- "invite_member.content": "Email is currently disabled for your team, and email invitations cannot be sent. Contact your system administrator to enable email and email invitations.",
- "invite_member.disabled": "User creation has been disabled for your team. Please ask your team administrator for details.",
+ "invite_member.content": "Email is currently disabled for your team, and email invitations cannot be sent. Contact your System Administrator to enable email and email invitations.",
+ "invite_member.disabled": "User creation has been disabled for your team. Please ask your Team Administrator for details.",
"invite_member.emailError": "Please enter a valid email address",
"invite_member.firstname": "First name",
"invite_member.inviteLink": "Team Invite Link",
@@ -1791,7 +1791,7 @@
"user.settings.general.emailGitlabCantUpdate": "Login occurs through GitLab. Email cannot be updated. Email address used for notifications is {email}.",
"user.settings.general.emailGoogleCantUpdate": "Login occurs through Google. Email cannot be updated. Email address used for notifications is {email}.",
"user.settings.general.emailHelp1": "Email is used for sign-in, notifications, and password reset. Email requires verification if changed.",
- "user.settings.general.emailHelp2": "Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.",
+ "user.settings.general.emailHelp2": "Email has been disabled by your System Administrator. No notification emails will be sent until it is enabled.",
"user.settings.general.emailHelp3": "Email is used for sign-in, notifications, and password reset.",
"user.settings.general.emailHelp4": "A verification email was sent to {email}.",
"user.settings.general.emailLdapCantUpdate": "Login occurs through LDAP. Email cannot be updated. Email address used for notifications is {email}.",
@@ -1885,7 +1885,7 @@
"user.settings.notifications.usernameMention": "Your username mentioned \"@{username}\"",
"user.settings.notifications.wordsTrigger": "Words that trigger mentions",
"user.settings.push_notification.allActivity": "For all activity",
- "user.settings.push_notification.disabled": "Disabled by system administrator",
+ "user.settings.push_notification.disabled": "Disabled by System Administrator",
"user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.",
"user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.",
"user.settings.push_notification.off": "Off",