Commit e63937be authored by enahum's avatar enahum Committed by Christopher Speller
Browse files

New Languages and translations (#3729)

parent cee22007
This diff is collapsed.
......@@ -84,8 +84,8 @@
"add_emoji.save": "Save",
"add_incoming_webhook.cancel": "Cancel",
"add_incoming_webhook.channel": "Channel",
"add_incoming_webhook.channelRequired": "A valid channel is required",
"add_incoming_webhook.channel.help": "Public channel or private group that receives the webhook payloads. You must belong to the private group when setting up the webhook.",
"add_incoming_webhook.channelRequired": "A valid channel is required",
"add_incoming_webhook.description": "Description",
"add_incoming_webhook.description.help": "Description for your incoming webhook.",
"add_incoming_webhook.displayName": "Display Name",
......@@ -110,10 +110,10 @@
"add_outgoing_webhook.cancel": "Cancel",
"add_outgoing_webhook.channel": "Channel",
"add_outgoing_webhook.channel.help": "Public channel to receive webhook payloads. Optional if at least one Trigger Word is specified.",
"add_outgoing_webhook.content_Type": "Content Type",
"add_outgoing_webhook.contentType.help1": "Choose the content type by which the response will be sent.",
"add_outgoing_webhook.contentType.help2": "If application/x-www-form-urlencoded is chosen, the server assumes you will be encoding the parameters in a URL format.",
"add_outgoing_webhook.contentType.help3": "If application/json is chosen, the server assumes you will posting JSON data.",
"add_outgoing_webhook.content_Type": "Content Type",
"add_outgoing_webhook.description": "Description",
"add_outgoing_webhook.description.help": "Description for your outgoing webhook.",
"add_outgoing_webhook.displayName": "Display Name",
......@@ -125,9 +125,9 @@
"add_outgoing_webhook.triggerWords.help": "Messages that start with one of the specified words will trigger the outgoing webhook. Optional if Channel is selected.",
"add_outgoing_webhook.triggerWordsOrChannelRequired": "A valid channel or a list of trigger words is required",
"add_outgoing_webhook.triggerWordsTriggerWhen": "Trigger When",
"add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
"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.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.",
"admin.audits.reload": "Reload User Activity Logs",
"admin.audits.title": "User Activity Logs",
"admin.authentication.email": "Email Auth",
......@@ -311,21 +311,6 @@
"admin.google.clientSecretTitle": "Client Secret:",
"admin.google.tokenTitle": "Token Endpoint:",
"admin.google.userTitle": "User API Endpoint:",
"admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use \"Mattermost - your-company-name\" as the <strong>Application Name</strong>.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.</li></ol>",
"admin.office365.authTitle": "Auth Endpoint:",
"admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
"admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
"admin.office365.clientIdTitle": "Application ID:",
"admin.office365.clientSecretDescription": "The Application Secret Password you generated when registering your application with Microsoft.",
"admin.office365.clientSecretExample": "Ex \"shAieM47sNBfgl20f8ci294\"",
"admin.office365.clientSecretTitle": "Application Secret Password:",
"admin.office365.tokenTitle": "Token Endpoint:",
"admin.office365.userTitle": "User API Endpoint:",
"admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
"admin.oauth.gitlab": "GitLab",
"admin.oauth.google": "Google Apps",
"admin.oauth.office365": "Office 365",
"admin.oauth.select": "Select OAuth 2.0 service provider:",
"admin.image.amazonS3BucketDescription": "Name you selected for your S3 bucket in AWS.",
"admin.image.amazonS3BucketExample": "Ex \"mattermost-media\"",
"admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
......@@ -470,6 +455,21 @@
"admin.notifications.email": "Email",
"admin.notifications.push": "Mobile Push",
"admin.notifications.title": "Notification Settings",
"admin.oauth.gitlab": "GitLab",
"admin.oauth.google": "Google Apps",
"admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
"admin.oauth.office365": "Office 365",
"admin.oauth.select": "Select OAuth 2.0 service provider:",
"admin.office365.EnableHtmlDesc": "<ol><li><a href='https://login.microsoftonline.com/'>Log in</a> to your Microsoft or Office 365 account. Make sure it's the account on the same <a href='https://msdn.microsoft.com/en-us/library/azure/jj573650.aspx#Anchor_0'>tenant</a> that you would like users to log in with.</li><li>Go to <a href='https://apps.dev.microsoft.com'>https://apps.dev.microsoft.com</a>, click <strong>Add an app</strong> and use <strong>Mattermost - <your-company-name></strong> as the application name.</li><li>Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and save it to later complete the field below.</li><li>Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong><your-mattermost-url>/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.</li><li>Finally, click <strong>Save</strong> and complete the <strong>Application ID</strong> and <strong>Application Secret Password</strong> fields below.</li></ol>",
"admin.office365.authTitle": "Auth Endpoint:",
"admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.",
"admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
"admin.office365.clientIdTitle": "Application ID:",
"admin.office365.clientSecretDescription": "The Application Secret Password you generated when registering your application with Microsoft.",
"admin.office365.clientSecretExample": "Ex \"shAieM47sNBfgl20f8ci294\"",
"admin.office365.clientSecretTitle": "Application Secret Password:",
"admin.office365.tokenTitle": "Token Endpoint:",
"admin.office365.userTitle": "User API Endpoint:",
"admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing external applications to authorize API requests to Mattermost.",
"admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
"admin.password.lowercase": "At least one lowercase letter",
......@@ -716,13 +716,13 @@
"admin.system_analytics.title": "the System",
"admin.system_analytics.totalPosts": "Total Posts",
"admin.team.brandDesc": "Enable custom branding to show an image of your choice, uploaded below, and some help text, written below, on the login page.",
"admin.team.brandDescriptionExample": "All team communication in one place, searchable and accessible anywhere",
"admin.team.brandDescriptionHelp": "Description of service shown in login screens and UI.",
"admin.team.brandDescriptionTitle": "Site Description",
"admin.team.brandImageTitle": "Custom Brand Image:",
"admin.team.brandTextDescription": "The custom branding Markdown-formatted text you would like to appear below your custom brand image on your login screen.",
"admin.team.brandTextTitle": "Custom Brand Text:",
"admin.team.brandTitle": "Enable Custom Branding: ",
"admin.team.brandDescriptionTitle": "Site Description",
"admin.team.brandDescriptionHelp": "Description of service shown in login screens and UI.",
"admin.team.brandDescriptionExample": "All team communication in one place, searchable and accessible anywhere",
"admin.team.chooseImage": "Choose New Image",
"admin.team.dirDesc": "When true, teams that are configured to show in team directory will show on main page inplace of creating a new team.",
"admin.team.dirTitle": "Enable Team Directory: ",
......@@ -1186,8 +1186,8 @@
"installed_integrations.regenToken": "Regenerate Token",
"installed_integrations.showSecret": "Show Secret",
"installed_integrations.token": "Token: {token}",
"installed_integrations.triggerWords": "Trigger Words: {triggerWords}",
"installed_integrations.triggerWhen": "Trigger When: {triggerWhen}",
"installed_integrations.triggerWords": "Trigger Words: {triggerWords}",
"installed_integrations.unnamed_oauth_app": "Unnamed OAuth 2.0 Application",
"installed_integrations.url": "URL: {url}",
"installed_oauth_apps.add": "Add OAuth 2.0 Application",
......@@ -1268,7 +1268,6 @@
"login.forgot": "I forgot my password",
"login.gitlab": "GitLab",
"login.google": "Google Apps",
"login.office365": "Office 365",
"login.invalidPassword": "Your password is incorrect.",
"login.ldapUsername": "LDAP Username",
"login.ldapUsernameLower": "LDAP username",
......@@ -1281,6 +1280,7 @@
"login.noPassword": "Please enter your password",
"login.noUsername": "Please enter your username",
"login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
"login.office365": "Office 365",
"login.on": "on {siteName}",
"login.or": "or",
"login.password": "Password",
......@@ -1484,12 +1484,12 @@
"signup_user_completed.expired": "You've already completed the signup process for this invitation or this invitation has expired.",
"signup_user_completed.gitlab": "with GitLab",
"signup_user_completed.google": "with Google",
"signup_user_completed.office365": "with Office 365",
"signup_user_completed.haveAccount": "Already have an account?",
"signup_user_completed.invalid_invite": "The invite link was invalid. Please speak with your Administrator to receive an invitation.",
"signup_user_completed.lets": "Let's create your account",
"signup_user_completed.no_open_server": "This server does not allow open signups. Please speak with your Administrator to receive an invitation.",
"signup_user_completed.none": "No user creation method has been enabled. Please contact an administrator for access.",
"signup_user_completed.office365": "with Office 365",
"signup_user_completed.onSite": "on {siteName}",
"signup_user_completed.or": "or",
"signup_user_completed.passwordLength": "Please enter at least {min} characters",
......@@ -1650,13 +1650,13 @@
"user.settings.general.email": "Email",
"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.emailOffice365CantUpdate": "Login occurs through Office 365. 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.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}.",
"user.settings.general.emailMatch": "The new emails you entered do not match.",
"user.settings.general.emailOffice365CantUpdate": "Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.",
"user.settings.general.emailSamlCantUpdate": "Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.",
"user.settings.general.emailUnchanged": "Your new email address is the same as your old email address.",
"user.settings.general.emptyName": "Click 'Edit' to add your full name",
......@@ -1669,8 +1669,8 @@
"user.settings.general.lastName": "Last Name",
"user.settings.general.loginGitlab": "Login done through GitLab ({email})",
"user.settings.general.loginGoogle": "Login done through Google ({email})",
"user.settings.general.loginOffice365": "Login done through Office 365 ({email})",
"user.settings.general.loginLdap": "Login done through LDAP ({email})",
"user.settings.general.loginOffice365": "Login done through Office 365 ({email})",
"user.settings.general.loginSaml": "Login done through SAML ({email})",
"user.settings.general.newAddress": "New Address: {email}<br />Check your email to verify the above address.",
"user.settings.general.nickname": "Nickname",
......@@ -1750,7 +1750,6 @@
"user.settings.security.emailPwd": "Email and Password",
"user.settings.security.gitlab": "GitLab",
"user.settings.security.google": "Google",
"user.settings.security.office365": "Office 365",
"user.settings.security.lastUpdated": "Last updated {date} at {time}",
"user.settings.security.ldap": "LDAP",
"user.settings.security.loginGitlab": "Login done through Gitlab",
......@@ -1758,6 +1757,7 @@
"user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
"user.settings.security.method": "Sign-in Method",
"user.settings.security.newPassword": "New Password",
"user.settings.security.office365": "Office 365",
"user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
"user.settings.security.password": "Password",
"user.settings.security.passwordError": "Your password must contain at least {min} characters.",
......@@ -1785,8 +1785,8 @@
"user.settings.security.switchEmail": "Switch to using email and password",
"user.settings.security.switchGitlab": "Switch to using GitLab SSO",
"user.settings.security.switchGoogle": "Switch to using Google SSO",
"user.settings.security.switchOffice365": "Switch to using Office 365 SSO",
"user.settings.security.switchLdap": "Switch to using LDAP",
"user.settings.security.switchOffice365": "Switch to using Office 365 SSO",
"user.settings.security.switchSaml": "Switch to using SAML SSO",
"user.settings.security.title": "Security Settings",
"user.settings.security.viewHistory": "View Access History",
......
This diff is collapsed.
This diff is collapsed.
......@@ -5,9 +5,11 @@ const de = require('!!file?name=i18n/[name].[hash].[ext]!./de.json');
const es = require('!!file?name=i18n/[name].[hash].[ext]!./es.json');
const fr = require('!!file?name=i18n/[name].[hash].[ext]!./fr.json');
const ja = require('!!file?name=i18n/[name].[hash].[ext]!./ja.json');
const ko = require('!!file?name=i18n/[name].[hash].[ext]!./ko.json');
const nl = require('!!file?name=i18n/[name].[hash].[ext]!./nl.json');
const pt_BR = require('!!file?name=i18n/[name].[hash].[ext]!./pt-BR.json'); //eslint-disable-line camelcase
const zh_TW = require('!!file?name=i18n/[name].[hash].[ext]!./zh_TW.json'); //eslint-disable-line camelcase
const zh_CN = require('!!file?name=i18n/[name].[hash].[ext]!./zh_CN.json'); //eslint-disable-line camelcase
import {addLocaleData} from 'react-intl';
import deLocaleData from 'react-intl/locale-data/de';
......@@ -15,6 +17,7 @@ import enLocaleData from 'react-intl/locale-data/en';
import esLocaleData from 'react-intl/locale-data/es';
import frLocaleData from 'react-intl/locale-data/fr';
import jaLocaleData from 'react-intl/locale-data/ja';
import koLocaleData from 'react-intl/locale-data/ko';
import nlLocaleData from 'react-intl/locale-data/nl';
import ptLocaleData from 'react-intl/locale-data/pt';
import zhLocaleData from 'react-intl/locale-data/zh';
......@@ -33,7 +36,7 @@ const languages = {
},
es: {
value: 'es',
name: 'Español (Beta)',
name: 'Español',
url: es
},
fr: {
......@@ -46,6 +49,11 @@ const languages = {
name: '日本語 (Beta)',
url: ja
},
ko: {
value: 'ko',
name: '한국어 (Beta)',
url: ko
},
nl: {
value: 'nl',
name: 'Nederlands (Beta)',
......@@ -53,13 +61,18 @@ const languages = {
},
'pt-BR': {
value: 'pt-BR',
name: 'Portugues (Beta)',
name: 'Português (Brasil)',
url: pt_BR
},
'zh-TW': {
value: 'zh-TW',
name: '中文 (繁體) (Beta)',
url: zh_TW
},
'zh-CN': {
value: 'zh-CN',
name: '中文 (简体) (Beta)',
url: zh_CN
}
};
......@@ -112,6 +125,7 @@ export function safariFix(callback) {
'intl/locale-data/jsonp/es.js',
'intl/locale-data/jsonp/fr.js',
'intl/locale-data/jsonp/ja.js',
'intl/locale-data/jsonp/ko.js',
'intl/locale-data/jsonp/nl.js',
'intl/locale-data/jsonp/pt.js',
'intl/locale-data/jsonp/zh.js'
......@@ -122,6 +136,7 @@ export function safariFix(callback) {
require('intl/locale-data/jsonp/es.js');
require('intl/locale-data/jsonp/fr.js');
require('intl/locale-data/jsonp/ja.js');
require('intl/locale-data/jsonp/ko.js');
require('intl/locale-data/jsonp/nl.js');
require('intl/locale-data/jsonp/pt.js');
require('intl/locale-data/jsonp/zh.js');
......@@ -135,6 +150,7 @@ export function doAddLocaleData() {
addLocaleData(esLocaleData);
addLocaleData(frLocaleData);
addLocaleData(jaLocaleData);
addLocaleData(koLocaleData);
addLocaleData(nlLocaleData);
addLocaleData(ptLocaleData);
addLocaleData(zhLocaleData);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment