koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha installer/install.pl koha-tmpl/intranet-tm...


From: Joshua Ferraro
Subject: [Koha-cvs] koha installer/install.pl koha-tmpl/intranet-tm...
Date: Tue, 03 Jul 2007 18:19:52 +0000

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Joshua Ferraro <kados>  07/07/03 18:19:52

Modified files:
        installer      : install.pl 
        koha-tmpl/intranet-tmpl/prog/en/admin: admin-home.tmpl 
                                               finesrules.tmpl 
                                               issuingrules.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl 
                                                   moredetail.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/cataloguing: additem-nomarc.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/circ: bookcount.tmpl 
                                              branchoverdues.tmpl 
                                              branchtransfers.tmpl 
                                              circulation.tmpl 
                                              pendingreserves.tmpl 
                                              returns.tmpl 
                                              selectbranchprinter.tmpl 
                                              stats.tmpl 
                                              transferstodo.tmpl 
                                              transferstoreceive.tmpl 
                                              waitingreserves.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/export: marc.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/includes: alt_menu-serials.inc 
                                                  members.js 
                                                  menu-admin.inc 
                                                  menus.inc 
        koha-tmpl/intranet-tmpl/prog/en/members: borrowers_details.tmpl 
                                                 deletemem.tmpl 
                                                 maninvoice.tmpl 
                                                 member.tmpl 
                                                 memberentryA.tmpl 
                                                 memberentryC.tmpl 
                                                 memberentryI.tmpl 
                                                 memberentryP.tmpl 
                                                 moremember.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/reports: bor_issues_top.tmpl 
                                                 borrowers_out.tmpl 
                                                 borrowers_stats.tmpl 
                                                 cat_issues_top.tmpl 
                                                 catalogue_out.tmpl 
                                                 issues_avg_stats.tmpl 
                                                 
issues_by_borrower_category.tmpl 
                                                 issues_stats.tmpl 
                                                 reports-home.tmpl 
                                                 reservereport.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/reserve: request.tmpl 

Log message:
        This is a language commit. I've gone through most of the templates and
        based on user feedback I've made the following changes:
        
        Borrower, Member => Patron
        Debarred => Restricted
        Issues => Checkouts
        Reserves => Holds

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/installer/install.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/members.js?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl?cvsroot=koha&r1=1.7&r2=1.8

