Backport changes for the login page from hpbs branch

This commit is contained in:
yflory
2017-01-24 12:47:53 +01:00
parent 5e36d9ea29
commit 9d275daebb
5 changed files with 158 additions and 37 deletions

View File

@@ -63,8 +63,6 @@ define(function () {
out.userButton = 'USER';
out.userButtonTitle = 'Change your username';
out.changeNamePrompt = 'Change your name (leave empty to be anonymous): ';
out.user_login = "Log in";
out.user_logout = "Log out";
out.user_rename = "Change display name";
out.user_displayName = "Display name";
out.user_accountName = "Account name";
@@ -124,7 +122,7 @@ define(function () {
out.okButton = 'OK (enter)';
out.cancel = "cancel";
out.cancel = "Cancel";
out.cancelButton = 'Cancel (esc)';
out.forget = "Forget";
@@ -240,9 +238,10 @@ define(function () {
out.fo_unavailableName = "A file or a folder with the same name already exist at the new location. Rename the element and try again.";
// login
out.login_login = "log in";
out.login_register = "register";
out.logoutButton = "log out";
out.login_login = "Log in";
out.login_nologin = "Your browser's recent pads";
out.login_register = "Sign up";
out.logoutButton = "Log out";
out.login_migrate = "Would you like to migrate existing data from your anonymous session?";
@@ -252,7 +251,7 @@ define(function () {
out.login_username = "your username";
out.login_password = "your password";
out.login_confirm = "confirm your password";
out.login_remember = "remember me";
out.login_remember = "Remember me";
out.login_cancel_prompt = "...or if you may have entered the wrong username or password, cancel to try again.";
@@ -267,11 +266,6 @@ define(function () {
'<p><strong>Make sure you do not forget your username and password!</strong></p>',
].join('\n');
out.login_logout = [
//'<p>It seems you are already logged in</p>',
//'<p>Would you like to log out and authenticate as another user?</p>',
].join('\n');
out.login_hashing = "Hashing your password, this might take some time.";
out.login_no_user = "There is no user associated with the username and password that you entered.";
@@ -296,10 +290,19 @@ define(function () {
out.table_created = 'Created';
out.table_last = 'Last Accessed';
out.button_newpad = 'NEW RICH TEXT PAD';
out.button_newcode = 'NEW CODE PAD';
out.button_newpoll = 'NEW POLL';
out.button_newslide = 'NEW PRESENTATION';
out.button_newpad = 'New Rich Text pad';
out.button_newcode = 'New Code pad';
out.button_newpoll = 'New Poll';
out.button_newslide = 'New Presentation';
out.form_title = "All your pads, everywhere!";
out.form_username = "Username";
out.form_password = "Password";
out.about = "About";
out.privacy = "Privacy";
out.contact = "Contact";
out.terms = "ToS";
// privacy.html