From d1a6fe8fdd91bb94e47ce3dbc9c2b2f3e04f5a29 Mon Sep 17 00:00:00 2001
From: Karl Carstensen <karl.carstensen@SF-003855-AP.local>
Date: Sun, 1 May 2016 14:08:44 -0700
Subject: [PATCH] Fixes to spelling and grammar throughout

---
 views/campaigns/edit.hbs                   | 6 +++---
 views/emails/confirm-html.hbs              | 2 +-
 views/emails/confirm-text.hbs              | 2 +-
 views/lists/edit.hbs                       | 2 +-
 views/lists/segments/rule-configure.hbs    | 2 +-
 views/lists/segments/rule-edit.hbs         | 4 ++--
 views/lists/subscription/add.hbs           | 4 ++--
 views/lists/subscription/import-failed.hbs | 2 +-
 views/lists/view.hbs                       | 8 ++++----
 views/subscription/manage.hbs              | 4 ++--
 views/subscription/subscribe.hbs           | 4 ++--
 views/templates/create.hbs                 | 6 +++---
 views/templates/edit.hbs                   | 6 +++---
 views/users/account.hbs                    | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/views/campaigns/edit.hbs b/views/campaigns/edit.hbs
index e33bcb73..a6272361 100644
--- a/views/campaigns/edit.hbs
+++ b/views/campaigns/edit.hbs
@@ -128,13 +128,13 @@
 
                                     <ul>
                                         <li>
-                                            <code>[FIRST_NAME]</code> – first name of the subcriber
+                                            <code>[FIRST_NAME]</code> – first name of the subscriber
                                         </li>
                                         <li>
-                                            <code>[LAST_NAME]</code> – last name of the subcriber
+                                            <code>[LAST_NAME]</code> – last name of the subscriber
                                         </li>
                                         <li>
-                                            <code>[FULL_NAME]</code> – first and last names of the subcriber joined
+                                            <code>[FULL_NAME]</code> – first and last names of the subscriber joined
                                         </li>
                                         <li>
                                             <code>[LINK_UNSUBSCRIBE]</code> – URL that points to the preferences page of the subscriber
diff --git a/views/emails/confirm-html.hbs b/views/emails/confirm-html.hbs
index 54b5a573..0d45a4ce 100644
--- a/views/emails/confirm-html.hbs
+++ b/views/emails/confirm-html.hbs
@@ -16,7 +16,7 @@
 
     <p><a href="{{confirmUrl}}" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Yes, subscribe me to this list</a></p>
 
-    <p>If you received this email by mistake, simply delete it. You won't be subscribed if you don't click the confirmation link above.</p>
+    <p>If you received this email by mistake, simply delete it. You won't be subscribed unless you click the confirmation link above.</p>
 
     <p>For questions about this list, please contact:
         <br/>{{contactAddress}}</p>
diff --git a/views/emails/confirm-text.hbs b/views/emails/confirm-text.hbs
index 3440f1e0..74a4e69d 100644
--- a/views/emails/confirm-text.hbs
+++ b/views/emails/confirm-text.hbs
@@ -4,7 +4,7 @@ Please Confirm Subscription
 
 Yes, subscribe me to this list: {{{confirmUrl}}}
 
-If you received this email by mistake, simply delete it. You won't be subscribed if you don't click the confirmation link above.
+If you received this email by mistake, simply delete it. You won't be subscribed unless you click the confirmation link above.
 
 For questions about this list, please contact:
 {{{contactAddress}}}
diff --git a/views/lists/edit.hbs b/views/lists/edit.hbs
index dc41bb4c..760afcdd 100644
--- a/views/lists/edit.hbs
+++ b/views/lists/edit.hbs
@@ -5,7 +5,7 @@
     <li class="active">Edit List</li>
 </ol>
 
-<h2>Edit List <a class="btn btn-default btn-xs" href="/lists/view/{{id}}" role="button"><span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span> View list</a></h2>
+<h2>Edit List <a class="btn btn-default btn-xs" href="/lists/view/{{id}}" role="button"><span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span> View List</a></h2>
 
 <hr>
 
diff --git a/views/lists/segments/rule-configure.hbs b/views/lists/segments/rule-configure.hbs
index e8509374..5c89cf33 100644
--- a/views/lists/segments/rule-configure.hbs
+++ b/views/lists/segments/rule-configure.hbs
@@ -27,7 +27,7 @@
             <label for="value" class="col-sm-2 control-label">Value</label>
             <div class="col-sm-10">
                 <input type="text" class="form-control" name="value" id="value" value="{{value.value}}" placeholder="Value">