Patches:
Index: installer/install.pl
===================================================================
RCS file: /sources/koha/koha/installer/install.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- installer/install.pl        3 Jul 2007 13:50:21 -0000       1.11
+++ installer/install.pl        3 Jul 2007 18:19:49 -0000       1.12
@@ -226,6 +226,7 @@
     my %hashlevel;
    # sort by filename -> prepend with numbers to specify order of insertion. 
     my @fnames = sort { my @aa = split /\/|\\/, ($a); my @bb = split /\/|\\/, 
($b); $aa[-1] lt $bb[-1] } $query->param('framework')  ;
+       $dbh->do('SET FOREIGN_KEY_CHECKS=0');
     my $request=$dbh->prepare("SELECT value FROM systempreferences WHERE 
variable='FrameworksLoaded'");
     $request->execute;
     my ($systempreference)=$request->fetchrow;
@@ -264,6 +265,7 @@
     $template->param("fwklanguage"=>$fwk_language,
                      "list"=>address@hidden);
     $template->param("$op"=>1);
+       $dbh->do('SET FOREIGN_KEY_CHECKS=1');
   } elsif ( $op && $op eq 'selectframeworks'){
     #Framework Selection
     #sql data for import are supposed to be located in 
misc/sql-datas/<language>/<level>

Index: koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl       4 May 2007 
16:24:08 -0000       1.11
+++ koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl       3 Jul 2007 
18:19:49 -0000       1.12
@@ -37,28 +37,28 @@
 </tr>
 
 <tr>
-<th colspan="2">Borrowers and circulation</th>
+<th colspan="2">Patrons and circulation</th>
 </tr>
 <tr>
-       <td><a href="/cgi-bin/koha/admin/categorie.pl">Borrower 
categories</a></td>
-       <td>Define borrower categories.</td>
+       <td><a href="/cgi-bin/koha/admin/categorie.pl">Patron 
categories</a></td>
+       <td>Define patron categories.</td>
 </tr>
 <tr>
        <td><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></td>
-       <td>Define cities and towns that your borrowers live in.</td>
+       <td>Define cities and towns that your patrons live in.</td>
 </tr>  
 <tr>
        <td><a href="/cgi-bin/koha/admin/roadtype.pl" >Road types</a>
        </td>
-       <td>Define road types. Fill this table to get a list of road types when 
adding/editing borrowers (can be used in Geographic statistics).</td>
+       <td>Define road types. Fill this table to get a list of road types when 
adding/editing patrons (can be used in Geographic statistics).</td>
 </tr>
 <tr>
-       <td><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></td>
-       <td>Define issuing rules in a matrix for branches / borrowers / item 
types (number of issues, duration, cost...).</td>
+       <td><a href="/cgi-bin/koha/admin/issuingrules.pl">Circulation 
rules</a></td>
+       <td>Define circulation rules in a matrix for libraries / patrons / 
itemtypes (number of checkouts, duration, cost...).</td>
 </tr>
 <tr>
        <td><a href="/cgi-bin/koha/admin/finesrules.pl">Fines rules</a></td>
-       <td>Define fines in a matrix for branches / borrowers / item types 
(cost, grace period...).</td>
+       <td>Define fines in a matrix for libraries / patrons / itemtypes (cost, 
grace period...).</td>
 </tr>
 <tr>
 <th colspan="2">Catalogue</th>

Index: koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl       16 Apr 2007 
16:54:33 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl       3 Jul 2007 
18:19:49 -0000       1.2
@@ -17,16 +17,16 @@
                <h3>Default values</h3>
                <p> If a cell is not filled, the 1st of the following value is 
searched :</p>
                <ul>
-                       <li>same branch and same borrower category, itemtype 
*</li>
-                       <li>same branch and same itemtype, borrower category 
*</li>
-                       <li>same itemtype and borrower category, branch *</li>
-                       <li>branch * and itemtype *, same borrower category</li>
-                       <li>branch * and borrower category *, same itemtype 
</li>
-                       <li>branch * and borrower category *, itemtype *</li>
+                       <li>same library and same patron category, itemtype 
*</li>
+                       <li>same patron and same itemtype, patron category 
*</li>
+                       <li>same itemtype and patron category, library *</li>
+                       <li>library * and itemtype *, same patron category</li>
+                       <li>library * and patron category *, same itemtype </li>
+                       <li>library * and patron category *, itemtype *</li>
                </ul>
        
                <form method="post" action="/cgi-bin/koha/admin/finesrules.pl">
-               <label for="branch">Select a branch :</label>
+               <label for="branch">Select a library :</label>
                        <select id="branch" name="branch">
                                <option value="">Default</option>
                        <!-- TMPL_LOOP NAME="branchloop" -->

Index: koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl     16 Apr 2007 
16:54:33 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl     3 Jul 2007 
18:19:49 -0000       1.4
@@ -16,15 +16,15 @@
                <h3>Default values</h3>
                <p> If a cell is not filled, the 1st of the following value is 
searched :</p>
                <ul>
-                       <li>same branch and same borrower category, itemtype 
*</li>
-                       <li>same branch and same itemtype, borrower category 
*</li>
-                       <li>same itemtype and borrower category, branch *</li>
+                       <li>same library and same patron category, itemtype 
*</li>
+                       <li>same library and same itemtype, patron category 
*</li>
+                       <li>same itemtype and patron category, library *</li>
                        <li>everywhere</li>
                        <li>If nothing is set, default is 21,5 (hardcoded)</li>
                </ul>
        </div>
                <form method="post" 
action="/cgi-bin/koha/admin/issuingrules.pl">
-               <label for="branch">Select a branch :</label>
+               <label for="branch">Select a library :</label>
                        <select id="branch" name="branch">
                                <option value="">Default</option>
                        <!-- TMPL_LOOP NAME="branchloop" -->
@@ -36,7 +36,7 @@
                        <input type="hidden" name="branch" value="<!-- TMPL_VAR 
NAME="branch" -->" />
                        
                        <table>
-                       <caption>Defining issuing rules for <!-- TMPL_VAR 
NAME="branch" --></caption>
+                       <caption>Defining circulation rules for <!-- TMPL_VAR 
NAME="branch" --></caption>
                        <tr>
                                <th>&nbsp;</th><!-- TMPL_LOOP NAME="title" 
--><th scope="col"><!-- TMPL_VAR NAME="in_title" --></th><!-- /TMPL_LOOP -->
                        </tr>

Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl    23 May 2007 
09:55:26 -0000      1.7
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl    3 Jul 2007 
18:19:49 -0000       1.8
@@ -418,7 +418,7 @@
 <!-- AVAILABILITY LIMITS -->
     <fieldset><legend>Location and availability: </legend>
         <p>
-        <label>Branch</label><select name="limit" id="branchloop">
+        <label>Library</label><select name="limit" id="branchloop">
         <!-- TMPL_LOOP NAME="branchloop" -->
         <option value="<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR 
NAME='branchname' --></option>
         <!-- /TMPL_LOOP -->

Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl   11 Mar 2007 
21:08:12 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl   3 Jul 2007 
18:19:49 -0000       1.4
@@ -44,8 +44,8 @@
 NAME="biblionumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->">Modify</a> |
         <a 
href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=<!--TMPL_VAR 
NAME="biblionumber"-->&itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a>
        <br />
-       <b>Home Branch:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
-       <b>Current Branch:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+       <b>Home Library:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+       <b>Current Library:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
        <b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
        <b>Last borrowed:</b> <!-- TMPL_VAR NAME="datelastborrowed" --><br>
        <b>Item Status:</b> <!-- TMPL_IF NAME="issue" -->On issue to <a 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- 
TMPL_ELSE -->Available <!-- /TMPL_IF --><br>

Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl     11 Mar 
2007 21:08:12 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl     3 Jul 
2007 18:19:49 -0000       1.4
@@ -33,7 +33,7 @@
 
 <!-- TMPL_LOOP NAME="ITEMS -->
 <tr><th scope="row">Item:</th><td><!-- TMPL_VAR NAME="barcode" --></td></tr>
-<tr><th scope="row">Home Branch:</th><td><!-- TMPL_VAR NAME="homebranch" 
--></td></tr>
+<tr><th scope="row">Home Library:</th><td><!-- TMPL_VAR NAME="homebranch" 
--></td></tr>
 <tr><th scope="row">Notes:</th><td><!-- TMPL_VAR NAME="itemnotes" --></td></tr>
 <!-- /TMPL_LOOP -->
 
@@ -47,7 +47,7 @@
 <caption>Add New Item</caption>
 <tr><th scope="row"><label for="barcode">Item Barcode:</label></th><td><input 
type="text" id="barcode" name="barcode" size="40" /></td>
 </tr>
-<tr><th scope="row"><label for="homebranch">Branch:</label></th><td><select 
name="homebranch" id="branch">
+<tr><th scope="row"><label for="homebranch">Library:</label></th><td><select 
name="homebranch" id="branch">
 <!-- TMPL_LOOP NAME="BRANCHES" -->
 <option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR 
NAME="branchname" --></option>
 <!-- /TMPL_LOOP -->

Index: koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl 11 Mar 2007 21:08:12 
-0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl 3 Jul 2007 18:19:49 
-0000       1.4
@@ -10,18 +10,18 @@
 <div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" 
method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR 
Name="biblionumber" -->"><input type="hidden" name="type" value="intra"><input 
type="submit" class="submit" value="Brief Display"></form> <form 
action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input 
type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->"><input 
type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->"><input 
type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" 
-->"><input type="hidden" name="bi" value="<!-- TMPL_VAR 
NAME="biblioitemnumber" -->"> <input type="submit" class="submit" value="Item 
Details"></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form 
action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" 
value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber"> <input 
type="submit" value="Place Reserve" class="submit"></form><!-- /TMPL_IF 
--></div>
 <div class="data">
 <table>
-               <tr><th>Home Branch: </th><td> <!-- TMPL_VAR Name="homebranch" 
--> </td></tr>
-               <tr><th>Current Branch: </th><td> <!-- TMPL_VAR 
Name="holdingbranch" --></td></tr>
-               <tr><th>Date arrived at current branch: </th><td> <!-- TMPL_VAR 
Name="lastdate" --> </td></tr>
+               <tr><th>Home Library: </th><td> <!-- TMPL_VAR Name="homebranch" 
--> </td></tr>
+               <tr><th>Current Library: </th><td> <!-- TMPL_VAR 
Name="holdingbranch" --></td></tr>
+               <tr><th>Date arrived at current library: </th><td> <!-- 
TMPL_VAR Name="lastdate" --> </td></tr>
                <tr><th>Number of issues since since the above date :</th><td> 
<!-- TMPL_VAR Name="count" --> </td></tr>
 </table>
 </div>
 <div class="table">
                <table>
                        <tr>
-                               <th> Branch</th>
-                               <th> No. of Issues</th>
-                               <th> Last seen at branch</th>
+                               <th>Library</th>
+                               <th>No. of times checked out</th>
+                               <th>Library last seen at</th>
                        </tr>
                        <!-- TMPL_LOOP Name="branchloop" -->
                                <tr>

Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl    18 Apr 2007 
14:20:54 -0000      1.6
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl    3 Jul 2007 
18:19:49 -0000       1.7
@@ -4,7 +4,7 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
-<h1>Circulation: Branch Overdues at <!-- TMPL_VAR NAME="LoginBranchname" 
--></h1>
+<h1>Circulation: Library Overdues at <!-- TMPL_VAR NAME="LoginBranchname" 
--></h1>
 
 <div id="mainbloc">
 <!-- selector of location -->
@@ -37,8 +37,8 @@
         <tr>
             <th>Date_due</th>
             <th>Title</th>
-            <th>Borrower</th>
-            <th>Location</th>
+            <th>Patron</th>
+            <th>Library</th>
             <th>Overdue status</th>
             <th>Notify by</th>
         </tr>

Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl   22 May 2007 
09:13:56 -0000      1.10
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl   3 Jul 2007 
18:19:49 -0000       1.11
@@ -91,7 +91,7 @@
                         Reserve Cancelled<br>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="setwaiting" -->
-                        Item should now be waiting at branch: <!-- TMPL_VAR 
Name="reqbrchname" --><br>
+                        Item should now be waiting at library: <!-- TMPL_VAR 
Name="reqbrchname" --><br>
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
                 <!-- TMPL_LOOP Name="errmsgloop" -->
@@ -99,10 +99,10 @@
                         No Item with barcode: <!-- TMPL_VAR Name="msg" -->
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="errispermanent" -->
-                            Please return item to home branch: <!-- TMPL_VAR 
Name="msg" -->
+                            Please return item to home library: <!-- TMPL_VAR 
Name="msg" -->
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="errdesteqholding" -->
-                        Item is already at destination branch.
+                        Item is already at destination library.
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="errwasreturned" -->
                         Item was on loan to <a 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR 
Name="borrowernumber" -->"><!-- TMPL_VAR Name="borrowernumber" --></a>
@@ -116,7 +116,7 @@
         <table>
             <caption>Transfer</caption>
             <tr>
-                <th scope="row">Destination branch:</th>
+                <th scope="row">Destination library:</th>
                 <td>
                     <select name="tobranchcd">
                         <!-- TMPL_LOOP Name="branchoptionloop" -->

Index: koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl       27 Jun 2007 
13:01:37 -0000      1.15
+++ koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl       3 Jul 2007 
18:19:49 -0000       1.16
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation
 <!-- TMPL_IF NAME="borrowernumber" -->
-&rsaquo; Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR 
name="firstname" -->
+&rsaquo; Checking out to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR 
name="firstname" -->
 (<!-- TMPL_VAR NAME="cardnumber" -->)
 <!-- /TMPL_IF --></title>
 
@@ -9,9 +9,9 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 <!-- TMPL_IF NAME="borrowernumber" -->
-    <h1>Issues</h1>
+    <h1>Checkouts</h1>
 <!-- TMPL_ELSE -->
-    <h1>Circulation &rsaquo; Issues</h1>
+    <h1>Circulation &rsaquo; Checkouts</h1>
 <!-- /TMPL_IF -->
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
@@ -31,7 +31,7 @@
         <!-- TMPL_IF NAME="streetaddress"-->
             <!-- TMPL_VAR NAME="streetaddress" -->,
         <!-- TMPL_ELSE -->
-            <span class="problem">No address stored for borrower.</span>
+            <span class="problem">No address stored for patron.</span>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="city" -->
             <!-- TMPL_VAR NAME="city" -->
@@ -65,7 +65,7 @@
         
             <!-- TMPL_IF NAME="dbarred" -->
                 <p>
-                Debarred: Patron is debarred <a 
href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber" -->&cardnumber=<!-- TMPL_VAR NAME="cardnumber" 
-->&destination=circ&status=0">Lift Debarment</a>
+                Restricted: Patron's account is restricted <a 
href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber" -->&cardnumber=<!-- TMPL_VAR NAME="cardnumber" 
-->&destination=circ&status=0">Lift restriction</a>
                 </p>
             <!-- /TMPL_IF -->
         
@@ -80,7 +80,7 @@
             <!-- TMPL_IF NAME="charges" -->
             <p>
             Fines: Patron has 
-            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- 
TMPL_VAR name="borrowernumber" -->">outstanding fines</a>.
+            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- 
TMPL_VAR name="borrowernumber" -->">Outstanding fines</a>.
             Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- 
TMPL_VAR name="borrowernumber" -->">Payment</a>
             </p>
             <!-- /TMPL_IF -->
@@ -111,10 +111,10 @@
 <!-- No card entered yet -->
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" 
id="mainform">
 <fieldset id="circ_circulation_borrower_search">
-    <legend>Search for a borrower</legend>
+    <legend>Search for a patron</legend>
 
     <p>
-    <label for="findborrower">Enter borrower card number or partial name: 
</label>
+    <label for="findborrower">Enter patron card number or partial name: 
</label>
     <input id="findborrower" name="findborrower" type="text" size="40"/>
     </p>
 
@@ -128,7 +128,7 @@
 
 <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
 <fieldset id="circ_circulation_needsconfirmation">
-<legend>Please Confirm Issue</legend>
+<legend>Please Confirm Checkout</legend>
 
 <ul>
 <!-- TMPL_IF NAME="DEBT" -->
@@ -152,7 +152,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="TOO_MANY" -->
-    <li>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" 
-->)</li>
+    <li>Too many checked out (already checked out / max : <!-- TMPL_VAR 
name="TOO_MANY" -->)</li>
 <!-- /TMPL_IF -->
 </ul>
 
