diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-09 07:40:08 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-09 07:40:08 -0600 |
commit | f09ee162528d931aabc3f216410d02d3a072c21d (patch) | |
tree | 22f20e453d830258f65f318c39a59ff6354cabbc /phpBB/language | |
parent | 03e348cf58c9b71ab00f0badb76a4426c2c71289 (diff) | |
download | forums-f09ee162528d931aabc3f216410d02d3a072c21d.tar forums-f09ee162528d931aabc3f216410d02d3a072c21d.tar.gz forums-f09ee162528d931aabc3f216410d02d3a072c21d.tar.bz2 forums-f09ee162528d931aabc3f216410d02d3a072c21d.tar.xz forums-f09ee162528d931aabc3f216410d02d3a072c21d.zip |
[ticket/11103] Use phpBB Container to load types/methods
PHPBB3-11103
Diffstat (limited to 'phpBB/language')
-rw-r--r-- | phpBB/language/en/ucp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 5b1e7add02..7c3960204a 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -295,6 +295,8 @@ $lang = array_merge($lang, array( 'NOTIFICATION_GROUP_MISCELLANEOUS' => 'Miscellaneous Notifications', 'NOTIFICATION_GROUP_MODERATION' => 'Moderation Notifications', 'NOTIFICATION_GROUP_POSTING' => 'Posting Notifications', + 'NOTIFICATION_METHOD_EMAIL' => 'Email', + 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_TYPE' => 'Notification type', 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', @@ -374,8 +376,6 @@ $lang = array_merge($lang, array( 'PASSWORD_UPDATED' => 'A new password was sent to your registered email address.', 'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.', 'PERMISSIONS_TRANSFERRED' => 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.', - 'PHPBB_NOTIFICATION_METHOD_EMAIL' => 'Email', - 'PHPBB_NOTIFICATION_METHOD_JABBER' => 'Jabber', 'PM_DISABLED' => 'Private messaging has been disabled on this board.', 'PM_FROM' => 'From', 'PM_FROM_REMOVED_AUTHOR' => 'This message was sent by a user no longer registered.', |