-                <span class="help-block">Use % for wildcard character, eg. "%test" to match all values that end with "test"</span>
+                <span class="help-block">Use % for wildcard character, e.g. "%test" to match all values that end with "test"</span>
             </div>
         </div>
     {{/if}}
diff --git a/views/lists/segments/rule-edit.hbs b/views/lists/segments/rule-edit.hbs
index 6d84ee35..260c131d 100644
--- a/views/lists/segments/rule-edit.hbs
+++ b/views/lists/segments/rule-edit.hbs
@@ -32,7 +32,7 @@
             <label for="value" class="col-sm-2 control-label">Value</label>
             <div class="col-sm-10">
                 <input type="text" class="form-control" name="value" id="value" value="{{value.value}}" placeholder="Value">
-                <span class="help-block">Use % for wildcard character, eg. "%test" to match all values that end with "test"</span>
+                <span class="help-block">Use % for wildcard character, e.g. "%test" to match all values that end with "test"</span>
             </div>
         </div>
     {{/if}}
@@ -167,7 +167,7 @@
                         </div>
                     </div>
                     <div class="col-md-1">
-                        <p class="form-control-static text-center">to</p>
+                        <p class="form-control-static text-center">To</p>
                     </div>
                     <div class="col-md-3">
                         <div class="input-group date fm-birthday-generic">
diff --git a/views/lists/subscription/add.hbs b/views/lists/subscription/add.hbs
index 00293523..f9582388 100644
--- a/views/lists/subscription/add.hbs
+++ b/views/lists/subscription/add.hbs
@@ -14,7 +14,7 @@
     <input type="hidden" name="list" value="{{list.id}}">
 
     <div class="form-group">
-        <label for="email" class="col-sm-2 control-label">Email address</label>
+        <label for="email" class="col-sm-2 control-label">Email Address</label>
         <div class="col-sm-10">
             <input type="email" class="form-control input-lg" name="email" id="email" placeholder="" value="{{email}}" required>
         </div>
@@ -122,7 +122,7 @@
     <div class="form-group">
         <div class="col-sm-offset-2 col-sm-10">
             <p class="text-warning">
-                This person will not receive a confirmation email so make sure you have a permission to email them
+                This person will not receive a confirmation email so make sure that you have permission to email them.
             </p>
 
             <button type="submit" class="btn btn-primary">Subscribe</button>
diff --git a/views/lists/subscription/import-failed.hbs b/views/lists/subscription/import-failed.hbs
index d1f3093a..54157cf8 100644
--- a/views/lists/subscription/import-failed.hbs
+++ b/views/lists/subscription/import-failed.hbs
@@ -10,7 +10,7 @@
 <hr>
 
 <div class="well">
-    Role-based addresses like <em><strong>postmaster</strong>@example.com</em> are blocked when importing. Subscribers with role-based email addresses can join your list using the <a href="/subscription/{{list.cid}}">subsription form</a>.
+    Role-based addresses like <em><strong>postmaster</strong>@example.com</em> are blocked when importing. Subscribers with role-based email addresses can join your list using the <a href="/subscription/{{list.cid}}">subscription form</a>.
 </div>
 
 <div class="table-responsive">
diff --git a/views/lists/view.hbs b/views/lists/view.hbs
index a5eed89b..893290fe 100644
--- a/views/lists/view.hbs
+++ b/views/lists/view.hbs
@@ -17,8 +17,8 @@
             <li><a href="/segments/{{id}}" role="button"><span class="glyphicon glyphicon-filter" aria-hidden="true"></span> Segments</a></li>
             <li><a href="/lists/edit/{{id}}" role="button"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span> Edit List</a></li>
             <li role="separator" class="divider"></li>
-            <li><a href="/lists/subscription/{{id}}/add" role="button"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> Add subscriber</a></li>
-            <li><a href="/lists/subscription/{{id}}/import" role="button"><span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span> Import subscribers</a></li>
+            <li><a href="/lists/subscription/{{id}}/add" role="button"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> Add Subscriber</a></li>
+            <li><a href="/lists/subscription/{{id}}/import" role="button"><span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span> Import Subscribers</a></li>
         </ul>
     </div>
 </div>
@@ -41,7 +41,7 @@
         <div class="form-group">
             <label for="exampleInputName2">Segment</label>
             <select name="segment" class="form-control">
