Merge pull request #1829 from hypothesis/1787-email-notification-revisions

Email notification revisions

h/static/scripts/account/account-controller.coffee

@@ -5,7 +5,7 @@ class AccountController
                 auth,   flash,   formHelpers,   identity,   session) ->
     persona_filter = $filter('persona')
     $scope.subscriptionDescription =
-      reply: 'Receive notification emails when: - Someone replies to one of my annotations'
+      reply: 'Someone replies to one of my annotations'
 
     onSuccess = (form, response) ->
       # Fire flash messages.

h/templates/client/settings/notifications.html

 <div class="tab-pane" title="Notifications">
   <form class="account-form form" name="notificationsForm">
-    <p class="form-description">Receive notification emails for:</p>
+    <p class="form-description">Receive notification emails when:</p>
     <div class="form-field form-checkbox-list">
       <div class="form-checkbox-item" ng-repeat="subscription in subscriptions">
         <input id="checkbox-{{$index}}" type="checkbox" ng-model="subscription.active" ng-change="updated($index, notificationsForm)" />