From fe347ec1124de7022bbbf37d0a1fffeff56c7271 Mon Sep 17 00:00:00 2001 From: Josh Woody Date: Tue, 25 May 2010 10:52:01 -0500 Subject: [feature/prune-users] Adjust some language strings for new features Adjust two language strings for ACP prune feature to include descriptions for new features. PHPBB3-9622 --- phpBB/language/en/acp/prune.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php index bf006d9dce..1cd29d0f25 100644 --- a/phpBB/language/en/acp/prune.php +++ b/phpBB/language/en/acp/prune.php @@ -37,7 +37,9 @@ if (empty($lang) || !is_array($lang)) // User pruning $lang = array_merge($lang, array( - 'ACP_PRUNE_USERS_EXPLAIN' => 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.', + 'ACP_PRUNE_USERS_EXPLAIN' => 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Use * as a wildcard for text fields. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.', + + 'CRITERIA' => 'Criteria', 'DEACTIVATE_DELETE' => 'Deactivate or delete', 'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!', @@ -45,15 +47,17 @@ $lang = array_merge($lang, array( 'DELETE_USER_POSTS' => 'Delete pruned user posts', 'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.', - 'JOINED_EXPLAIN' => 'Enter a date in YYYY-MM-DD format.', + 'JOINED_EXPLAIN' => 'Enter a date in YYYY-MM-DD format. You may use both fields to specify an interval, or leave one blank for an open date range.', 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in YYYY-MM-DD format. Enter 0000-00-00 to prune users who never logged in, Before and After conditions will be ignored.', + 'POSTS_ON_QUEUE' => 'Posts Awaiting Approval', + 'PRUNE_USERS_GROUP_EXPLAIN' => 'Selects all members of the group for pruning.', 'PRUNE_USERS_LIST' => 'Users to be pruned', - 'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed.', - 'PRUNE_USERS_LIST_DEACTIVATE' => 'With the selected critera for pruning users the following accounts will be deactivated.', + 'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed. You can remove individual users from the deletion list by unchecking the box next to their username.', + 'PRUNE_USERS_LIST_DEACTIVATE' => 'With the selected critera for pruning users the following accounts will be deactivated. You can remove individual users from the deactivation list by unchecking the box next to their username.', - 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here, they will be used in preference to the criteria above. Founders cannot be pruned.', + 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here. They will be used in preference to the criteria above. Founders cannot be pruned.', 'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully.', 'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully.', -- cgit v1.2.1 From 33c7bb4ec3c391e8b19c6ddff25852a46fe3e304 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sun, 8 May 2011 12:53:12 -0400 Subject: [feature/prune-users] Fixed whitespace in language file. PHPBB3-9622 --- phpBB/language/en/acp/prune.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php index 1cd29d0f25..9bd8adc00f 100644 --- a/phpBB/language/en/acp/prune.php +++ b/phpBB/language/en/acp/prune.php @@ -37,9 +37,9 @@ if (empty($lang) || !is_array($lang)) // User pruning $lang = array_merge($lang, array( - 'ACP_PRUNE_USERS_EXPLAIN' => 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Use * as a wildcard for text fields. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.', + 'ACP_PRUNE_USERS_EXPLAIN' => 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Use * as a wildcard for text fields. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.', - 'CRITERIA' => 'Criteria', + 'CRITERIA' => 'Criteria', 'DEACTIVATE_DELETE' => 'Deactivate or delete', 'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!', @@ -47,17 +47,17 @@ $lang = array_merge($lang, array( 'DELETE_USER_POSTS' => 'Delete pruned user posts', 'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.', - 'JOINED_EXPLAIN' => 'Enter a date in YYYY-MM-DD format. You may use both fields to specify an interval, or leave one blank for an open date range.', + 'JOINED_EXPLAIN' => 'Enter a date in YYYY-MM-DD format. You may use both fields to specify an interval, or leave one blank for an open date range.', 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in YYYY-MM-DD format. Enter 0000-00-00 to prune users who never logged in, Before and After conditions will be ignored.', - 'POSTS_ON_QUEUE' => 'Posts Awaiting Approval', - 'PRUNE_USERS_GROUP_EXPLAIN' => 'Selects all members of the group for pruning.', + 'POSTS_ON_QUEUE' => 'Posts Awaiting Approval', + 'PRUNE_USERS_GROUP_EXPLAIN' => 'Selects all members of the group for pruning.', 'PRUNE_USERS_LIST' => 'Users to be pruned', - 'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed. You can remove individual users from the deletion list by unchecking the box next to their username.', - 'PRUNE_USERS_LIST_DEACTIVATE' => 'With the selected critera for pruning users the following accounts will be deactivated. You can remove individual users from the deactivation list by unchecking the box next to their username.', + 'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed. You can remove individual users from the deletion list by unchecking the box next to their username.', + 'PRUNE_USERS_LIST_DEACTIVATE' => 'With the selected critera for pruning users the following accounts will be deactivated. You can remove individual users from the deactivation list by unchecking the box next to their username.', - 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here. They will be used in preference to the criteria above. Founders cannot be pruned.', + 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here. They will be used in preference to the criteria above. Founders cannot be pruned.', 'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully.', 'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully.', -- cgit v1.2.1 From 9915ed52551b9b11e2cfcadabcb758ab05c6db6b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 15 Mar 2012 16:07:14 +0100 Subject: =?UTF-8?q?[ticket/8743]=20Include=20poster=C2=B4s=20name=20in=20m?= =?UTF-8?q?ail=20notifications?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHPBB3-8743 --- phpBB/language/en/email/forum_notify.txt | 2 +- phpBB/language/en/email/newtopic_notify.txt | 2 +- phpBB/language/en/email/topic_notify.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index fae5a83885..490780a0a6 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -2,7 +2,7 @@ Subject: Forum post notification - "{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 reply to the topic "{TOPIC_TITLE}" 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. +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}" by {AUTHOR_NAME} 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. {U_NEWEST_POST} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 529bbf0f8f..eda1370938 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic notification - "{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 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. +You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic by {AUTHOR_NAME} 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. {U_FORUM} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 99587b28e0..fcfbcc2abd 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{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 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. +You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply by {AUTHOR_NAME} 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. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} -- cgit v1.2.1 From a5dd64195a3a88db3fec38ac74dfb5d118ab5622 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 22 Jul 2012 22:26:38 -0500 Subject: [ticket/11021] Add the option to specify a Site home URL and text PHPBB3-11021 --- phpBB/language/en/acp/board.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 0754884473..6b043b887d 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -49,6 +49,10 @@ $lang = array_merge($lang, array( 'OVERRIDE_STYLE' => 'Override user style', 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.', 'SITE_DESC' => 'Site description', + 'SITE_HOME_TEXT' => 'Site home text', + 'SITE_HOME_TEXT_EXPLAIN' => 'Specify a Site Home Text to use your own instead of the default text in the breadcrumbs ’Home.’', + 'SITE_HOME_URL' => 'Site home URL', + 'SITE_HOME_URL_EXPLAIN' => 'If you specify a Site Home URL, a link to this page will be added to your board’s breadcrumbs and the site logo will also be linked to this address.', 'SITE_NAME' => 'Site name', 'SYSTEM_TIMEZONE' => 'Guest timezone', 'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.', -- cgit v1.2.1 From d0a1c7bf0ae79bac3c35af03c6753862f446aa73 Mon Sep 17 00:00:00 2001 From: Senky Date: Mon, 23 Jul 2012 14:39:33 +0200 Subject: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm PHPBB3-10568 --- phpBB/language/en/ucp.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 94d9a5171e..d45cd3bd8b 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -257,6 +257,7 @@ $lang = array_merge($lang, array( 'MESSAGE_BY_AUTHOR' => 'by', 'MESSAGE_COLOURS' => 'Message colours', 'MESSAGE_DELETED' => 'Message successfully deleted.', + 'MESSAGE_EDITED' => 'Message successfully edited.', 'MESSAGE_HISTORY' => 'Message history', 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by its author before it was delivered.', 'MESSAGE_SENT_ON' => 'on', -- cgit v1.2.1 From 92761e1f2b59bbe817579a1cdddd508b9817cdee Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 21 Aug 2012 11:59:44 -0400 Subject: [ticket/10873] Change language for notice about undelivered, deleted PM. See the ticket for my reasoning. PHPBB3-10873 --- phpBB/language/en/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 94d9a5171e..a2c1ad7a3e 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -258,7 +258,7 @@ $lang = array_merge($lang, array( 'MESSAGE_COLOURS' => 'Message colours', 'MESSAGE_DELETED' => 'Message successfully deleted.', 'MESSAGE_HISTORY' => 'Message history', - 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by its author before it was delivered.', + 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message was deleted by its author.', 'MESSAGE_SENT_ON' => 'on', 'MESSAGE_STORED' => 'This message has been sent successfully.', 'MESSAGE_TO' => 'To', -- cgit v1.2.1 From 5e6b4c7192a80dc29382ad06976e9ce6d5c16efd Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Wed, 29 Feb 2012 21:23:50 +0000 Subject: [ticket/10631] Adding an extensions admin PHPBB3-10631 --- phpBB/language/en/acp/common.php | 1 + phpBB/language/en/acp/customisations.php | 100 ++++++++++++++++++++++++++++ phpBB/language/en/acp/permissions_phpbb.php | 1 + 3 files changed, 102 insertions(+) create mode 100644 phpBB/language/en/acp/customisations.php (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 04df897dba..5eb10d50b3 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -81,6 +81,7 @@ $lang = array_merge($lang, array( 'ACP_EMAIL_SETTINGS' => 'Email settings', 'ACP_EXTENSION_GROUPS' => 'Manage extension groups', + 'ACP_EXTENSIONS' => 'Manage board extensions', 'ACP_FORUM_BASED_PERMISSIONS' => 'Forum based permissions', 'ACP_FORUM_LOGS' => 'Forum logs', diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php new file mode 100644 index 0000000000..7ba463bc81 --- /dev/null +++ b/phpBB/language/en/acp/customisations.php @@ -0,0 +1,100 @@ + 'Extension', + 'EXTENSIONS' => 'Extensions', + 'EXTENSIONS_ADMIN' => 'Extensions Admin', + 'EXTENSIONS_EXPLAIN' => 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit this page on phpBBs Offical Website.', + + 'DETAILS' => 'Details', + + 'AVALIABLE' => 'Avaliable', + 'ENABLED' => 'Enabled', + 'DISBALED' => 'Disabled', + + 'ENABLE' => 'Enable', + 'DISABLE' => 'Disable', + 'PURGE' => 'Purge', + 'DELETE' => 'Delete', + + 'ENABLED' => 'Enabled', + 'DISABLED' => 'Disabled', + 'PURGED' => 'Purged', + 'DELETED' => 'Deleted', + + 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', + 'DISABLE_EXPLAIN' => 'Disabling an extension keeps the files and data intact but is not working on your board.', + 'PURGE_EXPLAIN' => 'Purging an extension keeps the files but not the data on your board.', + 'DELETE_EXPLAIN' => 'Deleting an extension removes all traces of the extension except from your logs.', + + 'ENABLE_SUCESS' => 'Your extension was enabled sucessfully', + 'DISABLE_SUCESS' => 'Your extension was disabled sucessfully', + 'PURGE_SUCESS' => 'Your extension was purged sucessfully', + 'DELETE_SUCESS' => 'Your extension was deleted sucessfully', + + 'ENABLE_FAIL' => 'Your extension could not be enabled', + 'DISABLE_FAIL' => 'Your extension could not be disabled', + 'PURGE_FAIL' => 'Your extension could not be purged', + 'DELETE_FAIL' => 'Your extension could not be deleted', + + 'EXTENSION_NAME' => 'Extension Name', + 'EXTENSION_ACTIONS' => 'Actions', + 'EXTENSION_OPTIONS' => 'Options', + + 'ENABLE_CONFIRM' => 'Are you sure you wish to enable this extension?', + 'DISABLE_CONFIRM' => 'Are your sure you wish to disable this extension?', + 'PURGE_CONFIRM' => 'Are you sure you wish to purge (and not disable) this extension? This action will wipe the extension data on this board and is not reversible.', + 'DELETE_CONFIRM' => 'Are you sure you wish to delete (and not purge or disable) this extension? This action will remove the extension and all of its data from this board and is not reversible.', + + 'WARNING' => 'Warning', + 'RETURN' => 'Return', + + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', +)); + +?> \ No newline at end of file diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 17649693fa..bb068e625f 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -226,6 +226,7 @@ $lang = array_merge($lang, array( 'acl_a_switchperm' => array('lang' => 'Can use others permissions', 'cat' => 'permissions'), 'acl_a_styles' => array('lang' => 'Can manage styles', 'cat' => 'misc'), + 'acl_a_extensions' => array('lang' => 'Can manage extensions', 'cat' => 'misc'), 'acl_a_viewlogs' => array('lang' => 'Can view logs', 'cat' => 'misc'), 'acl_a_clearlogs' => array('lang' => 'Can clear logs', 'cat' => 'misc'), 'acl_a_modules' => array('lang' => 'Can manage modules', 'cat' => 'misc'), -- cgit v1.2.1 From 29a9f3e70d0a165a33e50cce5d275e1a5090c989 Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Sun, 4 Mar 2012 15:51:57 +0000 Subject: [ticket/10631] Update extensions admin language Added details page information, added a new line at end of file and removed some whitespace. PHPBB3-10631 --- phpBB/language/en/acp/customisations.php | 54 ++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 23 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php index 7ba463bc81..e45fcb843d 100644 --- a/phpBB/language/en/acp/customisations.php +++ b/phpBB/language/en/acp/customisations.php @@ -39,38 +39,38 @@ $lang = array_merge($lang, array( 'EXTENSIONS' => 'Extensions', 'EXTENSIONS_ADMIN' => 'Extensions Admin', 'EXTENSIONS_EXPLAIN' => 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit this page on phpBBs Offical Website.', - + 'DETAILS' => 'Details', - + 'AVALIABLE' => 'Avaliable', 'ENABLED' => 'Enabled', 'DISBALED' => 'Disabled', - + 'ENABLE' => 'Enable', 'DISABLE' => 'Disable', 'PURGE' => 'Purge', 'DELETE' => 'Delete', - + 'ENABLED' => 'Enabled', 'DISABLED' => 'Disabled', 'PURGED' => 'Purged', 'DELETED' => 'Deleted', - + 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', 'DISABLE_EXPLAIN' => 'Disabling an extension keeps the files and data intact but is not working on your board.', 'PURGE_EXPLAIN' => 'Purging an extension keeps the files but not the data on your board.', 'DELETE_EXPLAIN' => 'Deleting an extension removes all traces of the extension except from your logs.', - + 'ENABLE_SUCESS' => 'Your extension was enabled sucessfully', 'DISABLE_SUCESS' => 'Your extension was disabled sucessfully', 'PURGE_SUCESS' => 'Your extension was purged sucessfully', 'DELETE_SUCESS' => 'Your extension was deleted sucessfully', - + 'ENABLE_FAIL' => 'Your extension could not be enabled', 'DISABLE_FAIL' => 'Your extension could not be disabled', 'PURGE_FAIL' => 'Your extension could not be purged', 'DELETE_FAIL' => 'Your extension could not be deleted', - + 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', @@ -79,22 +79,30 @@ $lang = array_merge($lang, array( 'DISABLE_CONFIRM' => 'Are your sure you wish to disable this extension?', 'PURGE_CONFIRM' => 'Are you sure you wish to purge (and not disable) this extension? This action will wipe the extension data on this board and is not reversible.', 'DELETE_CONFIRM' => 'Are you sure you wish to delete (and not purge or disable) this extension? This action will remove the extension and all of its data from this board and is not reversible.', - + 'WARNING' => 'Warning', 'RETURN' => 'Return', - - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', - '' => '', + + 'EXT_DETAILS' => 'Extension Details', + 'DISPLAY_NAME' => 'Display Name', + 'CLEAN_NAME' => 'Clean Name', + 'TYPE' => 'Type', + 'DESCRIPTION' => 'Description', + 'VERSION' => 'Version', + 'HOMEPAGE' => 'Homepage', + 'PATH' => 'File Path', + 'TIME' => 'Release Time', + 'LICENCE' => 'Licence', + + 'REQUIREMENTS' => 'Requirements', + 'PHPBB_VERSION' => 'phpBB Version', + 'PHP_VERSION' => 'php Version', + 'AUTHOR_INFORMATION' => 'Author Information', + 'AUTHOR_NAME' => 'Author Name', + 'AUTHOR_USERNAME' => 'Author Username', + 'AUTHOR_EMAIL' => 'Author Email', + 'AUTHOR_HOMEPAGE' => 'Author Homepage', + 'AUTHOR_ROLE' => 'Author Role', )); -?> \ No newline at end of file +?> -- cgit v1.2.1 From a51ef4444719c8a50f6fe8ea909ce55ec41e5835 Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Sun, 4 Mar 2012 16:04:18 +0000 Subject: [ticket/10631] Some rewording of extensions admin language PHPBB3-10631 --- phpBB/language/en/acp/customisations.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php index e45fcb843d..5b15ae7655 100644 --- a/phpBB/language/en/acp/customisations.php +++ b/phpBB/language/en/acp/customisations.php @@ -57,19 +57,19 @@ $lang = array_merge($lang, array( 'DELETED' => 'Deleted', 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', - 'DISABLE_EXPLAIN' => 'Disabling an extension keeps the files and data intact but is not working on your board.', - 'PURGE_EXPLAIN' => 'Purging an extension keeps the files but not the data on your board.', - 'DELETE_EXPLAIN' => 'Deleting an extension removes all traces of the extension except from your logs.', + 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', + 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', + 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', - 'ENABLE_SUCESS' => 'Your extension was enabled sucessfully', - 'DISABLE_SUCESS' => 'Your extension was disabled sucessfully', - 'PURGE_SUCESS' => 'Your extension was purged sucessfully', - 'DELETE_SUCESS' => 'Your extension was deleted sucessfully', + 'ENABLE_SUCESS' => 'The extension was enabled sucessfully', + 'DISABLE_SUCESS' => 'The extension was disabled sucessfully', + 'PURGE_SUCESS' => 'The extension was purged sucessfully', + 'DELETE_SUCESS' => 'The extension was deleted sucessfully', - 'ENABLE_FAIL' => 'Your extension could not be enabled', - 'DISABLE_FAIL' => 'Your extension could not be disabled', - 'PURGE_FAIL' => 'Your extension could not be purged', - 'DELETE_FAIL' => 'Your extension could not be deleted', + 'ENABLE_FAIL' => 'The extension could not be enabled', + 'DISABLE_FAIL' => 'The extension could not be disabled', + 'PURGE_FAIL' => 'The extension could not be purged', + 'DELETE_FAIL' => 'The extension could not be deleted', 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', @@ -77,8 +77,8 @@ $lang = array_merge($lang, array( 'ENABLE_CONFIRM' => 'Are you sure you wish to enable this extension?', 'DISABLE_CONFIRM' => 'Are your sure you wish to disable this extension?', - 'PURGE_CONFIRM' => 'Are you sure you wish to purge (and not disable) this extension? This action will wipe the extension data on this board and is not reversible.', - 'DELETE_CONFIRM' => 'Are you sure you wish to delete (and not purge or disable) this extension? This action will remove the extension and all of its data from this board and is not reversible.', + 'PURGE_CONFIRM' => 'Are you sure you wish to purge this extensions data? This cannot be undone.', + 'DELETE_CONFIRM' => 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.', 'WARNING' => 'Warning', 'RETURN' => 'Return', -- cgit v1.2.1 From 85e871e902454d14321f69e162a92746c46f7d65 Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Sun, 4 Mar 2012 16:21:11 +0000 Subject: [ticket/10631] Removing ?> at end of customisations language file PHPBB3-10631 --- phpBB/language/en/acp/customisations.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php index 5b15ae7655..e20806eac2 100644 --- a/phpBB/language/en/acp/customisations.php +++ b/phpBB/language/en/acp/customisations.php @@ -104,5 +104,3 @@ $lang = array_merge($lang, array( 'AUTHOR_HOMEPAGE' => 'Author Homepage', 'AUTHOR_ROLE' => 'Author Role', )); - -?> -- cgit v1.2.1 From 9cd0e09f5deba03ee0e5d329f5ff126006fd4c9c Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Fri, 9 Mar 2012 18:09:38 +0000 Subject: [ticket/10631] Rename language file to extensions.php PHPBB3-10631 --- phpBB/language/en/acp/customisations.php | 106 ------------------------------- phpBB/language/en/acp/extensions.php | 106 +++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 phpBB/language/en/acp/customisations.php create mode 100644 phpBB/language/en/acp/extensions.php (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php deleted file mode 100644 index e20806eac2..0000000000 --- a/phpBB/language/en/acp/customisations.php +++ /dev/null @@ -1,106 +0,0 @@ - 'Extension', - 'EXTENSIONS' => 'Extensions', - 'EXTENSIONS_ADMIN' => 'Extensions Admin', - 'EXTENSIONS_EXPLAIN' => 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit this page on phpBBs Offical Website.', - - 'DETAILS' => 'Details', - - 'AVALIABLE' => 'Avaliable', - 'ENABLED' => 'Enabled', - 'DISBALED' => 'Disabled', - - 'ENABLE' => 'Enable', - 'DISABLE' => 'Disable', - 'PURGE' => 'Purge', - 'DELETE' => 'Delete', - - 'ENABLED' => 'Enabled', - 'DISABLED' => 'Disabled', - 'PURGED' => 'Purged', - 'DELETED' => 'Deleted', - - 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', - 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', - 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', - 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', - - 'ENABLE_SUCESS' => 'The extension was enabled sucessfully', - 'DISABLE_SUCESS' => 'The extension was disabled sucessfully', - 'PURGE_SUCESS' => 'The extension was purged sucessfully', - 'DELETE_SUCESS' => 'The extension was deleted sucessfully', - - 'ENABLE_FAIL' => 'The extension could not be enabled', - 'DISABLE_FAIL' => 'The extension could not be disabled', - 'PURGE_FAIL' => 'The extension could not be purged', - 'DELETE_FAIL' => 'The extension could not be deleted', - - 'EXTENSION_NAME' => 'Extension Name', - 'EXTENSION_ACTIONS' => 'Actions', - 'EXTENSION_OPTIONS' => 'Options', - - 'ENABLE_CONFIRM' => 'Are you sure you wish to enable this extension?', - 'DISABLE_CONFIRM' => 'Are your sure you wish to disable this extension?', - 'PURGE_CONFIRM' => 'Are you sure you wish to purge this extensions data? This cannot be undone.', - 'DELETE_CONFIRM' => 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.', - - 'WARNING' => 'Warning', - 'RETURN' => 'Return', - - 'EXT_DETAILS' => 'Extension Details', - 'DISPLAY_NAME' => 'Display Name', - 'CLEAN_NAME' => 'Clean Name', - 'TYPE' => 'Type', - 'DESCRIPTION' => 'Description', - 'VERSION' => 'Version', - 'HOMEPAGE' => 'Homepage', - 'PATH' => 'File Path', - 'TIME' => 'Release Time', - 'LICENCE' => 'Licence', - - 'REQUIREMENTS' => 'Requirements', - 'PHPBB_VERSION' => 'phpBB Version', - 'PHP_VERSION' => 'php Version', - 'AUTHOR_INFORMATION' => 'Author Information', - 'AUTHOR_NAME' => 'Author Name', - 'AUTHOR_USERNAME' => 'Author Username', - 'AUTHOR_EMAIL' => 'Author Email', - 'AUTHOR_HOMEPAGE' => 'Author Homepage', - 'AUTHOR_ROLE' => 'Author Role', -)); diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php new file mode 100644 index 0000000000..e20806eac2 --- /dev/null +++ b/phpBB/language/en/acp/extensions.php @@ -0,0 +1,106 @@ + 'Extension', + 'EXTENSIONS' => 'Extensions', + 'EXTENSIONS_ADMIN' => 'Extensions Admin', + 'EXTENSIONS_EXPLAIN' => 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit this page on phpBBs Offical Website.', + + 'DETAILS' => 'Details', + + 'AVALIABLE' => 'Avaliable', + 'ENABLED' => 'Enabled', + 'DISBALED' => 'Disabled', + + 'ENABLE' => 'Enable', + 'DISABLE' => 'Disable', + 'PURGE' => 'Purge', + 'DELETE' => 'Delete', + + 'ENABLED' => 'Enabled', + 'DISABLED' => 'Disabled', + 'PURGED' => 'Purged', + 'DELETED' => 'Deleted', + + 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', + 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', + 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', + 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', + + 'ENABLE_SUCESS' => 'The extension was enabled sucessfully', + 'DISABLE_SUCESS' => 'The extension was disabled sucessfully', + 'PURGE_SUCESS' => 'The extension was purged sucessfully', + 'DELETE_SUCESS' => 'The extension was deleted sucessfully', + + 'ENABLE_FAIL' => 'The extension could not be enabled', + 'DISABLE_FAIL' => 'The extension could not be disabled', + 'PURGE_FAIL' => 'The extension could not be purged', + 'DELETE_FAIL' => 'The extension could not be deleted', + + 'EXTENSION_NAME' => 'Extension Name', + 'EXTENSION_ACTIONS' => 'Actions', + 'EXTENSION_OPTIONS' => 'Options', + + 'ENABLE_CONFIRM' => 'Are you sure you wish to enable this extension?', + 'DISABLE_CONFIRM' => 'Are your sure you wish to disable this extension?', + 'PURGE_CONFIRM' => 'Are you sure you wish to purge this extensions data? This cannot be undone.', + 'DELETE_CONFIRM' => 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.', + + 'WARNING' => 'Warning', + 'RETURN' => 'Return', + + 'EXT_DETAILS' => 'Extension Details', + 'DISPLAY_NAME' => 'Display Name', + 'CLEAN_NAME' => 'Clean Name', + 'TYPE' => 'Type', + 'DESCRIPTION' => 'Description', + 'VERSION' => 'Version', + 'HOMEPAGE' => 'Homepage', + 'PATH' => 'File Path', + 'TIME' => 'Release Time', + 'LICENCE' => 'Licence', + + 'REQUIREMENTS' => 'Requirements', + 'PHPBB_VERSION' => 'phpBB Version', + 'PHP_VERSION' => 'php Version', + 'AUTHOR_INFORMATION' => 'Author Information', + 'AUTHOR_NAME' => 'Author Name', + 'AUTHOR_USERNAME' => 'Author Username', + 'AUTHOR_EMAIL' => 'Author Email', + 'AUTHOR_HOMEPAGE' => 'Author Homepage', + 'AUTHOR_ROLE' => 'Author Role', +)); -- cgit v1.2.1 From e768d0066d6c19e2d32016cc87a93d0cc9a9bcf7 Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Fri, 9 Mar 2012 18:12:45 +0000 Subject: [ticket/10631] Update extensions language file for some issues found PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index e20806eac2..77d0b2f3cd 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -42,20 +42,18 @@ $lang = array_merge($lang, array( 'DETAILS' => 'Details', - 'AVALIABLE' => 'Avaliable', + 'AVAILABLE' => 'Available', 'ENABLED' => 'Enabled', - 'DISBALED' => 'Disabled', + 'DISABLED' => 'Disabled', + 'PURGED' => 'Purged', + 'DELETED' => 'Deleted', + 'UPLOADED' => 'Uploaded', 'ENABLE' => 'Enable', 'DISABLE' => 'Disable', 'PURGE' => 'Purge', 'DELETE' => 'Delete', - 'ENABLED' => 'Enabled', - 'DISABLED' => 'Disabled', - 'PURGED' => 'Purged', - 'DELETED' => 'Deleted', - 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', -- cgit v1.2.1 From 7a954d352ef1fe84256ad691135b6c6bf0d4bcc5 Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Sat, 28 Apr 2012 18:13:28 +0100 Subject: [ticket/10631] Fixing some items mentioned in PR PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 77d0b2f3cd..37cabe477b 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -38,7 +38,7 @@ $lang = array_merge($lang, array( 'EXTENSION' => 'Extension', 'EXTENSIONS' => 'Extensions', 'EXTENSIONS_ADMIN' => 'Extensions Admin', - 'EXTENSIONS_EXPLAIN' => 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit this page on phpBBs Offical Website.', + 'EXTENSIONS_EXPLAIN' => 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit this page on phpBB's Offical Website.', 'DETAILS' => 'Details', -- cgit v1.2.1 From 4cbfa6175303d23d35aaa06f8f68d9a3d7d0beb2 Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Sun, 29 Apr 2012 00:34:50 +0100 Subject: [ticket/10631] A few more extension admin changes PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 37cabe477b..728ab40ee9 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -1,7 +1,7 @@ 'Extension', 'EXTENSIONS' => 'Extensions', - 'EXTENSIONS_ADMIN' => 'Extensions Admin', - 'EXTENSIONS_EXPLAIN' => 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit this page on phpBB's Offical Website.', + 'EXTENSIONS_ADMIN' => 'Extensions Manager', + 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', 'DETAILS' => 'Details', @@ -59,10 +59,10 @@ $lang = array_merge($lang, array( 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', - 'ENABLE_SUCESS' => 'The extension was enabled sucessfully', - 'DISABLE_SUCESS' => 'The extension was disabled sucessfully', - 'PURGE_SUCESS' => 'The extension was purged sucessfully', - 'DELETE_SUCESS' => 'The extension was deleted sucessfully', + 'ENABLE_SUCESS' => 'The extension was enabled successfully', + 'DISABLE_SUCESS' => 'The extension was disabled successfully', + 'PURGE_SUCESS' => 'The extension was purged successfully', + 'DELETE_SUCESS' => 'The extension was deleted successfully', 'ENABLE_FAIL' => 'The extension could not be enabled', 'DISABLE_FAIL' => 'The extension could not be disabled', @@ -73,10 +73,10 @@ $lang = array_merge($lang, array( 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', - 'ENABLE_CONFIRM' => 'Are you sure you wish to enable this extension?', - 'DISABLE_CONFIRM' => 'Are your sure you wish to disable this extension?', - 'PURGE_CONFIRM' => 'Are you sure you wish to purge this extensions data? This cannot be undone.', - 'DELETE_CONFIRM' => 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.', + 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', + 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', + 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This cannot be undone.', + 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.', 'WARNING' => 'Warning', 'RETURN' => 'Return', @@ -94,11 +94,10 @@ $lang = array_merge($lang, array( 'REQUIREMENTS' => 'Requirements', 'PHPBB_VERSION' => 'phpBB Version', - 'PHP_VERSION' => 'php Version', + 'PHP_VERSION' => 'PHP Version', 'AUTHOR_INFORMATION' => 'Author Information', - 'AUTHOR_NAME' => 'Author Name', - 'AUTHOR_USERNAME' => 'Author Username', - 'AUTHOR_EMAIL' => 'Author Email', - 'AUTHOR_HOMEPAGE' => 'Author Homepage', - 'AUTHOR_ROLE' => 'Author Role', + 'AUTHOR_NAME' => 'Name', + 'AUTHOR_EMAIL' => 'Email', + 'AUTHOR_HOMEPAGE' => 'Homepage', + 'AUTHOR_ROLE' => 'Role', )); -- cgit v1.2.1 From 3ba59c6362c955d1f9b59278f7dd19cdacecff99 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 22 Jul 2012 18:11:56 -0500 Subject: [ticket/10631] Various tidbits and cleanup on the acp extensions manager PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 207 ++++++++++++++++++----------------- 1 file changed, 104 insertions(+), 103 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 728ab40ee9..950f3b5332 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -1,103 +1,104 @@ - 'Extension', - 'EXTENSIONS' => 'Extensions', - 'EXTENSIONS_ADMIN' => 'Extensions Manager', - 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', - - 'DETAILS' => 'Details', - - 'AVAILABLE' => 'Available', - 'ENABLED' => 'Enabled', - 'DISABLED' => 'Disabled', - 'PURGED' => 'Purged', - 'DELETED' => 'Deleted', - 'UPLOADED' => 'Uploaded', - - 'ENABLE' => 'Enable', - 'DISABLE' => 'Disable', - 'PURGE' => 'Purge', - 'DELETE' => 'Delete', - - 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', - 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', - 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', - 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', - - 'ENABLE_SUCESS' => 'The extension was enabled successfully', - 'DISABLE_SUCESS' => 'The extension was disabled successfully', - 'PURGE_SUCESS' => 'The extension was purged successfully', - 'DELETE_SUCESS' => 'The extension was deleted successfully', - - 'ENABLE_FAIL' => 'The extension could not be enabled', - 'DISABLE_FAIL' => 'The extension could not be disabled', - 'PURGE_FAIL' => 'The extension could not be purged', - 'DELETE_FAIL' => 'The extension could not be deleted', - - 'EXTENSION_NAME' => 'Extension Name', - 'EXTENSION_ACTIONS' => 'Actions', - 'EXTENSION_OPTIONS' => 'Options', - - 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', - 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', - 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This cannot be undone.', - 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.', - - 'WARNING' => 'Warning', - 'RETURN' => 'Return', - - 'EXT_DETAILS' => 'Extension Details', - 'DISPLAY_NAME' => 'Display Name', - 'CLEAN_NAME' => 'Clean Name', - 'TYPE' => 'Type', - 'DESCRIPTION' => 'Description', - 'VERSION' => 'Version', - 'HOMEPAGE' => 'Homepage', - 'PATH' => 'File Path', - 'TIME' => 'Release Time', - 'LICENCE' => 'Licence', - - 'REQUIREMENTS' => 'Requirements', - 'PHPBB_VERSION' => 'phpBB Version', - 'PHP_VERSION' => 'PHP Version', - 'AUTHOR_INFORMATION' => 'Author Information', - 'AUTHOR_NAME' => 'Name', - 'AUTHOR_EMAIL' => 'Email', - 'AUTHOR_HOMEPAGE' => 'Homepage', - 'AUTHOR_ROLE' => 'Role', -)); + 'Extension', + 'EXTENSIONS' => 'Extensions', + 'EXTENSIONS_ADMIN' => 'Extensions Manager', + 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', + 'EXTENSION_INVALID' => 'The selected extension is not valid.', + + 'DETAILS' => 'Details', + + 'AVAILABLE' => 'Available', + 'ENABLED' => 'Enabled', + 'DISABLED' => 'Disabled', + 'PURGED' => 'Purged', + 'DELETED' => 'Deleted', + 'UPLOADED' => 'Uploaded', + + 'ENABLE' => 'Enable', + 'DISABLE' => 'Disable', + 'PURGE' => 'Purge', + 'DELETE' => 'Delete', + + 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', + 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', + 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', + 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', + + 'ENABLE_SUCESS' => 'The extension was enabled successfully', + 'DISABLE_SUCESS' => 'The extension was disabled successfully', + 'PURGE_SUCESS' => 'The extension was purged successfully', + 'DELETE_SUCESS' => 'The extension was deleted successfully', + + 'ENABLE_FAIL' => 'The extension could not be enabled', + 'DISABLE_FAIL' => 'The extension could not be disabled', + 'PURGE_FAIL' => 'The extension could not be purged', + 'DELETE_FAIL' => 'The extension could not be deleted', + + 'EXTENSION_NAME' => 'Extension Name', + 'EXTENSION_ACTIONS' => 'Actions', + 'EXTENSION_OPTIONS' => 'Options', + + 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', + 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', + 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This cannot be undone.', + 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.', + + 'WARNING' => 'Warning', + 'RETURN' => 'Return', + + 'EXT_DETAILS' => 'Extension Details', + 'DISPLAY_NAME' => 'Display Name', + 'CLEAN_NAME' => 'Clean Name', + 'TYPE' => 'Type', + 'DESCRIPTION' => 'Description', + 'VERSION' => 'Version', + 'HOMEPAGE' => 'Homepage', + 'PATH' => 'File Path', + 'TIME' => 'Release Time', + 'LICENCE' => 'Licence', + + 'REQUIREMENTS' => 'Requirements', + 'PHPBB_VERSION' => 'phpBB Version', + 'PHP_VERSION' => 'PHP Version', + 'AUTHOR_INFORMATION' => 'Author Information', + 'AUTHOR_NAME' => 'Name', + 'AUTHOR_EMAIL' => 'Email', + 'AUTHOR_HOMEPAGE' => 'Homepage', + 'AUTHOR_ROLE' => 'Role', +)); -- cgit v1.2.1 From 28ca2d6a5fe8f8f1d8733af70951fa1191336eb6 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 22 Jul 2012 22:54:27 -0500 Subject: [ticket/10631] Stagger the enable/disable/purge for extensions PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 950f3b5332..66f3665757 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -60,10 +60,13 @@ $lang = array_merge($lang, array( 'PURGE_EXPLAIN' => 'Purging an extension clears an extensions data while retaining its files.', 'DELETE_EXPLAIN' => 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.', - 'ENABLE_SUCESS' => 'The extension was enabled successfully', - 'DISABLE_SUCESS' => 'The extension was disabled successfully', - 'PURGE_SUCESS' => 'The extension was purged successfully', - 'DELETE_SUCESS' => 'The extension was deleted successfully', + 'DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.', + 'ENABLE_IN_PROGRESS' => 'The extension is currently being installed, please do not leave this page or refresh until it is completed.', + 'PURGE_IN_PROGRESS' => 'The extension is currently being purged, please do not leave this page or refresh until it is completed.', + 'ENABLE_SUCCESS' => 'The extension was enabled successfully', + 'DISABLE_SUCCESS' => 'The extension was disabled successfully', + 'PURGE_SUCCESS' => 'The extension was purged successfully', + 'DELETE_SUCCESS' => 'The extension was deleted successfully', 'ENABLE_FAIL' => 'The extension could not be enabled', 'DISABLE_FAIL' => 'The extension could not be disabled', -- cgit v1.2.1 From 8bbab088dd5830d8dd1151a3684dde5c197ba268 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 23 Jul 2012 15:17:42 -0500 Subject: [ticket/10631] Validation for extensions PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 41 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 66f3665757..547d14d2b9 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -1,11 +1,11 @@ 'Extension', - 'EXTENSIONS' => 'Extensions', - 'EXTENSIONS_ADMIN' => 'Extensions Manager', - 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', - 'EXTENSION_INVALID' => 'The selected extension is not valid.', + 'EXTENSION' => 'Extension', + 'EXTENSIONS' => 'Extensions', + 'EXTENSIONS_ADMIN' => 'Extensions Manager', + 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', + 'EXTENSION_INVALID' => 'The selected extension is not valid.', + 'EXTENSION_NOT_AVAILABLE' => 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).', 'DETAILS' => 'Details', @@ -63,27 +64,27 @@ $lang = array_merge($lang, array( 'DISABLE_IN_PROGRESS' => 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.', 'ENABLE_IN_PROGRESS' => 'The extension is currently being installed, please do not leave this page or refresh until it is completed.', 'PURGE_IN_PROGRESS' => 'The extension is currently being purged, please do not leave this page or refresh until it is completed.', - 'ENABLE_SUCCESS' => 'The extension was enabled successfully', + 'ENABLE_SUCCESS' => 'The extension was enabled successfully', 'DISABLE_SUCCESS' => 'The extension was disabled successfully', 'PURGE_SUCCESS' => 'The extension was purged successfully', - 'DELETE_SUCCESS' => 'The extension was deleted successfully', + 'DELETE_SUCCESS' => 'The extension was deleted successfully', 'ENABLE_FAIL' => 'The extension could not be enabled', 'DISABLE_FAIL' => 'The extension could not be disabled', 'PURGE_FAIL' => 'The extension could not be purged', 'DELETE_FAIL' => 'The extension could not be deleted', - 'EXTENSION_NAME' => 'Extension Name', - 'EXTENSION_ACTIONS' => 'Actions', - 'EXTENSION_OPTIONS' => 'Options', + 'EXTENSION_NAME' => 'Extension Name', + 'EXTENSION_ACTIONS' => 'Actions', + 'EXTENSION_OPTIONS' => 'Options', - 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', - 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', - 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This cannot be undone.', - 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.', + 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', + 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', + 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This cannot be undone.', + 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.', - 'WARNING' => 'Warning', - 'RETURN' => 'Return', + 'WARNING' => 'Warning', + 'RETURN' => 'Return', 'EXT_DETAILS' => 'Extension Details', 'DISPLAY_NAME' => 'Display Name', -- cgit v1.2.1 From 9c0cd2693fd61c9528aa5fcbc3dff9de73515ebe Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 23 Jul 2012 16:04:29 -0500 Subject: [ticket/10631] Make the enable/disable/purge notices more visable. PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 547d14d2b9..a16e13d979 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -80,7 +80,7 @@ $lang = array_merge($lang, array( 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', - 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This cannot be undone.', + 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This will remove all settings stored for this extension and cannot be undone!', 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.', 'WARNING' => 'Warning', -- cgit v1.2.1 From 2273ae2b34071160ff930ca8d49326b8dd308899 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 23 Jul 2012 17:05:03 -0500 Subject: [ticket/10631] Remove references to delete extension PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index a16e13d979..903ec249a8 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -48,13 +48,11 @@ $lang = array_merge($lang, array( 'ENABLED' => 'Enabled', 'DISABLED' => 'Disabled', 'PURGED' => 'Purged', - 'DELETED' => 'Deleted', 'UPLOADED' => 'Uploaded', 'ENABLE' => 'Enable', 'DISABLE' => 'Disable', 'PURGE' => 'Purge', - 'DELETE' => 'Delete', 'ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', 'DISABLE_EXPLAIN' => 'Disabling an extension retains its files and settings but removes any functionality added by the extension.', @@ -67,12 +65,10 @@ $lang = array_merge($lang, array( 'ENABLE_SUCCESS' => 'The extension was enabled successfully', 'DISABLE_SUCCESS' => 'The extension was disabled successfully', 'PURGE_SUCCESS' => 'The extension was purged successfully', - 'DELETE_SUCCESS' => 'The extension was deleted successfully', 'ENABLE_FAIL' => 'The extension could not be enabled', 'DISABLE_FAIL' => 'The extension could not be disabled', 'PURGE_FAIL' => 'The extension could not be purged', - 'DELETE_FAIL' => 'The extension could not be deleted', 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', @@ -81,7 +77,6 @@ $lang = array_merge($lang, array( 'ENABLE_CONFIRM' => 'Are you sure that you wish to enable this extension?', 'DISABLE_CONFIRM' => 'Are you sure that you wish to disable this extension?', 'PURGE_CONFIRM' => 'Are you sure that you wish to purge this extension's data? This will remove all settings stored for this extension and cannot be undone!', - 'DELETE_CONFIRM' => 'Are you sure that you wish to data this extension's files and clear its data? This cannot be undone.', 'WARNING' => 'Warning', 'RETURN' => 'Return', -- cgit v1.2.1 From 89f4cf6a8c10f9b0875cf7f278016aff67eb38fc Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 23 Jul 2012 19:46:21 -0500 Subject: [ticket/10631] Use exceptions for errors. Build action list dynamically. PHPBB3-10631 --- phpBB/language/en/acp/extensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 903ec249a8..0adaff10c8 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -39,7 +39,7 @@ $lang = array_merge($lang, array( 'EXTENSIONS' => 'Extensions', 'EXTENSIONS_ADMIN' => 'Extensions Manager', 'EXTENSIONS_EXPLAIN' => 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.', - 'EXTENSION_INVALID' => 'The selected extension is not valid.', + 'EXTENSION_INVALID_LIST' => 'The "%s" extension is not valid.

%s

', 'EXTENSION_NOT_AVAILABLE' => 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).', 'DETAILS' => 'Details', -- cgit v1.2.1 From 0c56bd45eff15b0bff2672ed08b390d0248625d8 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 23 Jul 2012 13:15:08 -0500 Subject: [ticket/11021] Better language strings for site home url/text Correct the logo title to be {L_HOME} if {U_HOME} is used. Check if the Home text is instead of just equal to false when outputting it to the template PHPBB3-11021 --- phpBB/language/en/acp/board.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 6b043b887d..b80aec1f4a 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -45,14 +45,14 @@ $lang = array_merge($lang, array( 'DISABLE_BOARD' => 'Disable board', 'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.', 'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list', - 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.', + 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.', 'OVERRIDE_STYLE' => 'Override user style', 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.', 'SITE_DESC' => 'Site description', - 'SITE_HOME_TEXT' => 'Site home text', - 'SITE_HOME_TEXT_EXPLAIN' => 'Specify a Site Home Text to use your own instead of the default text in the breadcrumbs ’Home.’', - 'SITE_HOME_URL' => 'Site home URL', - 'SITE_HOME_URL_EXPLAIN' => 'If you specify a Site Home URL, a link to this page will be added to your board’s breadcrumbs and the site logo will also be linked to this address.', + 'SITE_HOME_TEXT' => 'Main website text', + 'SITE_HOME_TEXT_EXPLAIN' => 'This text will be displayed as a link to your website homepage in the board’s breadcrumbs. If not specified, it will default to ’Home’.', + 'SITE_HOME_URL' => 'Main website URL', + 'SITE_HOME_URL_EXPLAIN' => 'If specified, a link to this URL will be prepended to your board’s breadcrumbs. The board logo will also link to this URL.', 'SITE_NAME' => 'Site name', 'SYSTEM_TIMEZONE' => 'Guest timezone', 'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.', -- cgit v1.2.1 From 9e5505933aec5a57e57018e6375be0bf28636fbe Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 15 Sep 2012 11:10:25 -0500 Subject: [ticket/11021] Fix the language changes that were lost previously Change U_HOME to U_SITE_HOME PHPBB3-11021 --- phpBB/language/en/acp/board.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b80aec1f4a..a4597a1014 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -50,9 +50,9 @@ $lang = array_merge($lang, array( 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.', 'SITE_DESC' => 'Site description', 'SITE_HOME_TEXT' => 'Main website text', - 'SITE_HOME_TEXT_EXPLAIN' => 'This text will be displayed as a link to your website homepage in the board’s breadcrumbs. If not specified, it will default to ’Home’.', + 'SITE_HOME_TEXT_EXPLAIN' => 'This text will be displayed as a link to your website homepage in the board’s breadcrumbs. If not specified, it will default to “Home”.', 'SITE_HOME_URL' => 'Main website URL', - 'SITE_HOME_URL_EXPLAIN' => 'If specified, a link to this URL will be prepended to your board’s breadcrumbs. The board logo will also link to this URL.', + 'SITE_HOME_URL_EXPLAIN' => 'If specified, a link to this URL will be prepended to your board’s breadcrumbs and the board logo will link to this URL instead of the forum index. An absolute URL is required, e.g. http://www.phpbb.com.', 'SITE_NAME' => 'Site name', 'SYSTEM_TIMEZONE' => 'Guest timezone', 'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.', -- cgit v1.2.1 From dbeace22c802065994797ea7ef71176ac183f138 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 2 Oct 2012 14:58:20 +0200 Subject: [ticket/11131] Correctly use indefinite article for "warning". PHPBB3-11131 --- phpBB/language/en/acp/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index f24376f8aa..ccd12fcb6a 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -53,7 +53,7 @@ $lang = array_merge($lang, array( 'SYSTEM_TIMEZONE' => 'Guest timezone', 'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.', 'WARNINGS_EXPIRE' => 'Warning duration', - 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days that will elapse before the warning will automatically expire from a user’s record. Set this value to 0 to make warnings permanent.', + 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days that will elapse before a warning will automatically expire from a user’s record. Set this value to 0 to make warnings permanent.', )); // Board Features -- cgit v1.2.1 From a9b59bfe033ac1e7316c585f270e314be29ab735 Mon Sep 17 00:00:00 2001 From: RMcGirr83 Date: Sat, 27 Oct 2012 08:30:55 -0400 Subject: [ticket/11156] Delete "Misc" tab of forum based permissions + move items PHPBB3-11156 --- phpBB/language/en/acp/permissions_phpbb.php | 53 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index bb068e625f..b142cfd9aa 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -135,39 +135,38 @@ $lang = array_merge($lang, array( // Forum Permissions $lang = array_merge($lang, array( - 'acl_f_list' => array('lang' => 'Can see forum', 'cat' => 'post'), - 'acl_f_read' => array('lang' => 'Can read forum', 'cat' => 'post'), + 'acl_f_list' => array('lang' => 'Can see forum', 'cat' => 'actions'), + 'acl_f_read' => array('lang' => 'Can read forum', 'cat' => 'actions'), + 'acl_f_search' => array('lang' => 'Can search the forum', 'cat' => 'actions'), + 'acl_f_subscribe' => array('lang' => 'Can subscribe forum', 'cat' => 'actions'), + 'acl_f_print' => array('lang' => 'Can print topics', 'cat' => 'actions'), + 'acl_f_email' => array('lang' => 'Can email topics', 'cat' => 'actions'), + 'acl_f_bump' => array('lang' => 'Can bump topics', 'cat' => 'actions'), + 'acl_f_user_lock' => array('lang' => 'Can lock own topics', 'cat' => 'actions'), + 'acl_f_download' => array('lang' => 'Can download files', 'cat' => 'actions'), + 'acl_f_report' => array('lang' => 'Can report posts', 'cat' => 'actions'), + 'acl_f_post' => array('lang' => 'Can start new topics', 'cat' => 'post'), - 'acl_f_reply' => array('lang' => 'Can reply to topics', 'cat' => 'post'), - 'acl_f_icons' => array('lang' => 'Can use topic/post icons', 'cat' => 'post'), - 'acl_f_announce' => array('lang' => 'Can post announcements', 'cat' => 'post'), 'acl_f_sticky' => array('lang' => 'Can post stickies', 'cat' => 'post'), + 'acl_f_announce' => array('lang' => 'Can post announcements', 'cat' => 'post'), + 'acl_f_reply' => array('lang' => 'Can reply to topics', 'cat' => 'post'), + 'acl_f_edit' => array('lang' => 'Can edit own posts', 'cat' => 'post'), + 'acl_f_delete' => array('lang' => 'Can delete own posts', 'cat' => 'post'), + 'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'), + 'acl_f_postcount' => array('lang' => 'Increment post counter
Please note that this setting only affects new posts.', 'cat' => 'post'), + 'acl_f_noapprove' => array('lang' => 'Can post without approval', 'cat' => 'post'), + + 'acl_f_attach' => array('lang' => 'Can attach files', 'cat' => 'content'), + 'acl_f_icons' => array('lang' => 'Can use topic/post icons', 'cat' => 'content'), + 'acl_f_bbcode' => array('lang' => 'Can use BBCode', 'cat' => 'content'), + 'acl_f_flash' => array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'), + 'acl_f_img' => array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'), + 'acl_f_sigs' => array('lang' => 'Can use signatures', 'cat' => 'content'), + 'acl_f_smilies' => array('lang' => 'Can use smilies', 'cat' => 'content'), 'acl_f_poll' => array('lang' => 'Can create polls', 'cat' => 'polls'), 'acl_f_vote' => array('lang' => 'Can vote in polls', 'cat' => 'polls'), 'acl_f_votechg' => array('lang' => 'Can change existing vote', 'cat' => 'polls'), - - 'acl_f_attach' => array('lang' => 'Can attach files', 'cat' => 'content'), - 'acl_f_download' => array('lang' => 'Can download files', 'cat' => 'content'), - 'acl_f_sigs' => array('lang' => 'Can use signatures', 'cat' => 'content'), - 'acl_f_bbcode' => array('lang' => 'Can use BBCode', 'cat' => 'content'), - 'acl_f_smilies' => array('lang' => 'Can use smilies', 'cat' => 'content'), - 'acl_f_img' => array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'), - 'acl_f_flash' => array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'), - - 'acl_f_edit' => array('lang' => 'Can edit own posts', 'cat' => 'actions'), - 'acl_f_delete' => array('lang' => 'Can delete own posts', 'cat' => 'actions'), - 'acl_f_user_lock' => array('lang' => 'Can lock own topics', 'cat' => 'actions'), - 'acl_f_bump' => array('lang' => 'Can bump topics', 'cat' => 'actions'), - 'acl_f_report' => array('lang' => 'Can report posts', 'cat' => 'actions'), - 'acl_f_subscribe' => array('lang' => 'Can subscribe forum', 'cat' => 'actions'), - 'acl_f_print' => array('lang' => 'Can print topics', 'cat' => 'actions'), - 'acl_f_email' => array('lang' => 'Can email topics', 'cat' => 'actions'), - - 'acl_f_search' => array('lang' => 'Can search the forum', 'cat' => 'misc'), - 'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'), - 'acl_f_postcount' => array('lang' => 'Increment post counter
Please note that this setting only affects new posts.', 'cat' => 'misc'), - 'acl_f_noapprove' => array('lang' => 'Can post without approval', 'cat' => 'misc'), )); // Moderator Permissions -- cgit v1.2.1 From 7d7dc98b10b586635fdee5c420e1ae9fa8d2b752 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Fri, 9 Nov 2012 23:16:42 +0100 Subject: [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) PHPBB3-11181 --- phpBB/language/en/install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 68623a6c25..cb6a17afa2 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -302,10 +302,10 @@ $lang = array_merge($lang, array( 'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.', 'PHP_SAFE_MODE' => 'Safe mode', 'PHP_SETTINGS' => 'PHP version and settings', - 'PHP_SETTINGS_EXPLAIN' => 'Required - You must be running at least version 5.3.2 of PHP in order to install phpBB. If safe mode is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', + 'PHP_SETTINGS_EXPLAIN' => 'Required - You must be running at least version 5.3.3 of PHP in order to install phpBB. If safe mode is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', 'PHP_URL_FOPEN_SUPPORT' => 'PHP setting allow_url_fopen is enabled', 'PHP_URL_FOPEN_SUPPORT_EXPLAIN' => 'Optional - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.', - 'PHP_VERSION_REQD' => 'PHP version >= 5.3.2', + 'PHP_VERSION_REQD' => 'PHP version >= 5.3.3', 'POST_ID' => 'Post ID', 'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using %s as table prefix.', 'PREPROCESS_STEP' => 'Executing pre-processing functions/queries', -- cgit v1.2.1 From 6e7e70a18abc4368bc0728db420d1f7f61ad8686 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 3 Aug 2012 11:43:23 -0500 Subject: [ticket/10780] Replace colon usage in template output with {L_COLON} Replace all the instances (I could find) where the colon is displayed to the user with {L_COLON} so it can be localised. PHPBB3-10780 --- phpBB/language/en/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index e6022e3b79..4300ef431a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -134,6 +134,7 @@ $lang = array_merge($lang, array( 'COLLAPSE_VIEW' => 'Collapse view', 'CLOSE_WINDOW' => 'Close window', 'COLOUR_SWATCH' => 'Colour swatch', + 'COLON' => ':', 'COMMA_SEPARATOR' => ', ', // Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic 'CONFIRM' => 'Confirm', 'CONFIRM_CODE' => 'Confirmation code', -- cgit v1.2.1