aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/language/en/lang_admin.php15
-rw-r--r--phpBB/language/en/lang_main.php1
2 files changed, 12 insertions, 4 deletions
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 115b6f4a62..080b8ec0f8 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -227,11 +227,13 @@ $lang = array_merge($lang, array(
'OPTION' => 'Option',
'YES' => 'Yes',
'NO' => 'No',
- 'UNSET' => 'Unset',
+ 'UNSET' => 'Unset',
+ 'IGNORE' => 'Ignore',
'PRESETS' => 'Presets',
'ALL_YES' => 'All Yes',
'ALL_NO' => 'All No',
- 'ALL_UNSET' => 'All Unset',
+ 'ALL_UNSET' => 'All Unset',
+ 'ALL_IGNORE' => 'All Ignore',
'USER_PRESETS' => 'User presets',
'FROM_PARENT' => 'From Parent',
'ACL_SUBFORUMS' => 'Assign to sub-forums',
@@ -240,14 +242,19 @@ $lang = array_merge($lang, array(
'SELECT_PRESET' => 'Select preset',
'PRESET_NAME' => 'Preset name',
'EMPTY' => 'Empty',
- 'QUICK ACCESS' => 'Quick access',
+ 'WARNING' => 'Warning',
+ 'WARNING_EXPLAIN' => 'You have altered settings for one or alternative views. Be sure to verify these settings before updating',
+ 'SELECTED_USER' => 'Selected User',
+ 'SELECTED_USERS' => 'Selected Users',
+ 'SELECTED_GROUP' => 'Selected Group',
+ 'SELECTED_GROUPS' => 'Selected Groups',
+ 'WILL_SET_OPTIONS' => 'Will set options in',
'ACL_VIEW_FORUM' => 'Forum Options',
'ACL_VIEW_MOD' => 'Moderator Options',
'ACL_VIEW_SUPERMOD' => 'Supermod Options',
'ACL_VIEW_ADMIN' => 'Admin Options',
-
'AUTH_UPDATED' => 'Permissions have been updated',
'acl_a_server' => 'Can alter server and email settings',
diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index d16b852c02..852a5d0136 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -272,6 +272,7 @@ $lang = array(
'NO_POSTS' => 'No Posts were found.',
'NO_POST' => 'The requested post does not exist.',
'NO_USER' => 'The requested user does not exist.',
+ 'NO_GROUP' => 'The requested usergroup does not exist.',
'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.',