Merge pull request #972 from Arantor/release-2.1

Some profile stuff, nothing major

Themes/default/Profile.template.php

@@ -60,7 +60,7 @@ function template_profile_popup()
 	// Then a couple of bits and pieces that might be interesting
 	echo '
 			<ol>
-				<li class="profile_username"><a href="', $scripturl, '?action=profile">', $context['user']['name'], '</a></li>
+				<li class="profile_username"><a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['user']['name'], '</a></li>
 				<li class="profile_group">', $context['member']['group'], '</li>
 			</ol>
 			<br class="clear" />';

Themes/default/languages/Help.english.php

@@ -639,4 +639,7 @@ $helptxt['custom_mask'] = 'The input mask is important for your forum\'s securit
 	More information and advanced techniques may be found on the internet.';
 
 $helptxt['topic_move_any'] = 'If checked, users will be allowed to move topics to any board they can see. Otherwise, they will only be able to move them to boards where they can post new topics.';
+
+$helptxt['alert_pm_new'] = 'Notifications of new personal messages do not appear in the Alerts pane, but appear in the "My Messages" list instead.';
+$helptxt['alert_event_new'] = 'This will send out an alert or email as requested if there is a new calendar event added. However, if that event is posted and a topic is added, you will not get an alert for the event if you\'re already following that board - the alert from following the board would cover this.';
 ?>

Themes/default/languages/Profile.english.php

@@ -97,6 +97,14 @@ $txt['custom_title'] = 'Custom Title';
 
 $txt['lastLoggedIn'] = 'Last Active';
 
+$txt['alert_prefs'] = 'Notification Preferences';
+$txt['alert_prefs_desc'] = 'This page will allow you to configure when and how you get notified about new content.';
+$txt['watched_topics'] = 'Watched Topics';
+$txt['watched_topics_desc'] = 'This page lets you review which topics you are watching; when topics that you are watching have been replied to, you can be notified.';
+$txt['watched_boards'] = 'Watched Boards';
+$txt['watched_boards_desc'] = 'This page lets you review which boards you are watching; when boards that you are watching have new topics, you can be notified.';
+
+$txt['notification_general'] = 'General Settings';
 $txt['notify_settings'] = 'Notification Settings:';
 $txt['notify_save'] = 'Save settings';
 $txt['notify_important_email'] = 'Receive forum newsletters, announcements and important notifications by email.';
@@ -113,6 +121,33 @@ $txt['notify_send_type_only_replies'] = 'Only replies';
 $txt['notify_send_type_nothing'] = 'Nothing at all';
 $txt['notify_send_body'] = 'When sending notification of a reply to a topic, send the post in the email (but please don\'t reply to these emails.)';
 
+$txt['notify_what_how'] = 'Alert Preferences';
+$txt['receive_alert'] = 'Receive alert';
+$txt['receive_mail'] = 'Receive email';
+$txt['alert_group_msg'] = 'Posts and Topics';
+$txt['alert_opt_msg_auto_notify'] = 'Follow topics I reply to.';
+$txt['alert_opt_msg_notify_pref'] = 'How frequently to tell me:';
+$txt['alert_opt_msg_notify_pref_nothing'] = 'Nothing, just make a note of it';
+$txt['alert_opt_msg_notify_pref_instant'] = 'Straight away';
+$txt['alert_opt_msg_notify_pref_first'] = 'Straight away (but only for the first unread message)';
+$txt['alert_opt_msg_notify_pref_daily'] = 'Send me a daily email digest';
+$txt['alert_opt_msg_notify_pref_weekly'] = 'Send me a weekly email digest';
+$txt['alert_msg_mention'] = 'When my @name is mentioned in a message';
+$txt['alert_msg_quote'] = 'When a message of mine is quoted (when I\'m not already watching that topic)';
+$txt['alert_msg_like'] = 'When a message of mine is liked';
+$txt['alert_group_pm'] = 'Personal Messages';
+$txt['alert_pm_new'] = 'When I receive a new personal message';
+$txt['alert_pm_reply'] = 'When a personal message I sent gets replied to';
+$txt['alert_group_moderation'] = 'Moderation';
+$txt['alert_msg_report'] = 'When a message is reported';
+$txt['alert_msg_report_reply'] = 'When a report I\'ve replied to gets replied to';
+$txt['alert_group_members'] = 'Members';
+$txt['alert_register_new'] = 'When a new person registers';
+$txt['alert_warn_own'] = 'If I receive a warning';
+$txt['alert_warn_any'] = 'When other members receive a warning';
+$txt['alert_group_calendar'] = 'Calendar';
+$txt['alert_event_new'] = 'When a new event goes into the calendar';
+
 $txt['notifications_topics'] = 'Current Topic Notifications';
 $txt['notifications_topics_list'] = 'You are being notified of replies to the following topics';
 $txt['notifications_topics_none'] = 'You are not currently receiving any notifications from topics.';