Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Fixing some i18n missed strings #2563

Merged
merged 1 commit into from
Apr 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1277,7 +1277,7 @@
"admin.service.writeTimeout": "Write Timeout:",
"admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
"admin.set_by_env": "This setting has been set through an environment variable. It cannot be changed through the System Console.",
"admin.sidebar.access-control": "",
"admin.sidebar.access-control": "Access Control",
"admin.sidebar.advanced": "Advanced",
"admin.sidebar.announcement": "Announcement Banner",
"admin.sidebar.audits": "Compliance and Auditing",
Expand Down Expand Up @@ -1514,7 +1514,6 @@
"announcement_bar.error.license_expiring": "Enterprise license expires on {date, date, long}. [Please renew](!{link}).",
"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.site_url": "",
"announcement_bar.error.site_url_gitlab.full": "Please configure your [Site URL](https://docs.mattermost.com/administration/config-settings.html#site-url) in the [System Console](/admin_console/general/configuration) or in gitlab.rb if you're using GitLab Mattermost.",
"announcement_bar.error.site_url.full": "Please configure your [Site URL](https://docs.mattermost.com/administration/config-settings.html#site-url) in the [System Console](/admin_console/general/configuration).",
"announcement_bar.notification.email_verified": "Email verified",
Expand Down Expand Up @@ -2991,15 +2990,15 @@
"user.settings.general.emailSamlCantUpdate": "Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.",
"user.settings.general.emptyName": "Click 'Edit' to add your full name",
"user.settings.general.emptyNickname": "Click 'Edit' to add a nickname",
"user.settings.general.emptyPassword": "",
"user.settings.general.emptyPassword": "Please enter your current password.",
"user.settings.general.emptyPosition": "Click 'Edit' to add your job title / position",
"user.settings.general.field_handled_externally": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
"user.settings.general.firstName": "First Name",
"user.settings.general.fullName": "Full Name",
"user.settings.general.icon": "General Settings Icon",
"user.settings.general.imageTooLarge": "Unable to upload profile image. File is too large.",
"user.settings.general.imageUpdated": "Image last updated {date}",
"user.settings.general.incorrectPassword": "",
"user.settings.general.incorrectPassword": "Your password is incorrect.",
"user.settings.general.lastName": "Last Name",
"user.settings.general.loginGitlab": "Login done through GitLab ({email})",
"user.settings.general.loginGoogle": "Login done through Google ({email})",
Expand Down Expand Up @@ -3258,4 +3257,4 @@
"web.root.signup_info": "All team communication in one place, searchable and accessible anywhere",
"yourcomputer": "Your computer",
"youtube_video.notFound": "Video not found"
}
}
1 change: 0 additions & 1 deletion utils/constants.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,6 @@ export const AnnouncementBarMessages = {
LICENSE_EXPIRING: t('announcement_bar.error.license_expiring'),
LICENSE_PAST_GRACE: t('announcement_bar.error.past_grace'),
PREVIEW_MODE: t('announcement_bar.error.preview_mode'),
SITE_URL: t('announcement_bar.error.site_url'),
WEBSOCKET_PORT_ERROR: t('channel_loader.socketError'),
};

Expand Down