@@ -181,7 +181,7 @@
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" 
/>
 
     <div id="action">
-    <input type="submit" value="Confirm Issue" accesskey="y" />
+    <input type="submit" value="Confirm Checkout" accesskey="y" />
     </div>
 
 </form>
@@ -190,7 +190,7 @@
     <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="borrowernumber" -->" />
 
     <div id="action">
-    <input type="submit" value="Don't Issue" accesskey="n" />
+    <input type="submit" value="Don't Checkout" accesskey="n" />
     </div>
 </form>
 
@@ -199,7 +199,7 @@
 <!-- /TMPL_IF --> <!-- NEEDSCONFIRMATION -->
 
 <!-- TMPL_IF NAME="issued" -->
-<p>Item issued</p>
+<p>Item Checked out</p>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="message" -->
@@ -214,13 +214,13 @@
 <!-- TMPL_IF NAME="CGIselectborrower" -->
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" 
name="mainform">
 <fieldset id="circ_circulation_selectborrower">
-    <legend>Borrower selection</legend>
+    <legend>Patron selection</legend>
 
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" 
/>
     <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" 
-->" />
 
     <p>
-    <label for="borrowernumber">Select a borrower: </label>
+    <label for="borrowernumber">Select a patron: </label>
     <!-- TMPL_VAR name="CGIselectborrower" -->
     </p>
 
@@ -241,10 +241,10 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
 <fieldset id="circ_circulation_issue">
-    <legend>Issue an item</legend>
+    <legend>Checkout an item</legend>
 
     <p>
-    <label for="barcode">Enter Item Barcode: </label><input type="text" 
name="barcode" size="14" />
+    <label for="barcode">Enter tem barcode: </label><input type="text" 
name="barcode" size="14" />
     
         <!-- RESULT OF ISSUING REQUEST -->
         <!-- TMPL_IF NAME="IMPOSSIBLE" -->
@@ -273,7 +273,7 @@
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="DEBARRED" -->
-            <li><span class="problem">Patron is debarred</span></li>
+            <li><span class="problem">Patron is restricted</span></li>
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
@@ -587,7 +587,7 @@
         <label for="stickyduedate">
        <!-- TMPL_IF NAME="stickyduedate" -->
             <input type="checkbox" id="stickyduedate" name="stickyduedate" 
<!-- TMPL_VAR NAME="selected" --> checked />
-            Remember due date for this borrower
+            Remember due date for this patron
 <!-- TMPL_ELSE -->
             <input type="checkbox" id="stickyduedate" name="stickyduedate" 
<!-- TMPL_VAR NAME="selected" --> />
 <!-- /TMPL_IF -->
@@ -615,14 +615,14 @@
 
 <!-- TMPL_IF NAME="WaitingReserveLoop" -->     
 <fieldset id="circ_circulation_issue">
-    <legend class="problem">Waiting reserves</legend>
-        This borrower has a waiting reservation : 
+    <legend class="problem">Holds waiting</legend>
+        This patron has holds waiting:
         <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
         <p>
             <ul> 
                 <li> <!-- TMPL_VAR NAME="title"--> (<!-- TMPL_VAR 
NAME="itemtype"-->), author : <!-- TMPL_VAR NAME="author"-->, reserved the : 
<!-- TMPL_VAR NAME="reservedate"--> 
             <!-- TMPL_IF NAME="waitingat" -->
-                document waiting at : <!-- TMPL_VAR NAME="waitingat" -->       
+                waiting at : <!-- TMPL_VAR NAME="waitingat" -->        
             <!-- /TMPL_IF -->
                 </li>
             </ul>
@@ -675,7 +675,7 @@
                         <a 
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 
640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF NAME="waitingposition" -->
-                        Waiting position for this document :
+                        Hold priority :
                         <b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
                         <!-- /TMPL_IF -->
                     </td>
@@ -684,17 +684,17 @@
 
                         <!-- TMPL_IF name="waiting" -->
                         <br/>
-                        <i>This document is available</i>
+                        <i>This hold is available</i>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="transfered" -->
                         <br/>
-                        <i>This document has been transfered from library : 
+                        <i>This hold has been transfered from library : 
                         <!-- TMPL_VAR NAME="frombranch" --> the : <!-- 
TMPL_VAR NAME="datesent" --> </i>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="nottransfered" -->
                         <br/>
-                        <i>This document hasn't been transfered yet from 
library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
+                        <i>This hold hasn't been transfered yet from library : 
<!-- TMPL_VAR NAME="nottransferedby" --></i>
                         <!-- /TMPL_IF -->
                 
                     </td>
@@ -733,7 +733,7 @@
     </tr>
     
     <tr>
-        <th colspan="6"><a name="today" id="today">Today issues</a></th>
+        <th colspan="6"><a name="today" id="today">Today checkouts</a></th>
     </tr>
     <!-- TMPL_LOOP NAME="todayissues" -->
     <!-- TMPL_IF NAME="togglecolor" -->
@@ -782,7 +782,7 @@
         <th>Renew?</th>
     </tr>
     <tr>
-        <th colspan="6"><a name="previous" id="previous">Previous 
issues</a></th>
+        <th colspan="6"><a name="previous" id="previous">Previous 
checkouts</a></th>
     </tr>
     <!-- TMPL_LOOP NAME="previssues" -->
     <!-- TMPL_IF NAME="togglecolor" -->

Index: koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl   23 Apr 2007 
16:42:59 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl   3 Jul 2007 
18:19:49 -0000       1.2
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation &rsaquo; Reserve</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Holds</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
@@ -13,7 +13,7 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
-<h1>Pending reserves as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
+<h1>Pending holds as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
 <div id="filters">
 <br />
 <form method="post" >
@@ -93,8 +93,8 @@
 <input type="submit" value="Go" class="submit">
 </p>
 </form>
-<p>The following reserves have not be affected to any item.</p>
-<p>Please go in the shelves, pickup a book and do a return on them :</p>
+<p>The following holds have not been filled.</p>
+<p>Please retrieve them and check them in</p>
 </div>
 
 <div class="searchresults">
@@ -105,7 +105,7 @@
             Priority
             <a href="/cgi-bin/koha/circ/reserve.pl?order=priority">Sort</a>
         </th>
-        <th >Reserve Date
+        <th >Hold Date
             <a href="/cgi-bin/koha/circ/reserve.pl?order=date">Sort</a>
         </th>
         <th >Patron
@@ -114,8 +114,8 @@
         <th >Title
         <a href="/cgi-bin/koha/circ/reserve.pl?order=biblio">Sort</a>
         </th>
-        <th >
-            Location
+        <th>
+            Library
         </th>
     </tr>
     

Index: koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl   22 May 2007 09:13:56 
-0000      1.13
+++ koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl   3 Jul 2007 18:19:50 
-0000       1.14
@@ -17,7 +17,7 @@
                 <a 
href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a>
         </td>
     </tr>
-    <tr><th>Reserved for: </th>
+    <tr><th>Hold for: </th>
     <td>
     <!-- TMPL_IF Name="wborcnum"-->
         <ul>
@@ -49,7 +49,7 @@
 <!-- TMPL_IF Name="found" -->
 <!-- case of a reservation found, and display info -->
     <!-- TMPL_IF Name="waiting" -->
