diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-02 11:55:16 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-02 11:55:16 -0700 |
| commit | 0a3bb18e93bcb8321e09ca313431ae66f2284e7b (patch) | |
| tree | 0a082db6007f7438e51f0fd0b10598d3445b9a88 /phpBB/language | |
| parent | 4d6c7223b4fa8946a40ac5779bfa20d4a561a574 (diff) | |
| parent | c5fc8c43cbca82d2a064859828950477cfd5d767 (diff) | |
| download | forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar.gz forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar.bz2 forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar.xz forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.zip | |
Merge pull request #1812 from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f26ca59764..08d28e24b9 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -430,6 +430,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved for reason: "%2$s".', 'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by %1$s and needs approval.', 'NOTIFICATION_TYPE_NOT_EXIST' => 'The notification type "%s" is missing from the file system.', + 'NOTIFICATION_ADMIN_ACTIVATE_USER' => 'The user “%1$s” is newly registered and requires activation.', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 2f4d35a5b4..9a5713e1cd 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -312,6 +312,7 @@ $lang = array_merge($lang, array( 'NOTIFICATIONS_MARK_ALL_READ_SUCCESS' => 'All notifications have been marked read.', 'NOTIFICATION_GROUP_MISCELLANEOUS' => 'Miscellaneous Notifications', 'NOTIFICATION_GROUP_MODERATION' => 'Moderation Notifications', + 'NOTIFICATION_GROUP_ADMINISTRATION' => 'Administration Notifications', 'NOTIFICATION_GROUP_POSTING' => 'Posting Notifications', 'NOTIFICATION_METHOD_EMAIL' => 'Email', 'NOTIFICATION_METHOD_JABBER' => 'Jabber', @@ -325,6 +326,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', 'NOTIFICATION_TYPE_REPORT' => 'Someone reports a post', 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum to which you are subscribed', + 'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER' => 'Newly registered user requiring activation', 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', |