-                <option value="0">All subscriptions</option>
+                <option value="0">All Subscriptions</option>
                 {{#if segments}}
                     <optgroup label="Segments">
                         {{#each segments}}
@@ -50,7 +50,7 @@
                     </optgroup>
                 {{/if}}
                 <optgroup label="Actions">
-                    <option value="-1">Create new segment…</option>
+                    <option value="-1">Create New Segment…</option>
                 </optgroup>
             </select>
         </div>
diff --git a/views/subscription/manage.hbs b/views/subscription/manage.hbs
index ef578e53..7795eb9b 100644
--- a/views/subscription/manage.hbs
+++ b/views/subscription/manage.hbs
@@ -13,7 +13,7 @@
     <input type="hidden" name="cid" value="{{cid}}">
 
     <div class="form-group">
-        <label for="email">Email address</label>
+        <label for="email">Email Address</label>
         <input type="email" class="form-control" name="email" id="email" placeholder="" value="{{email}}" readonly>
     </div>
 
@@ -50,7 +50,7 @@
             {{#if typeGpg}}
                 {{#if ../hasPubkey}}
                     <div class="pull-right">
-                        <button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verififcation key</button>
+                        <button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verification key</button>
                     </div>
                 {{/if}}
                 <textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>
diff --git a/views/subscription/subscribe.hbs b/views/subscription/subscribe.hbs
index 4f1347f1..630ae256 100644
--- a/views/subscription/subscribe.hbs
+++ b/views/subscription/subscribe.hbs
@@ -10,7 +10,7 @@
     <input type="hidden" name="_csrf" value="{{csrfToken}}">
 
     <div class="form-group">
-        <label for="email">Email address</label>
+        <label for="email">Email Address</label>
         <input type="email" class="form-control" name="email" id="email" placeholder="" value="{{email}}" required>
     </div>
 
@@ -47,7 +47,7 @@
             {{#if typeGpg}}
                 {{#if ../hasPubkey}}
                     <div class="pull-right">
-                        <button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verififcation key</button>
+                        <button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verification key</button>
                     </div>
                 {{/if}}
                 <textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>
diff --git a/views/templates/create.hbs b/views/templates/create.hbs
index d1036592..a1026875 100644
--- a/views/templates/create.hbs
+++ b/views/templates/create.hbs
@@ -29,13 +29,13 @@
 
                 <ul>
                     <li>
-                        <code>[FIRST_NAME]</code> – first name of the subcriber
+                        <code>[FIRST_NAME]</code> – first name of the subscriber
                     </li>
                     <li>
-                        <code>[LAST_NAME]</code> – last name of the subcriber
+                        <code>[LAST_NAME]</code> – last name of the subscriber
                     </li>
                     <li>
-                        <code>[FULL_NAME]</code> – first and last names of the subcriber joined
+                        <code>[FULL_NAME]</code> – first and last names of the subscriber joined
                     </li>
                     <li>
                         <code>[LINK_UNSUBSCRIBE]</code> – URL that points to the preferences page of the subscriber
diff --git a/views/templates/edit.hbs b/views/templates/edit.hbs
index f41065f8..a9ca57af 100644
--- a/views/templates/edit.hbs
+++ b/views/templates/edit.hbs
@@ -35,13 +35,13 @@
 
                 <ul>
                     <li>
-                        <code>[FIRST_NAME]</code> – first name of the subcriber
+                        <code>[FIRST_NAME]</code> – first name of the subscriber
                     </li>
                     <li>
-                        <code>[LAST_NAME]</code> – last name of the subcriber
+                        <code>[LAST_NAME]</code> – last name of the subscriber
                     </li>
                     <li>
-                        <code>[FULL_NAME]</code> – first and last names of the subcriber joined
+                        <code>[FULL_NAME]</code> – first and last names of the subscriber joined
                     </li>
                     <li>
                         <code>[LINK_UNSUBSCRIBE]</code> – URL that points to the preferences page of the subscriber
diff --git a/views/users/account.hbs b/views/users/account.hbs
index 2940616b..352ce1dc 100644
--- a/views/users/account.hbs
+++ b/views/users/account.hbs
@@ -13,7 +13,7 @@
 
     <fieldset>
         <legend>
-            General settings
+            General Settings
         </legend>
 
         <div class="form-group">
@@ -31,7 +31,7 @@
         </legend>
 
         <p>
-            You only need to fill this part if you want to change your current password
+            You only need to fill out this form if you want to change your current password
         </p>
 
         <div class="form-group">