-        <h2>Waiting Reserve Found in your library for <!-- TMPL_VAR 
Name="title" --></h2>
+        <h2>Waiting Hold Found in your library for <!-- TMPL_VAR Name="title" 
--></h2>
         <p>Patron: 
             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- 
TMPL_VAR NAME="borrowernumber" -->">
                 <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR 
Name="borfirstname" --> (<!-- TMPL_VAR Name="borcnum" -->)
@@ -70,7 +70,7 @@
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF Name="diffbranch" -->
-        <h3>Reserve needing transfert found</h3>
+        <h3>Hold needing transfer found</h3>
         <table>
             <caption><a 
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
             <tr>
@@ -141,9 +141,9 @@
     <!-- case of simple return no issue or transfer but with a reservation  -->
     <!-- TMPL_IF Name="reserved" -->
         <!-- TMPL_IF Name="transfertodo"-->
-            <h2>Reserve at an other library, transfer to do</h2>
+            <h2>Hold placed for another library, please transfer</h2>
         <!-- TMPL_ELSE -->
-            <h2>Waiting Reserve Found in your library</h2>
+            <h2>Waiting Hold Found in your library</h2>
         <!-- /TMPL_IF -->
         <p>Title:  <!-- TMPL_VAR Name="title" --></p>
         <p>Patron: 
@@ -159,9 +159,9 @@
         <!-- /TMPL_IF -->
         <form method="post" action="returns.pl" name="mainform" id="mainform">
             <!-- TMPL_IF name="transfertodo" -->
-                <input type="submit" value="Confirm reserve and transfer" />
+                <input type="submit" value="Confirm hold and transfer" />
             <!-- TMPL_ELSE -->
-                <input type="submit" value="Confirm reserve" />
+                <input type="submit" value="Confirm hold" />
             <!-- /TMPL_IF -->
             <!-- TMPL_LOOP Name="inputloop" -->
                     <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" 
-->" value="<!-- TMPL_VAR Name="barcode" -->" />

Index: koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl       11 Mar 
2007 21:08:12 -0000      1.6
+++ koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl       3 Jul 
2007 18:19:50 -0000       1.7
@@ -1,16 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Circulation &rsaquo; Set Branch</title>
+<title>Circulation &rsaquo; Set Library</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
 
-<h1>Circulation &rsaquo; Set Branch</h1>
+<h1>Circulation &rsaquo; Set Library</h1>
 
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
 <!-- TMPL_VAR NAME="branch" -->
 
-<label for="branch">Choose branch:</label>
+<label for="branch">Choose library:</label>
 <!--branchselection-->
        <select name="branch" id="branch">
        <!-- TMPL_LOOP Name="branchloop" -->

Index: koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl     11 Mar 2007 21:08:12 
-0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl     3 Jul 2007 18:19:50 
-0000       1.4
@@ -5,7 +5,7 @@
 <!-- TMPL_INCLUDE NAME="menu-circ.inc"-->
 
     <!-- TMPL_IF NAME="notime" -->
-        <h1>Display stats for</h1>
+        <h1>Display statistics for:</h1>
         <ul>
             <li><a 
href="/cgi-bin/koha/circ/stats.pl?time=yesterday">yesterday</a></li>
             <li><a href="/cgi-bin/koha/circ/stats.pl?time=today">today</a></li>
@@ -18,7 +18,7 @@
                        <th>Type</th>
                        <th>Date/time</th>
                        <th>Amount</th>
-                       <th>Branch</th>
+                       <th>Library</th>
                <tr>
                <!-- TMPL_LOOP name="loop1" -->
                <tr>

Index: koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl     5 Jun 2007 
09:47:07 -0000       1.3
+++ koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl     3 Jul 2007 
18:19:50 -0000       1.4
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation
 <!-- TMPL_IF Name="borrowernumber" -->
-: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" 
-->
+: Checkout to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" 
-->
 (<!-- TMPL_VAR NAME="cardnumber" -->)
 <!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -17,18 +17,18 @@
             <!-- TMPL_IF NAME="branchcode" -->
             <table>
             <tr>
-                <th colspan="5">Reserves in wait to the library : <!-- 
TMPL_VAR NAME="branchname" --> </th>
+                <th colspan="5">Holds waiting for: <!-- TMPL_VAR 
NAME="branchname" --> </th>
             </tr>
             <tr>
-                <th>Date of reserve</th>
+                <th>Date of hold</th>
                 <th>Title</th>
-                <th>Borrower</th>
+                <th>Patron</th>
                 <th>Localisation</th>
                 <th>Action</th>
             </tr>
             <!-- TMPL_LOOP NAME="reserv" -->
                 <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- 
/TMPL_IF -->>
-                    <td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- 
TMPL_IF NAME="messcompa" --> Reserve over <!-- /TMPL_IF --></td>
+                    <td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- 
TMPL_IF NAME="messcompa" --> Hold over <!-- /TMPL_IF --></td>
                     <td>
                             <p>
                                     <a 
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>

Index: koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl        22 May 
2007 09:13:56 -0000      1.2
+++ koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl        3 Jul 
2007 18:19:50 -0000       1.3
@@ -7,7 +7,7 @@
 <div id="mainbloc">
        <h1 class="circulation">Transfers made TO your library on : <!-- 
TMPL_VAR NAME="show_date" --></h1>
        <!-- TMPL_IF name="branchesloop" -->
-            <p>You are the destination of the following transfer(s)</p>
+            <p>Your library is the destination for the following 
transfer(s)</p>
             <div id="resultlist">
             <!-- TMPL_LOOP NAME="branchesloop" -->
                 <!-- TMPL_IF NAME="branchcode" -->

Index: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl   22 May 2007 
09:13:57 -0000      1.2
+++ koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl   3 Jul 2007 
18:19:50 -0000       1.3
@@ -4,14 +4,14 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
-<h1>Circulation: Branch Reserves</h1>
+<h1>Circulation: Library Holds</h1>
 
 <div id="mainbloc">
-        <h2 class="circulation">Reserves of your library the : <!-- TMPL_VAR 
NAME="show_date" --></h2>
+        <h2 class="circulation">Holds for your library on : <!-- TMPL_VAR 
NAME="show_date" --></h2>
         <!-- TMPL_IF NAME="messagetransfert" -->
                 <div>
-                                <h2>Reserve find for the document(<!-- 
TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
-                        <p>This documen is reserved by : <b> <!-- TMPL_VAR 
NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> 
at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this 
document in transfer .
+                                <h2>Hold find for(<!-- TMPL_VAR 
NAME="nextreservtitle" -->)must transfered</h2>
+                        <p>This hold placed by : <b> <!-- TMPL_VAR 
NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> 
at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please transfer 
this hold.
                         </p>
                         <form name="cancelReservewithtransfert" 
action="waitingreserves.pl" method="post">
                                 <input type="submit" class="button 
circulation">
@@ -20,9 +20,9 @@
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="waiting" -->
                 <div id="bloc25">
-                                <h2 class="circulation">This document is in 
Waiting status</h2>
-                        <p>This document (<!-- TMPL_VAR NAME="nextreservtitle" 
-->) is reserved by <b> : <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- 
TMPL_VAR NAME="nextreservfirstname" --></b>,
-                        Please keep this document for the next reserve .
+                                <h2 class="circulation">This hold is 
waiting</h2>
+                        <p>This hold (<!-- TMPL_VAR NAME="nextreservtitle" 
-->) was placed by <b> : <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- 
TMPL_VAR NAME="nextreservfirstname" --></b>,
+                        Please retain this hold.
                         </p>
                         <form name="cancelReservewithwaiting" 
action="waitingreserves.pl" method="post">
                                 <input type="submit">
@@ -34,18 +34,18 @@
             <!-- TMPL_IF NAME="reserveloop" -->
                 <table>
                 <tr>
-                        <th class="circulation" colspan="5">Reserves of your 
library</th>
+                        <th class="circulation" colspan="5">Holds at your 
library</th>
                 </tr>
                 <tr>
                         <th class="circulation">Available since</th>
                         <th class="circulation">Title</th>
-                        <th class="circulation">Borrower</th>
+                        <th class="circulation">Patron</th>
                         <th class="circulation">Localisation</th>
                         <th class="circulation">Action</th>
                 </tr>
                         <!-- TMPL_LOOP NAME="reserveloop" -->
                                 <tr <!-- TMPL_IF NAME="messcompa" --> 
class="problem" <!-- /TMPL_IF -->>
-                                        <td><p><!-- TMPL_VAR 
NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve Over <!-- 
/TMPL_IF --></td>
+                                        <td><p><!-- TMPL_VAR 
NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Hold Over <!-- 
/TMPL_IF --></td>
                                         <td>
                                                 <p>
                                                         <a 
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
@@ -77,7 +77,7 @@
                         <!-- /TMPL_LOOP -->
                 </table>
                 <!-- TMPL_ELSE -->
-                    <p><b>No reserve found.</b></p>
+                    <p><b>No hold found.</b></p>
                 <!-- /TMPL_IF -->
         </div>
         <!-- /TMPL_UNLESS -->

Index: koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl    9 Mar 2007 15:41:07 
-0000       1.3
+++ koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl    3 Jul 2007 18:19:50 
-0000       1.4
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC 
Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
 
-<h1>MARC Export</h1>
+<h1>MARC Export Utility</h1>
 <h4>Export in MARC format the following biblios:</h4>
 <form method="post">
 <p>From biblio number: <input type="text" name="StartingBiblionumber" />
@@ -9,6 +9,4 @@
 <input type="hidden" name="op" value="export" />
 <input type="submit" value="Export" />
 </form>
-<p>Note : the items are NOT exported by this tool</p>
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc       20 Jul 
2006 05:43:25 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc       3 Jul 
2007 18:19:50 -0000       1.2
@@ -1,6 +1,6 @@
     <p>
          <a href="/cgi-bin/koha/serials/serials-home.pl">Search/Add 
Subscription</a>
          <a href="/cgi-bin/koha/serials/serials-home.pl?routing=1">Create/Edit 
Routing List</a>
-         <a href="/cgi-bin/koha/serials/lateissues.pl">Outstanding Issues</a>
+         <a href="/cgi-bin/koha/serials/lateissues.pl">Late Issues</a>
         <a href="/cgi-bin/koha/serials/claims.pl">Claims</a>
     </p>

Index: koha-tmpl/intranet-tmpl/prog/en/includes/members.js
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/members.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/includes/members.js 27 Jun 2007 13:01:37 
-0000      1.2
+++ koha-tmpl/intranet-tmpl/prog/en/includes/members.js 3 Jul 2007 18:19:50 
-0000       1.3
@@ -43,7 +43,7 @@
 if (  document.form.check_member.value==1){
        if (document.form.categorycode.value != "I"){
                
-               msg1 += ("Warning  !!!! Duplicate borrower!!!!");
+               msg1 += ("Warning  !!!! Duplicate patron!!!!");
                alert(msg1);
        check_form_borrowers(0);
        document.form.submit();
@@ -138,7 +138,7 @@
                        }
                }
        }
