Created
March 16, 2021 19:05
-
-
Save marc1706/fbb369c966ed7f07bf0dabbf6900cff8 to your computer and use it in GitHub Desktop.
Language changes 3.3.3 to 3.3.4-RC1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php | |
| index 103a9cf89d..b76ae56ac0 100644 | |
| --- a/phpBB/language/en/captcha_recaptcha.php | |
| +++ b/phpBB/language/en/captcha_recaptcha.php | |
| @@ -44,10 +44,11 @@ $lang = array_merge($lang, [ | |
| 'CAPTCHA_RECAPTCHA' => 'reCaptcha v2', | |
| 'CAPTCHA_RECAPTCHA_V3' => 'reCaptcha v3', | |
| - 'RECAPTCHA_INCORRECT' => 'The solution you provided was incorrect', | |
| - 'RECAPTCHA_NOSCRIPT' => 'Please enable JavaScript in your browser to load the challenge.', | |
| - 'RECAPTCHA_NOT_AVAILABLE' => 'In order to use reCaptcha, you must create an account on <a href="https://www.google.com/recaptcha">www.google.com/recaptcha</a>.', | |
| - 'RECAPTCHA_INVISIBLE' => 'This CAPTCHA is actually invisible. To verify that it works, a small icon should appear in right bottom corner of this page.', | |
| + 'RECAPTCHA_INCORRECT' => 'The solution you provided was incorrect', | |
| + 'RECAPTCHA_NOSCRIPT' => 'Please enable JavaScript in your browser to load the challenge.', | |
| + 'RECAPTCHA_NOT_AVAILABLE' => 'In order to use reCaptcha, you must create an account on <a href="https://www.google.com/recaptcha">www.google.com/recaptcha</a>.', | |
| + 'RECAPTCHA_INVISIBLE' => 'This CAPTCHA is actually invisible. To verify that it works, a small icon should appear in right bottom corner of this page.', | |
| + 'RECAPTCHA_V3_LOGIN_ERROR_ATTEMPTS' => 'You have exceeded the maximum number of login attempts allowed.<br>In addition to your username and password the invisible reCAPTCHA v3 will be used to authenticate your session.', | |
| 'RECAPTCHA_PUBLIC' => 'Site key', | |
| 'RECAPTCHA_PUBLIC_EXPLAIN' => 'Your site reCAPTCHA key. Keys can be obtained on <a href="https://www.google.com/recaptcha">www.google.com/recaptcha</a>. Please, use reCAPTCHA v2 > Invisible reCAPTCHA badge type.', | |
| diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php | |
| index 2fc7eeb12a..7443f27be3 100644 | |
| --- a/phpBB/language/en/common.php | |
| +++ b/phpBB/language/en/common.php | |
| @@ -95,6 +95,7 @@ $lang = array_merge($lang, array( | |
| 'AUTH_PROVIDER_OAUTH_ERROR_INVALID_ENTRY' => 'Invalid database entry.', | |
| 'AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE' => 'Invalid service type provided to OAuth service handler.', | |
| 'AUTH_PROVIDER_OAUTH_ERROR_REQUEST' => 'Something went wrong when processing your OAuth request.', | |
| + 'AUTH_PROVIDER_OAUTH_RETURN_ERROR' => 'The external service returned a wrong value therefore your request can not be processed.', | |
| 'AUTH_PROVIDER_OAUTH_ERROR_SERVICE_NOT_CREATED' => 'OAuth service not created', | |
| 'AUTH_PROVIDER_OAUTH_SERVICE_BITLY' => 'Bitly', | |
| 'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK' => 'Facebook', | |
| diff --git a/phpBB/language/en/email/bookmark.txt b/phpBB/language/en/email/bookmark.txt | |
| index 95f17b5693..2ec8a35138 100644 | |
| --- a/phpBB/language/en/email/bookmark.txt | |
| +++ b/phpBB/language/en/email/bookmark.txt | |
| @@ -1,10 +1,10 @@ | |
| -Subject: Topic reply notification - "{TOPIC_TITLE}" | |
| +Subject: Reply in "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. | |
| +Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. | |
| -If you want to view the newest post made since your last visit, click the following link: | |
| +If you want to view the newest post click the following link: | |
| {U_NEWEST_POST} | |
| If you want to view the topic, click the following link: | |
| @@ -14,7 +14,6 @@ If you want to view the forum, click the following link: | |
| {U_FORUM} | |
| If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: | |
| - | |
| {U_NOTIFICATION_SETTINGS} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt | |
| index 1dfe8c652d..f0a260130b 100644 | |
| --- a/phpBB/language/en/email/forum_notify.txt | |
| +++ b/phpBB/language/en/email/forum_notify.txt | |
| @@ -1,10 +1,9 @@ | |
| -Subject: Forum post notification - "{FORUM_NAME}" | |
| +Subject: Reply in "{FORUM_NAME}" | |
| List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> | |
| Hello {USERNAME}, | |
| -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. | |
| - | |
| +The "{FORUM_NAME}" received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. | |
| {U_NEWEST_POST} | |
| If you want to view the topic, click the following link: | |
| @@ -13,8 +12,7 @@ If you want to view the topic, click the following link: | |
| If you want to view the forum, click the following link: | |
| {U_FORUM} | |
| -If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: | |
| - | |
| +If you no longer wish to watch this forum click the following link: | |
| {U_STOP_WATCHING_FORUM} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt | |
| index 0dfc9e43b4..fd946100e1 100644 | |
| --- a/phpBB/language/en/email/newtopic_notify.txt | |
| +++ b/phpBB/language/en/email/newtopic_notify.txt | |
| @@ -1,18 +1,15 @@ | |
| -Subject: New topic notification - "{FORUM_NAME}" | |
| +Subject: New topic in "{FORUM_NAME}" | |
| List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> | |
| Hello {USERNAME}, | |
| -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. | |
| - | |
| +The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more notifications will be sent until you visit the forum. | |
| {U_FORUM} | |
| -To see new topic directly, visit the following link: | |
| - | |
| +If you want to view the new topic, click the following link: | |
| {U_TOPIC} | |
| -If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: | |
| - | |
| +If you no longer wish to watch this forum click the following link: | |
| {U_STOP_WATCHING_FORUM} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt | |
| index 0202b9d374..0e29925f4d 100644 | |
| --- a/phpBB/language/en/email/pm_report_closed.txt | |
| +++ b/phpBB/language/en/email/pm_report_closed.txt | |
| @@ -2,6 +2,8 @@ Subject: Report closed - "{PM_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message. | |
| +The report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. | |
| + | |
| +If you have further questions, please contact {CLOSER_NAME} by private message. | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt | |
| index 991ed59f31..7c0f363d47 100644 | |
| --- a/phpBB/language/en/email/pm_report_deleted.txt | |
| +++ b/phpBB/language/en/email/pm_report_deleted.txt | |
| @@ -2,6 +2,6 @@ Subject: Report deleted - "{PM_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator. | |
| +The report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator. | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt | |
| index 854d785f5f..87e8acebb6 100644 | |
| --- a/phpBB/language/en/email/post_approved.txt | |
| +++ b/phpBB/language/en/email/post_approved.txt | |
| @@ -2,7 +2,7 @@ Subject: Post approved - "{POST_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator. | |
| +Your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator. | |
| If you want to view the post, click the following link: | |
| {U_VIEW_POST} | |
| diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt | |
| index 9b2ee643ff..11a0564cb8 100644 | |
| --- a/phpBB/language/en/email/post_disapproved.txt | |
| +++ b/phpBB/language/en/email/post_disapproved.txt | |
| @@ -2,7 +2,7 @@ Subject: Post disapproved - "{POST_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| +Your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| The following reason was given for the disapproval: | |
| diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt | |
| index 941f070d37..d3a8259a9a 100644 | |
| --- a/phpBB/language/en/email/post_in_queue.txt | |
| +++ b/phpBB/language/en/email/post_in_queue.txt | |
| @@ -1,8 +1,8 @@ | |
| -Subject: Post moderation notification - "{TOPIC_TITLE}" | |
| +Subject: Post needs aprroval - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval. | |
| +The post "{POST_SUBJECT}" at "{SITENAME}" needs approval. | |
| If you want to view the post, click the following link: | |
| {U_VIEW_POST} | |
| diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt | |
| index 41fdbb782c..442da23769 100644 | |
| --- a/phpBB/language/en/email/privmsg_notify.txt | |
| +++ b/phpBB/language/en/email/privmsg_notify.txt | |
| @@ -1,9 +1,8 @@ | |
| -Subject: New private message has arrived | |
| +Subject: New private message | |
| Hello {USERNAME}, | |
| -You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject: | |
| - | |
| +A new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject has arrived: | |
| {SUBJECT} | |
| You can view your new message by clicking on the following link: | |
| diff --git a/phpBB/language/en/email/quote.txt b/phpBB/language/en/email/quote.txt | |
| index 2b9525801f..592ce5493b 100644 | |
| --- a/phpBB/language/en/email/quote.txt | |
| +++ b/phpBB/language/en/email/quote.txt | |
| @@ -1,8 +1,8 @@ | |
| -Subject: Topic reply notification - "{TOPIC_TITLE}" | |
| +Subject: Quoted in "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made. | |
| +"{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". | |
| If you want to view the quoted post, click the following link: | |
| {U_VIEW_POST} | |
| @@ -14,7 +14,6 @@ If you want to view the forum, click the following link: | |
| {U_FORUM} | |
| If you no longer wish to receive updates about replies quoting you, please update your notification settings here: | |
| - | |
| {U_NOTIFICATION_SETTINGS} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt | |
| index 5ac9a8f878..df55fe33b2 100644 | |
| --- a/phpBB/language/en/email/report_closed.txt | |
| +++ b/phpBB/language/en/email/report_closed.txt | |
| @@ -2,7 +2,7 @@ Subject: Report closed - "{POST_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. | |
| +The report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a private message. | |
| You can view your reported post by clicking on the following link: | |
| diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt | |
| index 9a30ea2ddd..059d9999ff 100644 | |
| --- a/phpBB/language/en/email/report_deleted.txt | |
| +++ b/phpBB/language/en/email/report_deleted.txt | |
| @@ -2,6 +2,6 @@ Subject: Report deleted - "{POST_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator. | |
| +The report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator. | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt | |
| index a6b8086a9a..771646046b 100644 | |
| --- a/phpBB/language/en/email/report_pm.txt | |
| +++ b/phpBB/language/en/email/report_pm.txt | |
| @@ -2,7 +2,7 @@ Subject: Private Message report - "{SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. | |
| +A Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. | |
| If you want to view the report, click the following link: | |
| {U_VIEW_REPORT} | |
| diff --git a/phpBB/language/en/email/report_pm_closed.txt b/phpBB/language/en/email/report_pm_closed.txt | |
| index 4492fe881f..9ae9710f54 100644 | |
| --- a/phpBB/language/en/email/report_pm_closed.txt | |
| +++ b/phpBB/language/en/email/report_pm_closed.txt | |
| @@ -2,7 +2,7 @@ Subject: Private message report closed - "{SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the report you filed on the private message "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. | |
| +The report you filed on the private message "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a private message. | |
| You can view your reported private message by clicking on the following link: | |
| diff --git a/phpBB/language/en/email/report_post.txt b/phpBB/language/en/email/report_post.txt | |
| index 8eb24ec6af..1e50af1615 100644 | |
| --- a/phpBB/language/en/email/report_post.txt | |
| +++ b/phpBB/language/en/email/report_post.txt | |
| @@ -2,7 +2,7 @@ Subject: Post report - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported. | |
| +The post "{POST_SUBJECT}" at "{SITENAME}" was reported. | |
| If you want to view the report, click the following link: | |
| {U_VIEW_REPORT} | |
| diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt | |
| index 95f17b5693..963b644415 100644 | |
| --- a/phpBB/language/en/email/short/bookmark.txt | |
| +++ b/phpBB/language/en/email/short/bookmark.txt | |
| @@ -1,20 +1,13 @@ | |
| -Subject: Topic reply notification - "{TOPIC_TITLE}" | |
| +Subject: Reply in "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. | |
| +Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. | |
| If you want to view the newest post made since your last visit, click the following link: | |
| {U_NEWEST_POST} | |
| -If you want to view the topic, click the following link: | |
| -{U_TOPIC} | |
| - | |
| -If you want to view the forum, click the following link: | |
| -{U_FORUM} | |
| - | |
| If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: | |
| - | |
| {U_NOTIFICATION_SETTINGS} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt | |
| index b9416d8e40..e8f8c25b9e 100644 | |
| --- a/phpBB/language/en/email/short/newtopic_notify.txt | |
| +++ b/phpBB/language/en/email/short/newtopic_notify.txt | |
| @@ -1,13 +1,11 @@ | |
| -Subject: New topic notification - "{FORUM_NAME}" | |
| +Subject: New topic in "{FORUM_NAME}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. | |
| - | |
| +The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more notifications will be sent until you visit the forum. | |
| {U_FORUM} | |
| -If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: | |
| - | |
| +If you no longer wish to watch this forum click the following link: | |
| {U_STOP_WATCHING_FORUM} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt | |
| index 854d785f5f..87e8acebb6 100644 | |
| --- a/phpBB/language/en/email/short/post_approved.txt | |
| +++ b/phpBB/language/en/email/short/post_approved.txt | |
| @@ -2,7 +2,7 @@ Subject: Post approved - "{POST_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator. | |
| +Your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator. | |
| If you want to view the post, click the following link: | |
| {U_VIEW_POST} | |
| diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt | |
| index 9b2ee643ff..11a0564cb8 100644 | |
| --- a/phpBB/language/en/email/short/post_disapproved.txt | |
| +++ b/phpBB/language/en/email/short/post_disapproved.txt | |
| @@ -2,7 +2,7 @@ Subject: Post disapproved - "{POST_SUBJECT}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| +Your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| The following reason was given for the disapproval: | |
| diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt | |
| index 941f070d37..d3a8259a9a 100644 | |
| --- a/phpBB/language/en/email/short/post_in_queue.txt | |
| +++ b/phpBB/language/en/email/short/post_in_queue.txt | |
| @@ -1,8 +1,8 @@ | |
| -Subject: Post moderation notification - "{TOPIC_TITLE}" | |
| +Subject: Post needs aprroval - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval. | |
| +The post "{POST_SUBJECT}" at "{SITENAME}" needs approval. | |
| If you want to view the post, click the following link: | |
| {U_VIEW_POST} | |
| diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt | |
| index 41fdbb782c..0c579fa51c 100644 | |
| --- a/phpBB/language/en/email/short/privmsg_notify.txt | |
| +++ b/phpBB/language/en/email/short/privmsg_notify.txt | |
| @@ -1,13 +1,11 @@ | |
| -Subject: New private message has arrived | |
| +Subject: New private message | |
| Hello {USERNAME}, | |
| -You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject: | |
| - | |
| +A new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject has arrived: | |
| {SUBJECT} | |
| You can view your new message by clicking on the following link: | |
| - | |
| {U_VIEW_MESSAGE} | |
| You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile. | |
| diff --git a/phpBB/language/en/email/short/quote.txt b/phpBB/language/en/email/short/quote.txt | |
| index 2b9525801f..871f471037 100644 | |
| --- a/phpBB/language/en/email/short/quote.txt | |
| +++ b/phpBB/language/en/email/short/quote.txt | |
| @@ -1,20 +1,13 @@ | |
| -Subject: Topic reply notification - "{TOPIC_TITLE}" | |
| +Subject: Quoted in "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made. | |
| +"{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". | |
| If you want to view the quoted post, click the following link: | |
| {U_VIEW_POST} | |
| -If you want to view the topic, click the following link: | |
| -{U_TOPIC} | |
| - | |
| -If you want to view the forum, click the following link: | |
| -{U_FORUM} | |
| - | |
| If you no longer wish to receive updates about replies quoting you, please update your notification settings here: | |
| - | |
| {U_NOTIFICATION_SETTINGS} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt | |
| index a101a014ff..7a5f17a7d9 100644 | |
| --- a/phpBB/language/en/email/short/report_pm.txt | |
| +++ b/phpBB/language/en/email/short/report_pm.txt | |
| @@ -2,7 +2,7 @@ Subject: Private Message report - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. | |
| +A Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. | |
| If you want to view the report, click the following link: | |
| {U_VIEW_REPORT} | |
| diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt | |
| index 8eb24ec6af..1e50af1615 100644 | |
| --- a/phpBB/language/en/email/short/report_post.txt | |
| +++ b/phpBB/language/en/email/short/report_post.txt | |
| @@ -2,7 +2,7 @@ Subject: Post report - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported. | |
| +The post "{POST_SUBJECT}" at "{SITENAME}" was reported. | |
| If you want to view the report, click the following link: | |
| {U_VIEW_REPORT} | |
| diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt | |
| index 60c7ef4c09..132a15ea24 100644 | |
| --- a/phpBB/language/en/email/short/topic_approved.txt | |
| +++ b/phpBB/language/en/email/short/topic_approved.txt | |
| @@ -2,7 +2,7 @@ Subject: Topic approved - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator. | |
| +Your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator. | |
| If you want to view the topic, click the following link: | |
| {U_VIEW_TOPIC} | |
| diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt | |
| index 9c821e2bba..dfb0f29228 100644 | |
| --- a/phpBB/language/en/email/short/topic_disapproved.txt | |
| +++ b/phpBB/language/en/email/short/topic_disapproved.txt | |
| @@ -2,7 +2,7 @@ Subject: Topic disapproved - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| +Your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| The following reason was given for the disapproval: | |
| diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt | |
| index 706dddf64f..f4ed7b2ace 100644 | |
| --- a/phpBB/language/en/email/short/topic_in_queue.txt | |
| +++ b/phpBB/language/en/email/short/topic_in_queue.txt | |
| @@ -1,8 +1,8 @@ | |
| -Subject: Topic moderation notification - "{TOPIC_TITLE}" | |
| +Subject: Topic needs approval - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. | |
| +The topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. | |
| If you want to view the topic, click the following link: | |
| {U_VIEW_TOPIC} | |
| diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt | |
| index b1ed65727c..d92b342f33 100644 | |
| --- a/phpBB/language/en/email/short/topic_notify.txt | |
| +++ b/phpBB/language/en/email/short/topic_notify.txt | |
| @@ -1,20 +1,13 @@ | |
| -Subject: Topic reply notification - "{TOPIC_TITLE}" | |
| +Subject: Reply in "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. | |
| +The topic "{TOPIC_TITLE}" received a new reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more emails will be sent until you visit the topic. | |
| If you want to view the newest post made since your last visit, click the following link: | |
| {U_NEWEST_POST} | |
| -If you want to view the topic, click the following link: | |
| -{U_TOPIC} | |
| - | |
| -If you want to view the forum, click the following link: | |
| -{U_FORUM} | |
| - | |
| -If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link: | |
| - | |
| +If you no longer wish to watch this topic click the following link: | |
| {U_STOP_WATCHING_TOPIC} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt | |
| index 60c7ef4c09..132a15ea24 100644 | |
| --- a/phpBB/language/en/email/topic_approved.txt | |
| +++ b/phpBB/language/en/email/topic_approved.txt | |
| @@ -2,7 +2,7 @@ Subject: Topic approved - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator. | |
| +Your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator. | |
| If you want to view the topic, click the following link: | |
| {U_VIEW_TOPIC} | |
| diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt | |
| index 9c821e2bba..dfb0f29228 100644 | |
| --- a/phpBB/language/en/email/topic_disapproved.txt | |
| +++ b/phpBB/language/en/email/topic_disapproved.txt | |
| @@ -2,7 +2,7 @@ Subject: Topic disapproved - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| +Your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. | |
| The following reason was given for the disapproval: | |
| diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt | |
| index 706dddf64f..f4ed7b2ace 100644 | |
| --- a/phpBB/language/en/email/topic_in_queue.txt | |
| +++ b/phpBB/language/en/email/topic_in_queue.txt | |
| @@ -1,8 +1,8 @@ | |
| -Subject: Topic moderation notification - "{TOPIC_TITLE}" | |
| +Subject: Topic needs approval - "{TOPIC_TITLE}" | |
| Hello {USERNAME}, | |
| -You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. | |
| +The topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. | |
| If you want to view the topic, click the following link: | |
| {U_VIEW_TOPIC} | |
| diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt | |
| index 92bf85806e..ccef09fcbb 100644 | |
| --- a/phpBB/language/en/email/topic_notify.txt | |
| +++ b/phpBB/language/en/email/topic_notify.txt | |
| @@ -1,11 +1,11 @@ | |
| -Subject: Topic reply notification - "{TOPIC_TITLE}" | |
| +Subject: Reply in "{TOPIC_TITLE}" | |
| List-Unsubscribe: <{U_STOP_WATCHING_TOPIC}> | |
| Hello {USERNAME}, | |
| -You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic. | |
| +The topic "{TOPIC_TITLE}" received a new reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more emails will be sent until you visit the topic. | |
| -If you want to view the newest post made since your last visit, click the following link: | |
| +If you want to view the newest post click the following link: | |
| {U_NEWEST_POST} | |
| If you want to view the topic, click the following link: | |
| @@ -14,7 +14,7 @@ If you want to view the topic, click the following link: | |
| If you want to view the forum, click the following link: | |
| {U_FORUM} | |
| -If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link: | |
| +If you no longer wish to watch this topic click the following link: | |
| {U_STOP_WATCHING_TOPIC} | |
| {EMAIL_SIG} | |
| diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php | |
| index 22af52aaec..cd5e125831 100644 | |
| --- a/phpBB/language/en/ucp.php | |
| +++ b/phpBB/language/en/ucp.php | |
| @@ -225,7 +225,7 @@ $lang = array_merge($lang, array( | |
| 'FIELD_INVALID_VALUE' => 'The field “%s” has an invalid value.', | |
| 'FOE_MESSAGE' => 'Message from foe', | |
| - 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.', | |
| + 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Private messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.', | |
| 'FOES_UPDATED' => 'Your foes list has been updated successfully.', | |
| 'FOLDER_ADDED' => 'Folder successfully added.', | |
| 'FOLDER_MESSAGE_STATUS' => array( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment