aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-02-18 13:42:08 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-02-18 13:42:08 +0000
commit5c6653717f0a9adce905d1417c8adb4f0f3a5b73 (patch)
treec5e3b65b409ae33d52055e33cfed0ee169684023 /phpBB/language
parent652d349b75262dd8e0db8405d5ca1b7fa654364a (diff)
downloadforums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.gz
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.bz2
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.xz
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.zip
fixing some bugs
more mcp links for easier moderating different aspects (all, forum, topic) i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected. git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/attachments.php2
-rw-r--r--phpBB/language/en/acp/common.php3
-rw-r--r--phpBB/language/en/acp/email.php2
-rw-r--r--phpBB/language/en/acp/groups.php2
-rw-r--r--phpBB/language/en/common.php5
-rw-r--r--phpBB/language/en/groups.php2
-rw-r--r--phpBB/language/en/mcp.php2
-rw-r--r--phpBB/language/en/posting.php2
8 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 121069a6f8..f43835c7b0 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -115,7 +115,7 @@ $lang = array_merge($lang, array(
'NO_EXT_GROUP_SPECIFIED' => 'No extension group specified.',
'NO_FILE_CAT' => 'None',
'NO_IMAGE' => 'No image',
- 'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled because there is no supported GD library available and the imagemagick executable could not be found.',
+ 'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled. For proper functionality either the GD extension need to be available or imagemagick being installed. Both were not found.',
'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.',
'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 27e0e7afa3..054101147e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -277,7 +277,7 @@ $lang = array_merge($lang, array(
// Logs
$lang = array_merge($lang, array(
'ACP_ADMIN_LOGS_EXPLAIN' => 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
- 'ACP_CRITICAL_LOGS_EXPLAIN' => 'This lists the actions carried out by the board itself. These log provides you with information you are able to use for solving specific problems, for example non-delivery of emails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
+ 'ACP_CRITICAL_LOGS_EXPLAIN' => 'This lists the actions carried out by the board itself. This log provides you with information you are able to use for solving specific problems, for example non-delivery of emails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
'ACP_MOD_LOGS_EXPLAIN' => 'This lists the actions carried out by board moderators, select a forum from the drop down list. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
'ACP_USERS_LOGS_EXPLAIN' => 'This lists all actions carried out by users or on users.',
'ALL_ENTRIES' => 'All entries',
@@ -533,6 +533,7 @@ $lang = array_merge($lang, array(
'LOG_LANGUAGE_PACK_INSTALLED' => '<strong>Installed language pack</strong><br />» %s',
'LOG_LANGUAGE_PACK_UPDATED' => '<strong>Updated language pack details</strong><br />» %s',
'LOG_LANGUAGE_FILE_REPLACED' => '<strong>Replaced language file</strong><br />» %s',
+ 'LOG_LANGUAGE_FILE_SUBMITTED' => '<strong>Submitted language file and placed in store folder</strong><br />» %s',
'LOG_MASS_EMAIL' => '<strong>Sent mass email</strong><br />» %s',
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index e57b2a8bea..14ee520b04 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -32,7 +32,7 @@ if (empty($lang) || !is_array($lang))
// Email settings
$lang = array_merge($lang, array(
- 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
+ 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group <strong>having the option to receive mass emails enabled</strong>. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
'ALL_USERS' => 'All users',
'COMPOSE' => 'Compose',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index dbe22e2154..f69ac02168 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -60,7 +60,7 @@ $lang = array_merge($lang, array(
'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain groupwide options such as colouration, rank, etc. Changes made here override users current settings. Please note that group members can alter their avatar unless you set appropriate user permissions.',
'GROUP_ERR_USERS_EXIST' => 'The specified users are already members of this group',
'GROUP_FOUNDER_MANAGE' => 'Founder manage only',
- 'GROUP_FOUNDER_MANAGE_EXPLAIN' => 'Restrict group management for this group for founders only for the administration control panel.',
+ 'GROUP_FOUNDER_MANAGE_EXPLAIN' => 'Restrict group management for this group for founders only. Users having group permissions are still able to see this group as well as this groups members.',
'GROUP_HIDDEN' => 'Hidden',
'GROUP_LANG' => 'Group language',
'GROUP_LEAD' => 'Group leaders',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index d4fd7bd4af..853df84f85 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -208,10 +208,9 @@ $lang = array_merge($lang, array(
'GOTO_PAGE' => 'Go to page',
'GROUP' => 'Group',
'GROUPS' => 'Groups',
- 'GROUP_ERR_DESC_LONG' => 'Group description is too long.',
'GROUP_ERR_TYPE' => 'Inappropriate group type specified.',
'GROUP_ERR_USERNAME' => 'No group name specified.',
- 'GROUP_ERR_USER_LONG' => 'Group name is too long.',
+ 'GROUP_ERR_USER_LONG' => 'Group name is too long. A maximum of 60 characters are allowed.',
'GUEST' => 'Guest',
'GUEST_USERS_ONLINE' => 'There are %d guest users online',
'GUEST_USERS_TOTAL' => '%d guests',
@@ -316,7 +315,7 @@ $lang = array_merge($lang, array(
'NEXT' => 'Next',
'NEVER' => 'Never',
'NO' => 'No',
- 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group from the “Administration Control Panel”.',
+ 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group.',
'NOT_AUTHORIZED' => 'You are not authorised to access this area.',
'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.',
'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.',
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index 8e44d32a0d..bd11356684 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -72,7 +72,7 @@ $lang = array_merge($lang, array(
'NO_LEADERS' => 'You are not a leader of any group',
'NOT_LEADER_OF_GROUP' => 'The requested operation cannot be taken because you are not a leader of the selected group.',
- 'NOT_MEMBER_OF_GROUP' => 'The requested operation cannot be taken because you are not a member of the selected group.',
+ 'NOT_MEMBER_OF_GROUP' => 'The requested operation cannot be taken because you are not a member of the selected group or your membership has not been approved yet.',
'NOT_RESIGN_FROM_DEFAULT_GROUP' => 'You are not allowed to resign from your default group.',
'PRIMARY_GROUP' => 'Primary group',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 837ae6f9b1..7c5df74d5f 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -189,6 +189,8 @@ $lang = array_merge($lang, array(
'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one',
'MERGE_TOPIC_ID' => 'Destination topic identification number',
'MODERATE_FORUM' => 'Moderate forum',
+ 'MODERATE_TOPIC' => 'Moderate topic',
+ 'MODERATE_POST' => 'Moderate post',
'MOD_OPTIONS' => 'Moderator options',
'MORE_INFO' => 'Further information',
'MOST_WARNINGS' => 'Users with most warnings',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 2b486f8b8c..d5e8450699 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -121,7 +121,7 @@ $lang = array_merge($lang, array(
'MESSAGE_DELETED' => 'This message has been deleted successfully',
'MORE_SMILIES' => 'View more smilies',
- 'NOTIFY_REPLY' => 'Send me an email when a reply is posted',
+ 'NOTIFY_REPLY' => 'Notify me when a reply is posted',
'NOT_UPLOADED' => 'File could not be uploaded.',
'NO_DELETE_POLL_OPTIONS' => 'You cannot delete existing poll options',
'NO_PM_ICON' => 'No PM icon',
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-08 12:27:52 +0000