From 463fd8c20b6e20d1cc669810c339770b9b1ede41 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 17 Mar 2016 15:46:16 -0400
Subject: Add the ability to switch from email to ldap and back

---
 webapp/i18n/en.json | 55 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 15 deletions(-)

(limited to 'webapp/i18n/en.json')

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index d9411df07..34e938e69 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -633,21 +633,45 @@
   "choose_auth_page.ldapCreate": "Create new team with LDAP Account",
   "choose_auth_page.noSignup": "No sign-up methods configured, please contact your system administrator.",
   "claim.account.noEmail": "No email specified",
-  "claim.email_to_sso.enterPwd": "Enter the password for your {team} {site} account",
-  "claim.email_to_sso.pwd": "Password",
-  "claim.email_to_sso.pwdError": "Please enter your password.",
-  "claim.email_to_sso.ssoNote": "You must already have a valid {type} account",
-  "claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
-  "claim.email_to_sso.switchTo": "Switch account to {uiType}",
-  "claim.email_to_sso.title": "Switch Email/Password Account to {uiType}",
-  "claim.sso_to_email.confirm": "Confirm Password",
-  "claim.sso_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.",
-  "claim.sso_to_email.enterPwd": "Please enter a password.",
-  "claim.sso_to_email.newPwd": "New Password",
-  "claim.sso_to_email.pwdNotMatch": "Password do not match.",
-  "claim.sso_to_email.switchTo": "Switch {type} to email and password",
-  "claim.sso_to_email.title": "Switch {type} Account to Email",
-  "claim.sso_to_email_newPwd": "Enter a new password for your {team} {site} account",
+  "claim.email_to_oauth.enterPwd": "Enter the password for your {team} {site} account",
+  "claim.email_to_oauth.pwd": "Password",
+  "claim.email_to_oauth.pwdError": "Please enter your password.",
+  "claim.email_to_oauth.ssoNote": "You must already have a valid {type} account",
+  "claim.email_to_oauth.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
+  "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
+  "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}",
+  "claim.oauth_to_email.confirm": "Confirm Password",
+  "claim.oauth_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.",
+  "claim.oauth_to_email.enterPwd": "Please enter a password.",
+  "claim.oauth_to_email.newPwd": "New Password",
+  "claim.oauth_to_email.pwdNotMatch": "Password do not match.",
+  "claim.oauth_to_email.switchTo": "Switch {type} to email and password",
+  "claim.oauth_to_email.title": "Switch {type} Account to Email",
+  "claim.oauth_to_email.newPwd": "Enter a new password for your {team} {site} account",
+  "claim.email_to_ldap.pwdError": "Please enter your password.",
+  "claim.email_to_ldap.ldapIdError": "Please enter your LDAP ID.",
+  "claim.email_to_ldap.ldapPasswordError": "Please enter your LDAP password.",
+  "claim.email_to_ldap.title": "Switch Email/Password Account to LDAP",
+  "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with LDAP",
+  "claim.email_to_ldap.ssoNote": "You must already have a valid LDAP account",
+  "claim.email_to_ldap.enterPwd": "Enter the password for your {team} {site} email account",
+  "claim.email_to_ldap.pwd": "Password",
+  "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your LDAP account",
+  "claim.email_to_ldap.ldapId": "LDAP ID",
+  "claim.email_to_ldap.ldapPwd": "LDAP Password",
+  "claim.email_to_ldap.switchTo": "Switch account to LDAP",
+  "claim.ldap_to_email.pwdError": "Please enter your password.",
+  "claim.ldap_to_email.pwdNotMatch": "Passwords do not match.",
+  "claim.ldap_to_email.ldapPasswordError": "Please enter your LDAP password.",
+  "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password",
+  "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
+  "claim.ldap_to_email.email": "You will use the email {email} to login",
+  "claim.ldap_to_email.enterLdapPwd": "Enter your LDAP password for your {team} {site} email account",
+  "claim.ldap_to_email.ldapPwd": "LDAP Password",
+  "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+  "claim.ldap_to_email.pwd": "Password",
+  "claim.ldap_to_email.confirm": "Confirm Password",
+  "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "confirm_modal.cancel": "Cancel",
   "create_comment.addComment": "Add a comment...",
   "create_comment.comment": "Add Comment",
@@ -1335,6 +1359,7 @@
   "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.switchLda": "Switch to using LDAP",
   "user.settings.security.title": "Security Settings",
   "user.settings.security.viewHistory": "View Access History",
   "user_list.notFound": "No users found :(",
-- 
cgit v1.2.3-1-g7c22