diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-07 16:55:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-07 16:55:20 +0000 |
| commit | d1e839625ee9b0ca796f83ff55404af4c6307561 (patch) | |
| tree | 6f9f4ec262aa908150d261e51f862874b7fbfeca /phpBB/language | |
| parent | 4eac4b268b98ec65b7432685de147d76618e479d (diff) | |
| download | forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.gz forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.bz2 forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.xz forums-d1e839625ee9b0ca796f83ff55404af4c6307561.zip | |
- fix some group specific bugs
- correctly determining terrafrost's birthday mod
git-svn-id: file:///svn/phpbb/trunk@7143 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/groups.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/groups.php | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index f69ac02168..fa49030ccb 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -81,6 +81,7 @@ $lang = array_merge($lang, array( 'GROUP_PROMOTE' => 'Promote to group leader', 'GROUP_RANK' => 'Group rank', 'GROUP_RECEIVE_PM' => 'Group able to receive private messages', + 'GROUP_RECEIVE_PM_EXPLAIN' => 'Please note that hidden groups are not able to be messaged, regardless of this setting.', 'GROUP_REQUEST' => 'Request', 'GROUP_SETTINGS' => 'Set user preferences', 'GROUP_SETTINGS_EXPLAIN' => 'Here you can force changes in users current preferences. Please note these settings are not saved for the group itself. They are intended as a quick method of altering the preferences of all users in this group.', diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index bd11356684..b9aee65871 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -31,10 +31,11 @@ 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_merge($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', + 'ALREADY_DEFAULT_GROUP' => 'The selected group is already your default group.', + 'ALREADY_IN_GROUP' => 'You are already a member of the selected group.', + 'ALREADY_IN_GROUP_PENDING' => 'You already requested joining the selected group.', - 'CHANGED_DEFAULT_GROUP' => 'Successfully changed default 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”?', |