aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/admin.php2
-rw-r--r--phpBB/language/en/common.php5
-rw-r--r--phpBB/language/en/groups.php15
3 files changed, 20 insertions, 2 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index 141e6a6f5f..c566476aa1 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -1947,7 +1947,7 @@ $lang += array(
'DLL_MYSQL4' => 'MySQL 4.1+',
'DLL_MYSQLI' => 'MySQL 4.1+ with MySQLi Extension',
'DLL_MSSQL' => 'MSSQL Server 2000',
- 'DLL_MSSQL-ODBC' => 'MSSQL Server 2000 via ODBC',
+ 'DLL_MSSQL_ODBC' => 'MSSQL Server 2000 via ODBC',
'DLL_ORACLE' => 'Oracle',
'DLL_POSTGRES' => 'PostgreSQL 7.x',
'DLL_SQLITE' => 'SQLite',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 923cf8680b..44b20f25fc 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -48,6 +48,8 @@ $lang += array(
'ACCOUNT_NOT_ACTIVATED' => 'Your account has not been activated yet',
'ACP' => 'Administration Control Panel',
'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.',
+ 'ADMINISTRATOR' => 'Administrator',
+ 'ADMINISTRATORS' => 'Administrators',
'ALLOWED' => 'Allowed',
'ALL_FORUMS' => 'All Forums',
'ALL_MESSAGES' => 'All Messages',
@@ -124,6 +126,7 @@ $lang += array(
'FOLDER' => 'Folder',
'FORGOT_PASS' => 'I forgot my password',
'FORUM' => 'Forum',
+ 'FORUMS' => 'Forums',
'FORUMS_MARKED' => 'All forums have been marked read',
'FORUM_INDEX' => 'Board Index',
'FORUM_LOCATION' => 'Forum Location',
@@ -134,6 +137,7 @@ $lang += array(
'GO' => 'Go',
'GOTO_PAGE' => 'Goto page',
+ 'GROUP' => 'Group',
'GROUP_ERR_DESC_LONG' => 'Group description too long.',
'GROUP_ERR_TYPE' => 'Inappropriate group type specified.',
'GROUP_ERR_USERNAME' => 'No group name specified.',
@@ -360,6 +364,7 @@ $lang += array(
'SUBMIT' => 'Submit',
'TERMS_USE' => 'Terms of Use',
+ 'THE_TEAM' => 'The team',
'TIME' => 'Time',
'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.',
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index ca75316bf9..6570e4d3bb 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -29,7 +29,13 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang += array(
+ 'ALREADY_DEFAULT_GROUP' => 'The selected group is already your default group',
+ 'ALREADY_IN_GROUP' => 'You are already a member of the selected group',
+
+ 'CHANGED_DEFAULT_GROUP' => 'Successfully changed default group',
+
'GROUP_AVATAR' => 'Group avatar',
+ 'GROUP_CHANGE_DEFAULT' => 'Are you sure you want to change your default membership to the group "%s"?',
'GROUP_CLOSED' => 'Closed',
'GROUP_DESC' => 'Group description',
'GROUP_HIDDEN' => 'Hidden',
@@ -45,9 +51,16 @@ $lang += array(
'GROUP_IS_FREE' => 'This is a freely open group, all new members are welcome.',
'GROUP_IS_SPECIAL' => 'This is a special group, special groups are managed by the board administrators.',
+ 'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />&#187; %s',
'LOGIN_EXPLAIN_GROUP' => 'You need to login to view group details',
- 'REMOVE_SELECTED' => 'Remove selected',
+ 'NOT_MEMBER_OF_GROUP' => 'The requested operation cannot be taken because you are not a member of the selected group',
+
+ 'PRIMARY_GROUP' => 'Primary group',
+
+ 'REMOVE_SELECTED' => 'Remove selected',
+
+ 'USER_GROUP_CHANGE' => 'From "%1$s" group to "%2$s"',
);
?> \ No newline at end of file