aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-07-09 16:23:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-07-09 16:23:57 +0000
commit46af817cb058e2eecd89081af4a40075426a32ef (patch)
treed27156cb086223b91b8c67f23db969a980e1b7b8 /phpBB/language/en/acp
parent455add06f29400af3176eea7c4958ed772934460 (diff)
downloadforums-46af817cb058e2eecd89081af4a40075426a32ef.tar
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.gz
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.bz2
forums-46af817cb058e2eecd89081af4a40075426a32ef.tar.xz
forums-46af817cb058e2eecd89081af4a40075426a32ef.zip
- tackle some usability issues
- fix bug #3147 - added the lock-images made by SHS` - fixed MSSQL errors (adding the correct ESCAPE sequence) git-svn-id: file:///svn/phpbb/trunk@6161 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/board.php5
-rw-r--r--phpBB/language/en/acp/common.php7
-rw-r--r--phpBB/language/en/acp/forums.php19
-rw-r--r--phpBB/language/en/acp/groups.php3
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php1
-rw-r--r--phpBB/language/en/acp/styles.php62
6 files changed, 60 insertions, 37 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index f7f23b2ec5..3141abdef4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -99,11 +99,10 @@ $lang = array_merge($lang, array(
'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging',
'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages',
- 'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages',
'ALLOW_FLASH_PM' => 'Allow use of FLASH BBCode Tag',
'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages',
'ALLOW_IMG_PM' => 'Allow use of IMG BBCode Tag',
- 'ALLOW_MASS_PM' => 'Allow Mass PM\'s',
+ 'ALLOW_MASS_PM' => 'Allow sending of private messages to multiple users and groups',
'ALLOW_PRINT_PM' => 'Allow print view in private messaging',
'ALLOW_QUOTE_PM' => 'Allow quotes in private messages',
'ALLOW_SIG_PM' => 'Allow signature in private messages',
@@ -114,7 +113,7 @@ $lang = array_merge($lang, array(
'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages.',
'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages',
'FULL_FOLDER_ACTION' => 'Full folder default action',
- 'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if an users folder is full and if the users folder action set is not applicable. For the special folder "SENTBOX" the default action is always deleting old messages.',
+ 'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if an users folder is full and if the users folder action set is not applicable. For the "sent messages" folder the default action is always deleting old messages.',
'HOLD_NEW_MESSAGES' => 'Hold new messages',
'PM_EDIT_TIME' => 'Limit editing time',
'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index c562c86454..917d0d8e70 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -188,6 +188,7 @@ $lang = array_merge($lang, array(
'ACP_WORDS' => 'Word Censoring',
'ACTION' => 'Action',
+ 'ACTIONS' => 'Actions',
'ACTIVATE' => 'Activate',
'ADD' => 'Add',
'ADMIN' => 'Administration',
@@ -288,12 +289,13 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ADMIN_INTRO' => 'Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your forum experience. Each page will have instructions on how to use the tools.',
'ADMIN_LOG' => 'Logged administrator actions',
- 'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item to the left.',
+ 'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item or following the link below.',
'AVATAR_DIR_SIZE' => 'Avatar directory size',
'BOARD_STARTED' => 'Board started',
- 'DATABASE_SIZE' => 'Database size',
+ 'DATABASE_SERVER_INFO' => 'Database server',
+ 'DATABASE_SIZE' => 'Database size',
'FILES_PER_DAY' => 'Attachments per day',
'FORUM_STATS' => 'Forum Statistics',
@@ -326,6 +328,7 @@ $lang = array_merge($lang, array(
'USERS_PER_DAY' => 'Users per day',
'VALUE' => 'Value',
+ 'VIEW_ADMIN_LOG' => 'View administrator log',
'WELCOME_PHPBB' => 'Welcome to phpBB',
));
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 2087fbf22b..eec59c446b 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -38,8 +38,8 @@ $lang = array_merge($lang, array(
'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
'COPY_PERMISSIONS' => 'Copy permissions from',
- 'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
- 'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
+ 'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
+ 'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
'CREATE_FORUM' => 'Create new forum',
'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',
@@ -49,12 +49,14 @@ $lang = array_merge($lang, array(
'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics',
'DISPLAY_ACTIVE_TOPICS_EXPLAIN' => 'If set to yes active topics in selected subforums will be displayed under this category.',
- 'EDIT_FORUM' => 'Edit forum',
- 'ENABLE_INDEXING' => 'Enable search indexing',
- 'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.',
- 'ENABLE_RECENT' => 'Display active topics',
- 'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.',
- 'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons',
+ 'EDIT_FORUM' => 'Edit forum',
+ 'ENABLE_INDEXING' => 'Enable search indexing',
+ 'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.',
+ 'ENABLE_POST_REVIEW' => 'Enable post review',
+ 'ENABLE_POST_REVIEW_EXPLAIN' => 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.',
+ 'ENABLE_RECENT' => 'Display active topics',
+ 'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.',
+ 'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons',
'FORUM_ADMIN' => 'Forum Administration',
'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.',
@@ -81,6 +83,7 @@ $lang = array_merge($lang, array(
'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.',
'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.',
'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
+ 'FORUM_PRUNE_SETTINGS' => 'Forum prune settings',
'FORUM_RESYNCED' => 'Forum "%s" successfully resynced',
'FORUM_RULES_EXPLAIN' => 'Forum Rules are displayed at any page within the given forum.',
'FORUM_RULES_LINK' => 'Link to Forum Rules',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 4b22677de1..03c02b97fc 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -89,6 +89,9 @@ $lang = array_merge($lang, array(
'GROUP_USERS_EXIST' => 'The selected users are already members.',
'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully',
+ 'MAKE_DEFAULT_FOR_ALL' => 'Make default group for every member',
+ 'MEMBERS' => 'Members',
+
'NO_GROUP' => 'No group specified',
'NO_PERMISSIONS' => 'Do not copy permissions',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 3db436e1ca..b0bc770a74 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -93,6 +93,7 @@ $lang = array_merge($lang, array(
'acl_u_sig' => array('lang' => 'Can use signature', 'cat' => 'post'),
'acl_u_sendpm' => array('lang' => 'Can send private messages', 'cat' => 'pm'),
+ 'acl_u_masspm' => array('lang' => 'Can send pm to multiple users and groups', 'cat' => 'pm'),
'acl_u_readpm' => array('lang' => 'Can read private messages', 'cat' => 'pm'),
'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
'acl_u_pm_delete' => array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 8c102a23f8..1e6c84a354 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -168,30 +168,44 @@ $lang = array_merge($lang, array(
'IMG_CAT_KARMA' => 'Karma images',
'IMG_CAT_LOGOS' => 'Logos',
'IMG_CAT_POLLS' => 'Polling images',
- 'IMG_FOLDER' => 'Topic',
- 'IMG_FOLDER_ANNOUNCE' => 'Announcement',
- 'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts',
- 'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to',
- 'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new',
- 'IMG_FOLDER_GLOBAL' => 'Global',
- 'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts',
- 'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to',
- 'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new',
- 'IMG_FOLDER_HOT' => 'Topic hot',
- 'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts',
- 'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to',
- 'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new',
- 'IMG_FOLDER_LOCKED' => 'Topic locked',
- 'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new',
- 'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to',
- 'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new',
- 'IMG_FOLDER_NEW' => 'Topic new posts',
- 'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new',
- 'IMG_FOLDER_POSTED' => 'Topic posted to',
- 'IMG_FOLDER_STICKY' => 'Sticky topic',
- 'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to',
- 'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts',
- 'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new',
+
+ 'IMG_FOLDER' => 'Topic',
+ 'IMG_FOLDER_ANNOUNCE' => 'Announcement',
+ 'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts',
+ 'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to',
+ 'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new',
+ 'IMG_FOLDER_GLOBAL' => 'Global',
+ 'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts',
+ 'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to',
+ 'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new',
+ 'IMG_FOLDER_HOT' => 'Topic hot',
+ 'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts',
+ 'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to',
+ 'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new',
+ 'IMG_FOLDER_LOCKED' => 'Topic locked',
+ 'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new',
+ 'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to',
+ 'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new',
+ 'IMG_FOLDER_LOCKED_ANNOUNCE' => 'Announcement locked',
+ 'IMG_FOLDER_LOCKED_ANNOUNCE_NEW' => 'Announcement locked new posts',
+ 'IMG_FOLDER_LOCKED_ANNOUNCE_POSTED' => 'Announcement locked posted to',
+ 'IMG_FOLDER_LOCKED_ANNOUNCE_NEW_POSTED' => 'Announcement locked posted to new',
+ 'IMG_FOLDER_LOCKED_GLOBAL' => 'Global locked',
+ 'IMG_FOLDER_LOCKED_GLOBAL_NEW' => 'Global locked new posts',
+ 'IMG_FOLDER_LOCKED_GLOBAL_POSTED' => 'Global locked posted to',
+ 'IMG_FOLDER_LOCKED_GLOBAL_NEW_POSTED' => 'Global locked posted to new',
+ 'IMG_FOLDER_LOCKED_STICKY' => 'Sticky topic locked',
+ 'IMG_FOLDER_LOCKED_STICKY_POSTED' => 'Sticky topic locked posted to',
+ 'IMG_FOLDER_LOCKED_STICKY_NEW' => 'Sticky topic locked new posts',
+ 'IMG_FOLDER_LOCKED_STICKY_NEW_POSTED' => 'Sticky topic locked posted to new',
+ 'IMG_FOLDER_NEW' => 'Topic new posts',
+ 'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new',
+ 'IMG_FOLDER_POSTED' => 'Topic posted to',
+ 'IMG_FOLDER_STICKY' => 'Sticky topic',
+ 'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to',
+ 'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts',
+ 'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new',
+
'IMG_FORUM' => 'Forum',
'IMG_FORUM_NEW' => 'Forum new posts',
'IMG_FORUM_LOCKED' => 'Forum locked',