-//borrowers form 2 test if u chcked no to the quetsion of double 
+//patrons form to test if you chcked no to the quetsion of double 
        if (document.form.step.value==2 && statut!=1 && 
document.form.check_member.value > 0 )
        {
                
@@ -146,7 +146,7 @@
                        if (!(document.form_double.answernodouble.checked)){
                                        
                                message ="";
-                                       message_champ+=("Please confirm 
suspicious duplicate borrower !!! ");
+                                       message_champ+=("Please confirm 
suspicious duplicate patron !!! ");
                                        statut=1;
                                        document.form.nodouble.value=0;
                        }

Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc     30 May 2007 
09:33:18 -0000      1.6
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc     3 Jul 2007 
18:19:50 -0000       1.7
@@ -3,7 +3,7 @@
         <a href="/cgi-bin/koha/admin/branches.pl">Branches</a>
         <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>
         <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
-        <a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a>
+        <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a>
         <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
     </p>
     <p>

Index: koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc  6 Jun 2007 13:08:36 
-0000       1.14
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc  3 Jul 2007 18:19:50 
-0000       1.15
@@ -12,7 +12,7 @@
     <ul>
        <li>
        <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-        <label for="navfindborrower">Issue to:</label>
+        <label for="navfindborrower">Check out to:</label>
             <input id="navfindborrower" name="findborrower" type="text" 
size="10" />
             <input type="hidden" name="branch" value="<!-- TMPL_VAR 
name="branch" -->" />
             <input type="hidden" name="printer" value="<!-- TMPL_VAR 
name="printer" -->" />
@@ -20,13 +20,13 @@
        </form>
        </li>
        <li>
-        <a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Returns</a>
+        <a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a>
        </li>
         <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
      </ul>
      <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_borrowers" -->
-    <a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a>
+    <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
     <ul>
         <li><form action="/cgi-bin/koha/members/member.pl" method="post">
            <label for="navmember">Search:&nbsp;</label>

Index: koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl      11 Mar 
2007 21:08:13 -0000      1.4
+++ koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl      3 Jul 
2007 18:19:50 -0000       1.5
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Borrower Details</title>
+<title>Patron Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <div id="mainbloc">
-       <h1>BORROWER DETAILS</h1>
+       <h1>PATRON DETAILS</h1>
        
        <form name="form" method="post" 
action="/cgi-bin/members/borrowers_details.pl">
        <div >
@@ -10,34 +10,34 @@
                
                <p>
                
-                       <label>borrower categorie</label>               
+                       <label>Patron category</label>          
                        <input  type="text" name="description" size="20"  
value="<!-- TMPL_VAR NAME="description" -->" >
                </p>
                <p>
                        
-                       <label>organisation name</label>
+                       <label>Organisation name</label>
                        <input  style="text-transform:uppercase;" type="text" 
name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
                </p>
                
        <!-- TMPL_ELSE -->      
 
                <p>
-                       <label>borrower categorie</label>
+                       <label>Patron category</label>
                        <input  type="text" name="description" size="20"  
value="<!-- TMPL_VAR NAME="description" -->" >
                        </p>
                <p>
-                       <label>title</label>
+                       <label>Title</label>
                        <input  type="text" name="title" size="20"  value="<!-- 
TMPL_VAR NAME="title" -->" >
                        
                </p>
                <p>
-                       <label>surname</label>
+                       <label>Surname</label>
                        <input  style="text-transform:uppercase;" type="text" 
name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
                </p>
                        
                <p>     
                        
-                       <label>firstname</label>
+                       <label>Firstname</label>
                        <input  style="text-transform:capitalize;" type="text" 
name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
                </p>
                <p>

Index: koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl      11 Mar 2007 
21:08:13 -0000      1.4
+++ koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl      3 Jul 2007 
18:19:50 -0000       1.5
@@ -1,17 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Can't Delete Borrower</title>
+<title>Koha &rsaquo; Can't Delete Patron</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-       <h3>Cannot Delete Borrower</h3>
+       <h3>Cannot Delete Patron</h3>
                <!-- TMPL_IF name="ItemsOnIssues" -->
-                       Borrower has <!-- TMPL_VAR name="ItemsOnIssues" --> 
item(s) checked out.
+                       Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> 
item(s) checked out.
                <!-- /TMPL_IF -->
                <!-- TMPL_IF name="charges -->
-                       Borrower has <!-- TMPL_VAR name="charges" --> in fines.
+                       Patron has <!-- TMPL_VAR name="charges" --> in fines.
                <!-- /TMPL_IF -->
                <!-- TMPL_IF name="guarantees" -->
-                       Borrower's record has guaranteed accounts attached.
+                       Patron's record has guaranteed accounts attached.
                <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl     11 Mar 2007 
21:08:13 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl     3 Jul 2007 
18:19:50 -0000       1.4
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Borrowers &rsaquo; Create Manual Invoice</title>
+<title>Koha &rsaquo; Patrons &rsaquo; Create Manual Invoice</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->

Index: koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 23 May 2007 09:44:15 
-0000      1.10
+++ koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 3 Jul 2007 18:19:50 
-0000       1.11
@@ -1,11 +1,11 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Borrowers &rsaquo; Search Results</title>
+<title>Koha &rsaquo; Patrons &rsaquo; Search Results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a 
href="/cgi-bin/koha/members/members-home.pl">Borrowers</a><!-- TMPL_IF 
NAME="searching" --> &rsaquo; <a>Search Results</a><!-- /TMPL_IF -->
+<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a 
href="/cgi-bin/koha/members/members-home.pl">patrons</a><!-- TMPL_IF 
NAME="searching" --> &rsaquo; <a>Search Results</a><!-- /TMPL_IF -->
 
 <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
     <label for="member">Search by name or barcode:</label>

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl   2 Jul 2007 
02:30:15 -0000       1.19
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl   3 Jul 2007 
18:19:50 -0000       1.20
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Adult Borrower Management</title>
+<title>Koha &rsaquo; Adult Patron Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' 
-->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -8,11 +8,11 @@
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
        <!-- TMPL_IF NAME="opadd" -->
        <h1>
-               Add adult borrower (step <!-- TMPL_VAR NAME="step" -->) <!-- 
TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
+               Add adult patron (step <!-- TMPL_VAR NAME="step" -->) <!-- 
TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
        </h1>
        <!-- TMPL_ELSE -->
        <h1 >
-               Modify adult borrower <!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_VAR name="firstname" -->
+               Modify adult patron <!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_VAR name="firstname" -->
        </h1>
        <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="check_member" -->
@@ -44,7 +44,7 @@
                                <p>login/password already exist</p>
                        <!-- /TMPL_IF -->
                         <!-- TMPL_IF NAME="ERROR_age_limitations" -->
-                                Borrower is too young or too old for this 
category
+                                Patron is too young or too old for this 
category
                         <!-- /TMPL_IF -->
                </div>
        <!-- /TMPL_IF -->
@@ -104,7 +104,7 @@
                <input type="hidden" name="op" value="modify">
        <!-- /TMPL_IF -->
        <fieldset id="memberentry_identity">
-               <legend>Borrower identity</legend>
+               <legend>Patron identity</legend>
                <p>
                <!-- TMPL_IF NAME="female" -->
                <input type="radio" name="sex" value="F" checked>Female
@@ -192,7 +192,7 @@
                </p>
        </fieldset>
        <fieldset id="memberentry_identity">
-               <legend>Borrower type</legend>
+               <legend>Patron type</legend>
                <p>
                <!-- TMPL_IF NAME="catcodepopup" -->
                            <label>Category</label>

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl   2 Jul 2007 
02:30:16 -0000       1.19
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl   3 Jul 2007 
18:19:51 -0000       1.20
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Child Borrower Management</title>
+<title>Koha &rsaquo; Child Patron Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' 
-->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -9,11 +9,11 @@
 
        <!-- TMPL_IF NAME="add" -->
        <h1>
-               Add child borrower (step <!-- TMPL_VAR NAME="step" -->) <!-- 
TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
+               Add child patron (step <!-- TMPL_VAR NAME="step" -->) <!-- 
TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
        </h1>
        <!-- TMPL_ELSE -->
        <h1 >
-               Modify child borrower <!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_VAR name="firstname" -->
+               Modify child patron <!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_VAR name="firstname" -->
        </h1>
        <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="check_member" -->
@@ -41,7 +41,7 @@
                                <p>login/password already exist</p>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF NAME="ERROR_age_limitations" -->
-                                Borrower is too young or too old for this 
category
+                                Patron is too young or too old for this 
category
                         <!-- /TMPL_IF -->
                </div>
        <!-- /TMPL_IF -->
@@ -111,7 +111,7 @@
                                 <input type="text" name="cardnumber" size="10" 
value="<!-- TMPL_VAR NAME="cardnumber" -->">
                        </p>    
        <fieldset id="memberentry_identity">
-               <legend>Borrower identity</legend>
+               <legend>Patron identity</legend>
                <p>
                <!-- TMPL_IF NAME="female" -->
                <input type="radio" name="sex" value="F" checked>Female
@@ -202,7 +202,7 @@
        </p>
        </fieldset>
        <fieldset id="memberentry_identity">
-               <legend>Borrower type</legend>
+               <legend>Patron type</legend>
                <p>
                    <!-- TMPL_IF NAME="catcodepopup" -->
                            <label>Category</label>

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl   22 May 2007 
09:13:57 -0000      1.14
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl   3 Jul 2007 
18:19:51 -0000       1.15
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Organisation Borrower Management</title>
+<title>Koha &rsaquo; Organisation Patron Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' 
-->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -9,11 +9,11 @@
 
     <!-- TMPL_IF NAME="opadd" -->
         <h1>
-                Add organisation borrower (step <!-- TMPL_VAR NAME="step" -->) 
<!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
+                Add organisation patron (step <!-- TMPL_VAR NAME="step" -->) 
<!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
         </h1>
         <!-- TMPL_ELSE -->
         <h1 >
-                Modify organisation borrower <!-- TMPL_VAR NAME="surname" --> 
<!-- TMPL_VAR name="firstname" -->
+                Modify organisation patron <!-- TMPL_VAR NAME="surname" --> 
<!-- TMPL_VAR name="firstname" -->
         </h1>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="check_member" -->
@@ -301,14 +301,14 @@
                 </p>
         </fieldset>
         <fieldset>
-                <legend>Borrower list</legend>
+                <legend>Patron list</legend>
                 <p>
                         <!-- TMPL_IF NAME="mandatorycontactnote" -->
                                 <label style="font-weight:bold">
                         <!--TMPL_ELSE-->
                                 <label>
                         <!-- /TMPL_IF-->
-                        Persons that can issue books</label>
+                         Can check out books</label>
                         <textarea  name="contactnote" cols="70" rows="2"   
><!-- TMPL_VAR NAME="contactnote" --></textarea>    
                 </p>
         <fieldset>

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl   2 Jul 2007 
02:30:16 -0000       1.15
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl   3 Jul 2007 
18:19:51 -0000       1.16
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Professional Borrower Management</title>
+<title>Koha &rsaquo; Professional Patron Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' 
-->/includes/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -8,16 +8,16 @@
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
     <!-- TMPL_IF NAME="opadd" -->
-    <h1>Add professional borrower (step <!-- TMPL_VAR NAME="step" -->) <!-- 
TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --></h1>
+    <h1>Add professional patron (step <!-- TMPL_VAR NAME="step" -->) <!-- 
TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --></h1>
     <!-- TMPL_ELSE -->
-    <h1>Modify professional borrower <!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_VAR name="firstname" --></h1>
+    <h1>Modify professional patron <!-- TMPL_VAR NAME="surname" --> <!-- 
TMPL_VAR name="firstname" --></h1>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="check_member" -->
         <!-- TMPL_IF NAME="step_2" -->
     <p>
     <form name="form_double">
         <div id="problem">
-            Duplicate borrower suspected 
+            Duplicate patron suspected 
             <a 
href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR 
NAME="check_member"-->');" class="borrowers_button">Details</a>
             Duplicate ? 
             <a 
href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR 
NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" 
class="borrowers_button">Yes</a> 
@@ -37,7 +37,7 @@
             login already exists
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="ERROR_age_limitations" -->
-            Borrower age is wrong for this category
+            Patron age is wrong for this category
             <!-- /TMPL_IF -->
         </div>
     <!-- /TMPL_IF -->
@@ -106,7 +106,7 @@
             <input type="text" name="cardnumber" size="10" value="<!-- 
TMPL_VAR NAME="cardnumber" -->">
     </p>    
     <fieldset id="memberentry_identity">
-        <legend>Borrower identity</legend>
+        <legend>Patron identity</legend>
         <p>
         <!-- TMPL_IF NAME="female" -->
         <input type="radio" name="sex" value="F" checked>Female
@@ -186,13 +186,13 @@
         </p>
     </fieldset>
     <fieldset id="memberentry_identity">
-        <legend>Borrower type</legend>
+        <legend>Patron type</legend>
         <p>
     <!-- TMPL_IF NAME="catcodepopup" -->
                 <label>Category</label>
                 <!-- TMPL_VAR NAME="catcodepopup" -->
             <!-- TMPL_ELSE -->
-                <span class="problem">There is no category type to add a 
Professional borrower.</span>
+                <span class="problem">There is no category type to add a 
Professional patron.</span>
                 Please <a href="/cgi-bin/koha/admin/categorie.pl">create 
one</a>
                  
             <!-- /TMPL_IF -->

Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     28 Jun 2007 
07:59:42 -0000      1.23
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     3 Jul 2007 
18:19:51 -0000       1.24
@@ -1,13 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Borrower's Details</title>
+<title>Koha &rsaquo; Patron Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
 <!-- TMPL_IF NAME="unknowuser" -->
-    This borrower doesn't exist anymore.<a href="javascript:back();">Go 
Back</a>
+    This patron doesn't exist.<a href="javascript:back();">Go Back</a>
 <!-- TMPL_ELSE -->
-<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a 
href="/cgi-bin/koha/members/members-home.pl">Borrowers</a> &rsaquo; <a 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber" -->">Details for <!-- TMPL_VAR NAME="firstname" --> <!-- 
TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a>
+<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a 
href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; <a 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber" -->">Details for <!-- TMPL_VAR NAME="firstname" --> <!-- 
TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a>
 
 <form action="" name="form">
 <input type="hidden" name="reregistration" value="<!-- TMPL_VAR 
NAME="reregistration"-->"/> 
@@ -73,7 +73,7 @@
 <!-- TMPL_IF NAME="flagged" -->
     <ul>
         <!-- TMPL_IF NAME="debarred" -->
-            <li>Borrower is debarred 
+            <li>Patron is restricted
             <form class="inline compact" 
action="/cgi-bin/koha/members/setdebar.pl" method="post">
                 <input type="hidden" name="borrowernumber" value="<!-- 
TMPL_VAR NAME="borrowernumber" -->" />
                 <input type="hidden" name="status" value="0" />
@@ -81,14 +81,14 @@
             </form>
             </li>
         <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="gonenoaddress" --><li>Borrower's address is in 
doubt.</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="lost" --><li>Borrower's card has been reported 
lost.</li><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="gonenoaddress" --><li>Patron's address is in 
doubt.</li><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="lost" --><li>Patron's card has been reported 
lost.</li><!-- /TMPL_IF -->
     </ul>
 
 <!-- /TMPL_IF -->
 
 <fieldset>
-<legend>Borrower information</legend>
+<legend>Patron information</legend>
     <!-- TMPL_UNLESS NAME="I" -->
     <p><label>Title:</label><!-- TMPL_VAR NAME="title" -->&nbsp;</p> 
     <p><label>First name:</label><!-- TMPL_VAR NAME="firstname" --></p>
@@ -140,7 +140,7 @@
 </fieldset>
 <fieldset>
     <legend>Library use</legend>
-    <p><label>Borrower number:</label><!-- TMPL_VAR NAME="borrowernumber" 
--></p>
+    <p><label>Patron number:</label><!-- TMPL_VAR NAME="borrowernumber" --></p>
     <p><label>Category:</label><!-- TMPL_VAR NAME="description" --></p>
     <p><label>Registration date:</label><!-- TMPL_VAR NAME="dateenrolled" 
--></p>
     <p><label>Relation:</label><!-- TMPL_VAR NAME="relationship" --></p>
@@ -169,7 +169,7 @@
        <p><label>OPAC password: </label><span class="problem">Undefined 
&nbsp;</span></p> 
    <!--/TMPL_IF --> 
        <p><label>Circulation notes:</label><!-- TMPL_VAR name="borrowernotes" 
--> &nbsp;</p>
-    <p><label>Borrower message:</label><!-- TMPL_VAR NAME="opacnote" --> 
&nbsp;</p>
+    <p><label>Message to Patron:</label><!-- TMPL_VAR NAME="opacnote" --> 
&nbsp;</p>
 </fieldset>
 <!-- TMPL_UNLESS NAME="P" -->
 <!-- TMPL_UNLESS NAME="I" -->
@@ -292,7 +292,7 @@
     </div>
 <!-- TMPL_IF NAME="reservloop" -->
 <div id="circ_circulation_issue">
-       <h2>Borrower current reserves</h2>
+       <h2>Patron current reserves</h2>
        <table>
                <tr>
                        <th>Reserve date</th>

Index: koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl 11 Mar 2007 
21:08:14 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl 3 Jul 2007 
18:19:51 -0000       1.4
@@ -18,7 +18,7 @@
 }
 </script>
        <!-- TMPL_LOOP NAME="mainloop" -->
-               <h1>Top <!-- TMPL_VAR NAME="limit"--> List borrowers for 
Issues</h1>
+               <h1>Top <!-- TMPL_VAR NAME="limit"--> List patrons for 
Checkouts</h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -28,7 +28,7 @@
                
                <table>
                        <tr >
-                               <th>Rank/Borrowers</th>
+                               <th>Rank/Patronss</th>
                                <!-- TMPL_LOOP NAME="loopcol" -->
                                        <th colspan="2"><!-- TMPL_VAR 
NAME="coltitle" --></th>
                                <!-- /TMPL_LOOP -->
@@ -36,7 +36,7 @@
                        <tr >
                                <th>&nbsp;</th>
                                <!-- TMPL_LOOP NAME="loopcol" -->
-                                       <th>Borrower</th>
+                                       <th>Patron</th>
                                        <th>Issues count</th>
                                <!-- /TMPL_LOOP -->
                        </tr>
@@ -59,7 +59,7 @@
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Top List borrowers for Issues</h1>
+       <h1>Patrons who checked out the most items</h1>
        <form method="post">
        
        <table>
@@ -241,7 +241,7 @@
                        <tr class="hilighted">
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
-                               <td>Borrower Category</td>
+                               <td>Patron Category</td>
                                <td><input type="text" name="Filter" value="" 
/></td>
                        </tr>
                        <tr>

Index: koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl  11 Mar 2007 
21:08:14 -0000      1.4
+++ koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl  3 Jul 2007 
18:19:51 -0000       1.5
@@ -13,7 +13,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
     <!-- TMPL_LOOP NAME="mainloop" -->
-        <h1>Borrowers with No Issues</h1>
+        <h1>Patrons with No. Checkouts</h1>
         <!-- TMPL_IF NAME="loopfilter"-->
             <p>Filtered on</p>
             <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -23,7 +23,7 @@
         
         <table>
             <tr >
-                <th>Num/Borrowers</th>
+                <th>Num/Patronss</th>
                 <!-- TMPL_LOOP NAME="loopcol" -->
                     <th><!-- TMPL_VAR NAME="coltitle" --></th>
                 <!-- /TMPL_LOOP -->
@@ -42,7 +42,7 @@
         </table>
     <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-    <h1>Borrowers with no Issues</h1>
+    <h1>Patrons with no Checkouts</h1>
     <form method="post">
     
     <table>
@@ -79,7 +79,7 @@
             <tr class="hilighted">
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>Borrower category</td>
+                <td>Patron category</td>
                 <td><input type="text" name="Filter" value="" /></td>
             </tr>
             <tr class="hilighted">

Index: koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl        21 Jun 
2007 15:49:25 -0000      1.4
+++ koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl        3 Jul 
2007 18:19:51 -0000       1.5
@@ -13,7 +13,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
-               <h1>Borrowers statistics</h1>
+               <h1>Patrons statistics</h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -57,7 +57,7 @@
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Borrowers statistics</h1>
+       <h1>Patrons statistics</h1>
        <form method="post">
        <table>
                <thead>
@@ -70,13 +70,13 @@
                </thead>
                <tbody>
                        <tr class="hilighted">
-                       <td>Borrower category</td>
+                       <td>Patron category</td>
                        <td><input type="radio" name="Line" 
value="categorycode" /></td>
                        <td><input type="radio" name="Column" 
value="categorycode" /></td>
                        <td ><!-- TMPL_VAR NAME="CGICatCode" --></td>
                        </tr>
                        <tr>
-                       <td>Borrower status</td>
+                       <td>Patron status</td>
                        <td></td>
                        <td></td>
                        <td ><select name="status"><option value=""> 
</option><option value="debarred">debarred</option><option 
value="gonenoadress">gone no adress</option><option 
value="lost">lost</option></td>

Index: koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl 11 Mar 2007 
21:08:14 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl 3 Jul 2007 
18:19:51 -0000       1.4
@@ -19,7 +19,7 @@
 }
 </script>
        <!-- TMPL_LOOP NAME="mainloop" -->
-               <h1>Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues 
</h1>
+               <h1>Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue 
Checkout </h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -38,7 +38,7 @@
                                <th>&nbsp;</th>
                                <!-- TMPL_LOOP NAME="loopcol" -->
                                        <th>Item</th>
-                                       <th>Issues count</th>
+                                       <th>Count of Checkouts</th>
                                <!-- /TMPL_LOOP -->
                        </tr>
                                <!-- TMPL_LOOP NAME="looprow" -->
@@ -60,7 +60,7 @@
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Top List On Catalogue Issues</h1>
+       <h1>Top List On Catalogue Checkouts</h1>
        <form method="post">
        
        <table>
@@ -242,7 +242,7 @@
                        <tr class="hilighted">
                                <td>&nbsp;</td>
                                <td>&nbsp;</td>
-                               <td>Borrower Category</td>
+                               <td>Patron Category</td>
                                <td><input type="text" name="Filter" value="" 
/></td>
                        </tr>
                        <tr>

Index: koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl  11 Mar 2007 
21:08:14 -0000      1.4
+++ koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl  3 Jul 2007 
18:19:51 -0000       1.5
@@ -13,7 +13,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
-               <h1>Items with no issues</h1>
+               <h1>Items with no checkouts</h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->

Index: koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl       11 Mar 
2007 21:08:14 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl       3 Jul 
2007 18:19:51 -0000       1.4
@@ -13,7 +13,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
-               <h1>Issues Average Period statistics </h1>
+               <h1>Checkouts Average Period statistics </h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -55,7 +55,7 @@
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Koha : Issues Average Period statistics </h1>
+       <h1>Koha : Checkouts Average Period statistics </h1>
        <form method="post">
        <table>
                <thead>

Index: koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl    
11 Mar 2007 21:08:14 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl    
3 Jul 2007 18:19:51 -0000       1.4
@@ -12,7 +12,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 <!-- TMPL_LOOP NAME="mainloop" -->
-       <h1>Issues by borrower category <!--TMPL_IF NAME="borrower_category" 
--> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF 
--></h1>
+       <h1>Checkouts by patron category <!--TMPL_IF NAME="borrower_category" 
--> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF 
--></h1>
        <table>
                <tr>
                        <th>&nbsp;</th>
@@ -47,7 +47,7 @@
        </table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-       <h1>Issues by borrower category</h1>
+       <h1>Checkouts by patron category</h1>
        <form method="post">
                <p>Select a borrower category (or don't if you want to see 
global status) <input type="text" name="value" /></p>
                <p>Select a branch : <!-- TMPL_VAR NAME="CGIbranch" --></p>

Index: koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl   18 Apr 2007 
14:19:52 -0000      1.4
+++ koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl   3 Jul 2007 
18:19:51 -0000       1.5
@@ -13,7 +13,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
     <!-- TMPL_LOOP NAME="mainloop" -->
-        <h1>Issues statistics </h1>
+        <h1>Checkouts statistics </h1>
         <!-- TMPL_IF NAME="loopfilter" -->
             <p>Filtered on</p>
             <ul>
@@ -59,7 +59,7 @@
         </table>
     <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-    <h1>Issues statistics </h1>
+    <h1>Checkouts statistics </h1>
     <form method="post">
     <table>
         <thead>
@@ -175,7 +175,7 @@
                 </td>
         </tr>
         <tr >
-            <td>Borrower Category</td>
+            <td>Patron Category</td>
             <td><input type="radio" name="Line" value="borrowers.categorycode" 
/></td>
             <td><input type="radio" name="Column" 
value="borrowers.categorycode" /></td>
             <td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
@@ -206,7 +206,7 @@
         </tr>
         <!-- TMPL_IF Name="hassort1" -->
             <tr class="hilighted"> 
-                    <td>Borrower sort1</td>
+                    <td>Patron sort1</td>
                     <td><input type="radio" name="Line" 
value="borrowers.sort1" /></td>
                     <td><input type="radio" name="Column" 
value="borrowers.sort1" /></td>
                     <td><!-- TMPL_VAR NAME="CGISort1" --> </td>
@@ -214,7 +214,7 @@
         <!-- /TMPL_IF -->
         <!-- TMPL_IF Name="hassort2" -->
             <!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- 
TMPL_ELSE --><tr><!--/TMPL_IF --> 
-                <td>Borrower sort2</td>
+                <td>Patron sort2</td>
                 <td><input type="radio" name="Line" value="borrowers.sort2" 
/></td>
                 <td><input type="radio" name="Column" value="borrowers.sort2" 
/></td>
                 <td><!-- TMPL_VAR NAME="CGISort2" --> </td>
@@ -224,7 +224,7 @@
         </tbody>
     </table>
         <h3> Cell value </h3>
-            <p><input type="radio" name="Cellvalue" value="1" 
checked="checked" /> Count issues </p>
+            <p><input type="radio" name="Cellvalue" value="1" 
checked="checked" /> Count checkouts </p>
             <p><input type="radio" name="Cellvalue" value="3" /> Circulation 
rate </p>
         <h3> Output </h3>
         <input type="radio" checked name="output" value="screen" /> To screen 
into the browser

Index: koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl   11 Mar 2007 
21:08:14 -0000      1.6
+++ koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl   3 Jul 2007 
18:19:51 -0000       1.7
@@ -17,7 +17,7 @@
        <h2>Statistics wizards</h2>
        <ul>
                <li><a 
href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
-               <li><a 
href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></li>
+               <li><a 
href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
                <li><a 
href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></li>
                <li><a 
href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
        </ul>
@@ -25,13 +25,13 @@
 
        <h2>Top Lists</h2>
        <ul>
-               <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Most 
issuing borrowers</a></li>
-               <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most 
issued items</a></li>
+               <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons 
checking out the most</a></li>
+               <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Items 
checked out the most</a></li>
        </ul>
        <h2>Inactive</h2>
        <ul>
-               <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Borrowers 
without issues</a></li>
-               <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not 
issued</a></li>
+               <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons 
who haven't checked out</a></li>
+               <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not 
checked out</a></li>
        </ul>
 
 
@@ -40,7 +40,7 @@
                <li><a 
href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by 
itemtype</a></li>
        </ul>
        <ul>
-               <li><a 
href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues
 by borrower category</a></li>
+               <li><a 
href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Checkouts
 by patron category</a></li>
                <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average 
loan time</a></li>
        </ul>
 

Index: koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl  11 Mar 2007 
21:08:14 -0000      1.3
+++ koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl  3 Jul 2007 
18:19:51 -0000       1.4
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Reserve Report &rsaquo; All Reserves</title>
+<title>Koha &rsaquo; Hold Report &rsaquo; All Holds</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <table>
-       <tr><th>Name</th><th>Reserve Date</th><th>Title</th><th>Class</th></tr>
+       <tr><th>Name</th><th>Hold Date</th><th>Title</th><th>Class</th></tr>
        <!-- TMPL_LOOP Name="dataloop" -->
                <tr>
                        <td>

Index: koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl        22 May 2007 
09:13:58 -0000      1.7
+++ koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl        3 Jul 2007 
18:19:51 -0000       1.8
@@ -34,14 +34,14 @@
 }
 
 if (count_reserv == "0"){
-               msg += ("- Please select a document to reserve\n");
+               msg += ("- Please select an item to place a hold\n");
 }
 if (count_reserv >= "2"){
                msg += ("- You can select only one type of document\n by item, 
or by the first item returned\n");
 }
 
 if (alreadyreserved > "0"){
-               msg += ("- This borrower had already reserved this document\n 
Please cancel the previous reserve first \n");
+               msg += ("- This patron had already placed a hold on this item\n 
Please cancel the previous hold first \n");
 }
 
        if (msg == "") return(true);
@@ -53,15 +53,15 @@
 </script>
 <!-- TMPL_IF NAME="messagetransfert" -->
                <div>
-                               <h2>Reserve find for the document(<!-- TMPL_VAR 
NAME="nextreservtitle" -->)must transfered</h2>
-                       <p>This documen is reserved by : <b> <!-- TMPL_VAR 
NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> 
at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this 
document in transfer .
+                               <h2>Hold found for (<!-- TMPL_VAR 
NAME="nextreservtitle" -->), please transfer</h2>
+                       <p>Hold placed by : <b> <!-- TMPL_VAR 
NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> 
at : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please transfer this item.
                        </p>
                        <form name="cancelReservewithtransfert" 
action="branchreserves.pl" method="post">
                                <input type="submit" class="button circulation">
                        </form>
                </div>
        <!-- /TMPL_IF -->
-<h1>Reserves</h1>
+<h1>Holds</h1>
 
   <h2>Biblio informations</h2>
     <p><label>Title: </label><a 
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
@@ -72,7 +72,7 @@
     <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" 
-->" method="post" onSubmit="request.pl" name="getborrower">
         <!-- TMPL_UNLESS name="CGIselectborrower" -->
                 <p>
-                <label>Member</label>
+                <label>Patron</label>
                 <input type="text" size="20" name="findborrower"> (type card 
number or part of a name)
                 </p>
                 <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR 
NAME="biblionumber"-->">
@@ -86,16 +86,16 @@
 <!-- TMPL_ELSE -->
   <!-- TMPL_IF NAME="maxreserves" -->
     <p class="problem">
-      <label><u>Too many reserves</u></label>
-      Currently, this member has too much active reserves.
+      <label><u>Too many holds</u></label>
+      Currently, this patron has too many holds.
     </p>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="expiry" -->
     <br>
     <p class="problem">
-      <label>Expired card</label>
-      The card of this member is expired
+      <label>Expired account</label>
+      This patron's account has expired
     </p>
     <!-- /TMPL_IF -->
 
@@ -109,12 +109,12 @@
     <!-- TMPL_IF NAME="alreadyreserved" -->                    
     <p class="problem">
       <label>Operation can be make</label>
-      This borrower had already make a reserve for this document
+      This patron already has a hold on this item
     </p>
     <!-- /TMPL_IF -->
 
   <!-- TMPL_IF NAME="messageborrower" -->
-    <div class="problem">Carrefull,there is no borrower with this name, 
Please, try an other </div>
+    <div class="problem">No patron with this name, Please, try an other </div>
   <!-- /TMPL_IF -->
     <h3>Reserve properties</h3>
         <form action="placerequest.pl" method="post" onSubmit="return 
check();" name="form">
@@ -124,7 +124,7 @@
         <input type="hidden" name="type" value="str8">
         <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" 
-->">
         <input type="hidden" name="rank-request" value="<!-- TMPL_VAR 
NAME="fixedRank" -->">
-        <p><label>Member</label>
+        <p><label>Patron</label>
             <!-- TMPL_IF NAME="cardnumber"-->
                 <!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR 
NAME="borrowerfirstname" -->
                 (card number: <!--  TMPL_VAR NAME="cardnumber" -->)
@@ -245,7 +245,7 @@
     <table>
       <tr>
         <th>Priority</th>
-        <th>Member</th>
+        <th>Patron</th>
         <th>Notes</th>
         <th>Date</th>
         <th>Pick up location</th>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]