diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/ucp.php | 22 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 11 |
2 files changed, 16 insertions, 17 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 85845d2b27..66662d2f63 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -288,16 +288,16 @@ $lang = array_merge($lang, array( 'NEW_PASSWORD_CONFIRM_EMPTY' => 'You did not enter a confirm password.', 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', - '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', - 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator', - 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', - 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic you are subscribed to', - 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', - 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum you are subscribed to', + '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', + 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator', + 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', + 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic you are subscribed to', + 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', + 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum you are subscribed to', 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', @@ -468,7 +468,7 @@ $lang = array_merge($lang, array( 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', - 'UCP_NOTIFICATION_OPTIONS' => 'Notification Options', + 'UCP_NOTIFICATION_OPTIONS' => 'Notification options', 'UCP_PREFS' => 'Board preferences', 'UCP_PREFS_PERSONAL' => 'Edit global settings', diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 776e565dd0..7ded4d01fe 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -8,10 +8,10 @@ <li class="header"> <dl class="icon"> <dt>{L_NOTIFICATION_TYPE}</dt> - <dd class="topics">{L_NOTIFICATIONS}</dd> <!-- BEGIN notification_methods --> - <dd class="topics">{notification_methods.NAME}</dd> + <dd class="mark">{notification_methods.NAME}</dd> <!-- END notification_methods --> + <dd class="mark">{L_NOTIFICATIONS}</dd> </dl> </li> </ul> @@ -21,13 +21,12 @@ <li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> <dl class="icon"> <dt> - {notification_types.NAME}<br /> - {notification_types.DESC} + {notification_types.NAME} </dt> - <dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd> <!-- BEGIN notification_methods --> - <dd class="topics"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd> + <dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}" /> <dfn>{notification_methods.NAME}</dfn></dd> <!-- END notification_methods --> + <dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification" /> <dfn>{notification_methods.NAME}</dfn></dd> </dl> </li> <!-- END notification_types --> |