aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/ucp.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-20 20:54:18 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-20 20:58:53 -0500
commit94d682f77431add84867bb0b196ad0719b293606 (patch)
tree1a589cd8c2bd9ac054ea0394eaa8b240cfe7c030 /phpBB/language/en/ucp.php
parent6861af22eecfa4a254eb62245ee109d8e5635f93 (diff)
downloadforums-94d682f77431add84867bb0b196ad0719b293606.tar
forums-94d682f77431add84867bb0b196ad0719b293606.tar.gz
forums-94d682f77431add84867bb0b196ad0719b293606.tar.bz2
forums-94d682f77431add84867bb0b196ad0719b293606.tar.xz
forums-94d682f77431add84867bb0b196ad0719b293606.zip
[ticket/11103] Use the full class name as the item_type/method
This is going to require you recreate the db tables. PHPBB3-11103
Diffstat (limited to 'phpBB/language/en/ucp.php')
-rw-r--r--phpBB/language/en/ucp.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7c3960204a..5b1e7add02 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -295,8 +295,6 @@ $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',
@@ -376,6 +374,8 @@ $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.',