From a9a28859d4852be72ce782d079ee3183c4d54852 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 15 Aug 2017 15:00:12 -0400 Subject: [ticket/15424] Multiple typo fixes in docs & comments Fixed typos in some docs, guidelines, some non-user-facing files. PHPBB3-15424 --- phpBB/language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 835030762c..f3ea471012 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -483,7 +483,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TOPIC_IN_QUEUE' => 'Topic approval request by %1$s:', 'NOTIFICATION_TYPE_NOT_EXIST' => 'The notification type "%s" is missing from the file system.', 'NOTIFICATION_ADMIN_ACTIVATE_USER' => 'Activation required for deactivated or newly registered user: “%1$s”', - // Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST. + // Used in conjunction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST. 'NOTIFICATION_MANY_OTHERS' => 'others', 'NOTIFICATION_X_OTHERS' => array( 2 => '%d others', -- cgit v1.2.1 From 4f5a8f6983660a4392c67ffb6a41c87cafee9f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Thu, 30 Aug 2018 21:15:56 +0200 Subject: [ticket/15255] Move language strings from acp/common to common PHPBB3-15255 --- phpBB/language/en/common.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f3ea471012..8a2767e564 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -266,6 +266,17 @@ $lang = array_merge($lang, array( 'FSOCK_DISABLED' => 'The operation could not be completed because the fsockopen function has been disabled or the server being queried could not be found.', 'FSOCK_TIMEOUT' => 'A timeout occurred while reading from the network stream.', + 'FILESYSTEM_CANNOT_CHANGE_FILE_GROUP' => 'Unable to change file group', + 'FILESYSTEM_CANNOT_CHANGE_FILE_PERMISSIONS' => 'Unable to change file permissions', + 'FILESYSTEM_CANNOT_COPY_FILES' => 'Unable to copy files', + 'FILESYSTEM_CANNOT_CREATE_SYMLINK' => 'Unable to create a symlink', + 'FILESYSTEM_CANNOT_CREATE_DIRECTORY' => 'Unable to create directory', + 'FILESYSTEM_CANNOT_DELETE_FILES' => 'Unable to delete files from the system', + 'FILESYSTEM_CANNOT_DUMP_FILE' => 'Unable to dump file', + 'FILESYSTEM_CANNOT_MIRROR_DIRECTORY' => 'Unable to mirror directory', + 'FILESYSTEM_CANNOT_RENAME_FILE' => 'Unable to rename a file from the system', + 'FILESYSTEM_CANNOT_TOUCH_FILES' => 'Unable to determine if the file exists', + 'FTP_FSOCK_HOST' => 'FTP host', 'FTP_FSOCK_HOST_EXPLAIN' => 'FTP server used to connect your site.', 'FTP_FSOCK_PASSWORD' => 'FTP password', -- cgit v1.2.1 From d7dd91d0e25638373c57c9813f4c7b13deff84c3 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Fri, 24 May 2019 09:58:44 +0200 Subject: [ticket/15564] Improve wording since captcha can be invisible now PHPBB3-15564 --- phpBB/language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f77cf0c0c8..5f47fbe6ed 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -392,7 +392,7 @@ $lang = array_merge($lang, array( 'LOGIN_CHECK_PM' => 'Log in to check your private messages.', 'LOGIN_CONFIRMATION' => 'Confirmation of login', 'LOGIN_CONFIRM_EXPLAIN' => 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', // unused - 'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to solve the CAPTCHA below.', + 'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to pass the CAPTCHA test.', 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE' => 'You have not been authenticated by Apache.', 'LOGIN_ERROR_OAUTH_SERVICE_DOES_NOT_EXIST' => 'A non-existant OAuth service has been requested.', 'LOGIN_ERROR_PASSWORD' => 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.', -- cgit v1.2.1 From 0b39e4e854da85ea6fd59578e1623078012fcae2 Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Sun, 5 May 2019 18:26:43 +0200 Subject: [ticket/16008] Clean up phpBB OAuth system PHPBB3-16008 --- phpBB/language/en/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index d050c1b109..8190bad83c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -94,6 +94,7 @@ $lang = array_merge($lang, array( 'AUTH_PROVIDER_OAUTH_ERROR_ALREADY_LINKED' => 'This external service is already associated with another board account.', '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_ERROR_SERVICE_NOT_CREATED' => 'OAuth service not created', 'AUTH_PROVIDER_OAUTH_SERVICE_BITLY' => 'Bitly', 'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK' => 'Facebook', -- cgit v1.2.1 From 78a913581c727801240758c0a8c3bfae86d124ca Mon Sep 17 00:00:00 2001 From: v12mike Date: Tue, 10 Sep 2019 16:32:13 -0400 Subject: [ticket/9837] Display unapproved posts to posters Add tests and improve style template PHPBB3-9837 --- phpBB/language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index d050c1b109..04ed4de5b1 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -614,7 +614,7 @@ $lang = array_merge($lang, array( 'POST_TIME' => 'Post time', 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:', - 'POST_UNAPPROVED' => 'This post has not been approved.', + 'POST_UNAPPROVED' => 'This post is not visible to other users until it has been approved', 'POWERED_BY' => 'Powered by %s', 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', // Used in pagination -- cgit v1.2.1 From 92362441bd17dd18fb006a7b9f7a05c65ed2b432 Mon Sep 17 00:00:00 2001 From: v12mike Date: Wed, 11 Sep 2019 04:52:07 -0400 Subject: [ticket/9837] Make unapproved posts visible to posters Add tests Tidy up code Improve user message formatting PHPBB3-9837 --- phpBB/language/en/common.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 04ed4de5b1..3b7230b93d 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -614,7 +614,8 @@ $lang = array_merge($lang, array( 'POST_TIME' => 'Post time', 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:', - 'POST_UNAPPROVED' => 'This post is not visible to other users until it has been approved', + 'POST_UNAPPROVED' => 'This post has not been approved.', + 'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator', 'POWERED_BY' => 'Powered by %s', 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', // Used in pagination -- cgit v1.2.1 From 0a4cc5d2018dde19754f90b30ad49ff2718efc76 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Nov 2019 09:20:18 +0100 Subject: [ticket/9837] Apply suggested changes by CHItA PHPBB3-9837 --- phpBB/language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 3b7230b93d..b0c6f7fd1c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -615,7 +615,7 @@ $lang = array_merge($lang, array( 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:', 'POST_UNAPPROVED' => 'This post has not been approved.', - 'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator', + 'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator.', 'POWERED_BY' => 'Powered by %s', 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', // Used in pagination -- cgit v1.2.1 From 29c96211374361e7881faed984db52aab91502c9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 2 Jan 2020 10:45:24 +0100 Subject: [ticket/16230] Improve wording of FILESYSTEM_CANNOT_ lang strings PHPBB3-16230 --- phpBB/language/en/common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en/common.php') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 609ae4fe53..31914cf625 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -274,10 +274,10 @@ $lang = array_merge($lang, array( 'FILESYSTEM_CANNOT_CREATE_SYMLINK' => 'Unable to create a symlink', 'FILESYSTEM_CANNOT_CREATE_DIRECTORY' => 'Unable to create directory', 'FILESYSTEM_CANNOT_DELETE_FILES' => 'Unable to delete files from the system', - 'FILESYSTEM_CANNOT_DUMP_FILE' => 'Unable to dump file', + 'FILESYSTEM_CANNOT_DUMP_FILE' => 'Unable to dump into file', 'FILESYSTEM_CANNOT_MIRROR_DIRECTORY' => 'Unable to mirror directory', 'FILESYSTEM_CANNOT_RENAME_FILE' => 'Unable to rename a file from the system', - 'FILESYSTEM_CANNOT_TOUCH_FILES' => 'Unable to determine if the file exists', + 'FILESYSTEM_CANNOT_TOUCH_FILES' => 'Unable to create file or change file timestamps', 'FTP_FSOCK_HOST' => 'FTP host', 'FTP_FSOCK_HOST_EXPLAIN' => 'FTP server used to connect your site.', -- cgit v1.2.1