From 3bbbf4375434c8a3a49c5b2e49dd9a300603e574 Mon Sep 17 00:00:00 2001
From: Joshua Ferraro <jmf@liblime.com>
Date: Fri, 29 Feb 2008 10:17:23 -0500
Subject: [PATCH] nomenclature cleanup on email notification for subscriptions

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/modules/opac-alert-subscribe.tmpl          |  4 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl   |  2 +-
 .../opac-tmpl/prog/en/modules/opac-serial-issues.tmpl  | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
index d464832004..f5457a35f0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
@@ -11,7 +11,7 @@
     <!-- TMPL_IF name="typeissue" -->
         <h1 class="catalogue">Subscribe issue recieve warning</h1>
             <form action="opac-alert-subscribe.pl" method="post">
-                <p>Do you want to be mailed when a new issue for this subscription arrives at the library ?</p>
+                <p>Do you want to receive an email when a new issue for this subscription arrives?</p>
                 <!-- TMPL_VAR name="bibliotitle" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF --> arrive ?</p>
                 <input type="hidden" name="externalid" value="<!-- TMPL_VAR name="externalid" -->">
                 <input type="hidden" name="alerttype" value="issue">
@@ -25,7 +25,7 @@
     <!-- TMPL_IF name="typeissuecancel" -->
         <h1 class="catalogue">Unsubscribe</h1>
             <form action="opac-alert-subscribe.pl" method="post">
-                <p>Do you confirm you want to unsubscribe mail warning for this subscription ?</p>
+                <p>Please confirm that you do not want to receive email when a new issue arrives for this subscription</p>
                 <!-- TMPL_VAR name="bibliotitle" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF --> ?</p>
                 <input type="hidden" name="externalid" value="<!-- TMPL_VAR name="externalid" -->">
                 <input type="hidden" name="alerttype" value="issue">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 02989bcc62..23b626f54a 100755
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -307,7 +307,7 @@
                 </td>
                 <td>    <!--TMPL_VAR Name="planneddate"-->
                 </td>
-                <td>    <!--TMPL_IF Name="status1"-->Waited
+                <td>    <!--TMPL_IF Name="status1"-->Awaited
                     <!--TMPL_ELSE -->
                     <!-- TMPL_IF Name="status2"-->Arrived
                     <!--TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
index 05948559f6..95d6d0cb1f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
@@ -105,12 +105,12 @@
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="letter" -->
         <!-- TMPL_IF name="hasalert" -->
-            You already follow this subscription <a href="opac-alert-subscribe.pl?op=cancel&amp;externalid=<!-- TMPL_VAR name="subscriptionid" -->&amp;alerttype=issue&amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="Cancel alert">
-                Cancel mail alert
+            You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&amp;externalid=<!-- TMPL_VAR name="subscriptionid" -->&amp;alerttype=issue&amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="Cancel email notification">
+                Cancel email notification
             </a>
         <!-- TMPL_ELSE -->
-            <a href="opac-alert-subscribe.pl?externalid=<!-- TMPL_VAR name="subscriptionid" -->&amp;alerttype=issue&amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="Be alerted when an issue arrive at the library">
-                Be mailed when a new issue arrives at the library
+            <a href="opac-alert-subscribe.pl?externalid=<!-- TMPL_VAR name="subscriptionid" -->&amp;alerttype=issue&amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button" title="Subscribe to email notification on new issues">
+                Subscribe to email notification on new issues
             </a>
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
@@ -125,4 +125,4 @@
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
-- 
2.39.5