[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/bull subscr... [rel_2_2]

[Ryan Higgins]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Ryan Higgins <rych>	07/04/26 04:30:48

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/bull: subscription-detail.tmpl 
	                                     serial-issues.tmpl 
	                                     full-serial-issues.tmpl 

Log message:
	small language changes 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.7&r2=1.2.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/full-serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/subscription-detail.tmpl,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -b -r1.2.2.7 -r1.2.2.8
--- subscription-detail.tmpl	4 Dec 2006 05:32:10 -0000	1.2.2.7
+++ subscription-detail.tmpl	26 Apr 2007 04:30:48 -0000	1.2.2.8
@@ -404,7 +404,7 @@
 			</td>
 			<td>
 					<!--TMPL_IF name="status1" -->
-						Waited
+						Waiting
 					<!-- /TMPL_IF -->
 					<!--TMPL_IF name="status2" -->
 						Arrived

Index: serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/serial-issues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- serial-issues.tmpl	20 May 2006 22:29:54 -0000	1.1.2.3
+++ serial-issues.tmpl	26 Apr 2007 04:30:48 -0000	1.1.2.4
@@ -83,8 +83,8 @@
 			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
 			</b>
 		</p>
-		<p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
-		<!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was received on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
+		<p>The last subscription period began <b><!-- TMPl_VAR name="startdate" --></b></p>
+		<!-- TMPL_IF name="enddate" --><p>The last issue in this subscription <!-- TMPL_IF NAME="status1" --> is <!-- TMPL_ELSE --> was <!-- /TMPL_IF -->  expected on  <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
 	<!--TMPL_UNLESS Name=fullinfo -->
 		<p><!-- TMPL_VAR name="notes" --></p>
 		<!-- TMPL_IF name="opacnote" -->
@@ -94,7 +94,7 @@
 			</p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF name="recievedlist" -->
-			<h3>Recieved issues</h2>
+			<h3>Received issues</h2>
 			<p>
 				<!-- TMPL_VAR name="recievedlist" -->
 			</p>

Index: full-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/full-serial-issues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- full-serial-issues.tmpl	4 Aug 2006 18:50:59 -0000	1.1.2.3
+++ full-serial-issues.tmpl	26 Apr 2007 04:30:48 -0000	1.1.2.4
@@ -50,8 +50,8 @@
 					<!-- TMPL_VAR Name="serialseq" -->
 				</td>
 				<td>
-					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="status2" -->Arrived<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="status1" -->Waiting<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
 				</td>