diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-12 21:24:11 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-12 21:24:11 -0700 |
| commit | d62973867511d4f2b337a4c1cf3654ee20a2a107 (patch) | |
| tree | 6124d4dff71fea9d64ab4ed511c9bec8b624533b /phpBB/language/en | |
| parent | f02a8cf0e63c4107550fc4d9d973c34ffbfe0e03 (diff) | |
| parent | 9bec7b21a2aae7328592732122faf4b9b1cfc4be (diff) | |
| download | forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar.gz forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar.bz2 forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.tar.xz forums-d62973867511d4f2b337a4c1cf3654ee20a2a107.zip | |
Merge pull request #1617 from EXreaction/ticket/11744
[ticket/11744] Group join request notification
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5c7df2c5fd..d94896decc 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -423,6 +423,7 @@ $lang = array_merge($lang, array( 2 => '<strong>%d</strong> Notifications', ), 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', + 'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', 'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 03a14336b5..0222f92b1b 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -317,6 +317,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_TYPE' => 'Notification type', 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', + 'NOTIFICATION_TYPE_GROUP_REQUEST' => 'Someone requests to join a group you lead', 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator', 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', |