From 1ca781c9f4fa5a813fff5ec5bb6612ecbc5ed8fe Mon Sep 17 00:00:00 2001 From: Michael Kielstra Date: Fri, 27 Jul 2018 14:11:45 +0100 Subject: [PATCH 1/2] Grammatical edits Some of the English localised strings were clunky or grammatically incorrect. --- e107_languages/English/lan_error.php | 6 +++--- e107_languages/English/lan_fpw.php | 8 ++++---- e107_languages/English/lan_login.php | 6 +++--- e107_languages/English/lan_signup.php | 14 +++++++------- e107_languages/English/lan_sitedown.php | 1 - 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/e107_languages/English/lan_error.php b/e107_languages/English/lan_error.php index 7ea413f67..923808572 100644 --- a/e107_languages/English/lan_error.php +++ b/e107_languages/English/lan_error.php @@ -13,11 +13,11 @@ define("PAGE_NAME", "Error"); define("LAN_ERROR_TITLE", "Oops!"); define("LAN_ERROR_1", "Error 401 - Authentication Failed"); -define("LAN_ERROR_2", "The URL you've requested requires a correct username and password. Either you entered an incorrect username/password, or your browser doesn't support this feature."); +define("LAN_ERROR_2", "The URL you've requested requires a username and password. Either you entered one incorrectly, or your browser doesn't support this feature."); define("LAN_ERROR_3", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); define("LAN_ERROR_4", "Error 403 - Access forbidden"); -define("LAN_ERROR_5", "You are not permitted to retrieve the URL or link you requested."); +define("LAN_ERROR_5", "You are not permitted to retrieve the document or page you requested."); define("LAN_ERROR_6", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); define("LAN_ERROR_7", "Error 404 - Document Not Found"); @@ -52,7 +52,7 @@ define("LAN_ERROR_33", "Processing error! Normally, I would redirect to the home define("LAN_ERROR_34", "Unknown error! Please inform the site administrator you saw this:"); define("LAN_ERROR_35", "Error 400 - Bad Request"); -define("LAN_ERROR_36", "There is a formatting error in the web page you are trying to access."); +define("LAN_ERROR_36", "There is a formatting error in the URL you are trying to access."); define("LAN_ERROR_37", "Error Icon"); define("LAN_ERROR_38", "Sorry, but the site is unavailable due to a temporary fault"); define("LAN_ERROR_39", "Please try again in a few minutes"); diff --git a/e107_languages/English/lan_fpw.php b/e107_languages/English/lan_fpw.php index 95cb95ac0..b67afbe99 100644 --- a/e107_languages/English/lan_fpw.php +++ b/e107_languages/English/lan_fpw.php @@ -10,7 +10,7 @@ define("PAGE_NAME", "Password Reset"); define("LAN_02", "Sorry, unable to send email - please contact the main site administrator."); define("LAN_03", "Password Reset"); -define("LAN_05", "To reset your password please enter the following information"); +define("LAN_05", "To reset your password, please enter the following information"); define("LAN_06", "Attempted password reset"); define("LAN_07", "Someone with IP address "); define("LAN_08", "attempted to reset the main admin password."); @@ -20,13 +20,13 @@ define("LAN_112", "Email address registered on this site"); define("LAN_213", "That username/email address was not found in database."); define("LAN_214", "Unable to reset password"); // define("LAN_216", "To validate your new password please go to the following URL ..."); -// define("LAN_217", "Your new password is now validated, you may now login using your new password."); +// define("LAN_217", "Your new password is now validated. You may now log in using it."); define("LAN_218", "Your username is:"); // define("LAN_219", "The password associated with that email address has already been reset and cannot be reset again. Please contact the site administrator for more details."); define("LAN_FPW1", "Username"); // define("LAN_FPW2", "Enter code"); // define("LAN_FPW3", "Incorrect code entered"); -define("LAN_FPW4", "A request has already been sent to reset this password, if you did not receive the email, please contact the site administrator for help."); +define("LAN_FPW4", "A request has already been sent to reset this password. If you did not receive the email, please contact the site administrator for help."); define("LAN_FPW5", "A request to reset your password for"); define("LAN_FPW6", "An email has been sent to you with a link that will allow you to reset your password."); define("LAN_FPW7", "This is not a valid link to reset your password.
Please contact the site administrator for more details."); @@ -48,7 +48,7 @@ define("LAN_FPW21", "User clicked on password reset link"); define("LAN_FPW_100", "Forgot your password?"); -define("LAN_FPW_101", "Not to worry. Just enter your email address below and we'll send you an instruction email for recovery."); +define("LAN_FPW_101", "Not to worry. Just enter your email address below and we'll send you an email with instructions to get it back."); define("LAN_FPW_102", "Reset Password"); ?> diff --git a/e107_languages/English/lan_login.php b/e107_languages/English/lan_login.php index 2eeec2470..952811dbe 100644 --- a/e107_languages/English/lan_login.php +++ b/e107_languages/English/lan_login.php @@ -13,7 +13,7 @@ define("LAN_LOGIN_1", "User name"); define("LAN_LOGIN_2", "User password"); define("LAN_LOGIN_3", "Protected server"); define("LAN_LOGIN_4", "Please sign in"); // XXX Modified -define("LAN_LOGIN_5", "Click here to Sign-Up"); +define("LAN_LOGIN_5", "Click here to sign up"); define("LAN_LOGIN_6", "Not accepting new members at this time"); define("LAN_LOGIN_7", "Enter visible code"); define("LAN_LOGIN_8", "Remember Me"); @@ -29,8 +29,8 @@ define("LAN_LOGIN_17", "User password (hashed)"); define("LAN_LOGIN_18", "Auto-ban: More than [x] failed login attempts"); define("LAN_LOGIN_19", "> 10 failed login attempts"); define("LAN_LOGIN_20", "You left required field(s) blank"); -define("LAN_LOGIN_21", "Incorrect login. The entered data doesn't match to a registered user. Check if you have the CAPS-LOCK key activated as logins on this site are case sensitive"); -define("LAN_LOGIN_22", "You have not activated your account. You should have received an email with instructions on how to confirm your account. If not, please click [here]."); +define("LAN_LOGIN_21", "Your login details don't match any registered user. Check if you have the CAPS-LOCK key activated, as logins on this site are case sensitive."); +define("LAN_LOGIN_22", "You have not activated your account. You should have received an email with instructions on how to do so. If not, please click [here]."); define("LAN_LOGIN_23", "Incorrect code entered."); define("LAN_LOGIN_24", "That username/password combination is already in use."); define("LAN_LOGIN_25", "Banned user attempted to login"); diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index 05688e97b..30bb6af0d 100644 --- a/e107_languages/English/lan_signup.php +++ b/e107_languages/English/lan_signup.php @@ -12,16 +12,16 @@ define("PAGE_NAME", "Register"); /* -//define("LAN_103", "That username cannot be accepted as valid, please choose a different user name"); -//define("LAN_104", "That username already exists in the database, please choose a different username"); -//define("LAN_105", "The two passwords do not match"); +//define("LAN_103", "That username is invalid. Please choose a different one"); +//define("LAN_104", "That username is taken. Please choose a different one"); +//define("LAN_105", "The two passwords don't match"); //define("LAN_106", "That doesn"t appear to be a valid email address"); define("LAN_108", "Registration complete"); define("LAN_185", "You left required field(s) blank"); // define("LAN_201", "Yes"); // define("LAN_200", "No"); // define("LAN_399", "Continue"); -define("LAN_407", "Please keep this email for your own information. Your password has been encrypted and cannot be retrieved if you misplace or forget it. You can however request a new password if this happens.\n\nThanks for your registration.\n\nFrom"); +define("LAN_407", "Please keep this email for your own information. Your password has been encrypted and cannot be retrieved if you misplace or forget it. You can, however, request a new password if this happens.\n\nThank you for registering.\n\nFrom"); //define("LAN_408", "A user with that email address already exists. Please use the "forgot password" screen to retrieve your password."); //define("LAN_409", "Invalid characters in username"); @@ -30,8 +30,8 @@ define("LAN_407", "Please keep this email for your own information. Your passwor define("LAN_EMAIL_01", "Dear"); define("LAN_EMAIL_04", "Please keep this email for your own information."); -define("LAN_EMAIL_05", "Your password has been encrypted and cannot be retrieved if you misplace or forget it. You can however request a new password if this happens."); -define("LAN_EMAIL_06", "Thanks for your registration."); +define("LAN_EMAIL_05", "Your password has been encrypted and cannot be retrieved if you misplace or forget it. You can, however, request a new password if this happens."); +define("LAN_EMAIL_06", "Thank you for registering."); define("LAN_SIGNUP_1", "Min."); @@ -45,7 +45,7 @@ define("LAN_SIGNUP_8", "Thank you!"); define("LAN_SIGNUP_9", "Unable to proceed."); //define("LAN_SIGNUP_10", "Yes"); define("LAN_SIGNUP_11", "."); -define("LAN_SIGNUP_12", "please keep your username and password written down in a safe place as if lost they cannot be retrieved."); +define("LAN_SIGNUP_12", "please keep your username and password written down in a safe place as they cannot be retrieved if you lose them."); define("LAN_SIGNUP_13", "You can now log in from the Login box, or from [here]."); define("LAN_SIGNUP_14", "here"); define("LAN_SIGNUP_15", "Please contact the main site admin"); diff --git a/e107_languages/English/lan_sitedown.php b/e107_languages/English/lan_sitedown.php index c2ef41da4..df1ca19f7 100644 --- a/e107_languages/English/lan_sitedown.php +++ b/e107_languages/English/lan_sitedown.php @@ -11,5 +11,4 @@ */ define("PAGE_NAME", "Site temporarily closed"); define("LAN_SITEDOWN_00", "is temporarily closed"); -define("LAN_SITEDOWN_01", "We have temporarily closed the site for some essential maintenance. This shouldn't take too long - please check back soon, apologies for the inconvenience."); ?> From ba6c7a3c0e04087f2a7eb12e790d7fb6365b8ebd Mon Sep 17 00:00:00 2001 From: Michael Kielstra Date: Fri, 27 Jul 2018 17:51:32 +0100 Subject: [PATCH 2/2] Add LAN_SITEDOWN_01 back --- e107_languages/English/lan_sitedown.php | 1 + 1 file changed, 1 insertion(+) diff --git a/e107_languages/English/lan_sitedown.php b/e107_languages/English/lan_sitedown.php index df1ca19f7..cdd23f2cb 100644 --- a/e107_languages/English/lan_sitedown.php +++ b/e107_languages/English/lan_sitedown.php @@ -11,4 +11,5 @@ */ define("PAGE_NAME", "Site temporarily closed"); define("LAN_SITEDOWN_00", "is temporarily closed"); +define("LAN_SITEDOWN_01", "We have temporarily closed the site for some essential maintenance. This shouldn't take too long - please check back soon. We apologise for the inconvenience."); ?>