From 3f8dda6f5ad676c976fd5ae575a6790fdb505449 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 29 Jul 2016 14:58:37 -0400 Subject: PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660) * EE: Add Google and Office365 SSO through OAuth2 * Add localization strings * Text tweaks for PLT-3633 * Added sign-up button for Office 365 * Updated some error messages and a bit of licensing * Updated sign-in method section in user settings to include Google and Office365 * Added more localization strings --- i18n/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 5fad6d452..3e792f88a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1669,7 +1669,7 @@ }, { "id": "api.user.complete_switch_with_oauth.unavailable.app_error", - "translation": "{{.Service}} oauth not available on this server" + "translation": "{{.Service}} SSO through OAuth 2.0 not available on this server" }, { "id": "api.user.create_oauth_user.already_attached.app_error", @@ -1685,7 +1685,7 @@ }, { "id": "api.user.create_oauth_user.not_available.app_error", - "translation": "{{.Service}} oauth not available on this server" + "translation": "{{.Service}} SSO through OAuth 2.0 not available on this server" }, { "id": "api.user.create_profile_image.default_font.app_error", @@ -1797,7 +1797,7 @@ }, { "id": "api.user.login_by_oauth.not_available.app_error", - "translation": "{{.Service}} oauth not avlailable on this server" + "translation": "{{.Service}} SSO through OAuth 2.0 not available on this server" }, { "id": "api.user.login_by_oauth.parse.app_error", -- cgit v1.2.3-1-g7c22