[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbooks.tmpl,1.20,1.20.2.1 isbnsearch.tmpl,1.15,1.15.2.1 marcimport.tmpl,1.8,1.8.2.1

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1092/koha-tmpl/intranet-tmpl/default/en/acqui.simple

Modified Files:
      Tag: rel_2_2
        addbooks.tmpl isbnsearch.tmpl marcimport.tmpl 
Log Message:
Correcting terminology: 'reservoir' instead of 'breeding farm'

Index: addbooks.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -r1.20 -r1.20.2.1
*** addbooks.tmpl       2 Dec 2004 16:40:35 -0000       1.20
--- addbooks.tmpl       3 Feb 2005 16:21:14 -0000       1.20.2.1
***************
*** 35,39 ****
                <h2 class="catalogue">Hint</h2>
                <p>If the ISBN or title is found in the biblio table, it will 
be retrieved and can be modified.<br/>
!                               If the ISBN or title is found in the breeding 
farm, it will be retrieved and a biblio will be added.<br/>
                                Otherwise, a biblio can be added from 
scratch.</p>
        </div>
--- 35,39 ----
                <h2 class="catalogue">Hint</h2>
                <p>If the ISBN or title is found in the biblio table, it will 
be retrieved and can be modified.<br/>
!                               If the ISBN or title is found in the reservoir, 
it will be retrieved and a biblio will be added.<br/>
                                Otherwise, a biblio can be added from 
scratch.</p>
        </div>

Index: isbnsearch.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** isbnsearch.tmpl     2 Dec 2004 16:40:35 -0000       1.15
--- isbnsearch.tmpl     3 Feb 2005 16:21:14 -0000       1.15.2.1
***************
*** 61,65 ****
                        <!-- /TMPL_IF -->
                </p>
!               <h2 class="catalogue">Biblios in breeding farm</h2>
                <!-- TMPL_IF name="breeding_loop" -->
                        <table>
--- 61,65 ----
                        <!-- /TMPL_IF -->
                </p>
!               <h2 class="catalogue">Biblios in reservoir</h2>
                <!-- TMPL_IF name="breeding_loop" -->
                        <table>

Index: marcimport.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** marcimport.tmpl     19 Jul 2004 19:22:10 -0000      1.8
--- marcimport.tmpl     3 Feb 2005 16:21:14 -0000       1.8.2.1
***************
*** 4,8 ****
  <table bgcolor="#ffcc00" width="80%" cellpadding="3">
        <tr valign="center">
!       <td><font size="4">Import into the breeding farm</font></td>
        </tr>
  </table>
--- 4,8 ----
  <table bgcolor="#ffcc00" width="80%" cellpadding="3">
        <tr valign="center">
!       <td><font size="4">Import into the reservoir</font></td>
        </tr>
  </table>
***************
*** 20,25 ****
  <!-- TMPL_ELSE -->
  <ul>
!       <li>Select a file to import into the breeding farm. It will be parsed, 
and for each ISBN found, a new baby will be created in the breeding farm.</li>
!       <li>If an ISBN already exists in the breeding farm, you can choose 
whether to ignore the new one or overwrite the old one.</li>
        <li>You can enter a name for this import. It may be useful, when 
creating a biblio, to remember where the suggested MARC data comes from!</li>
        <li>Of course, if the ISBN already exists in the active DB, the biblio 
will be ignored.</li>
--- 20,25 ----
  <!-- TMPL_ELSE -->
  <ul>
!       <li>Select a file to import into the reservoir. It will be parsed, and 
for each ISBN found, a new baby will be created in the reservoir.</li>
!       <li>If an ISBN already exists in the reservoir, you can choose whether 
to ignore the new one or overwrite the old one.</li>
        <li>You can enter a name for this import. It may be useful, when 
creating a biblio, to remember where the suggested MARC data comes from!</li>
        <li>Of course, if the ISBN already exists in the active DB, the biblio 
will be ignored.</li>
***************
*** 46,50 ****
        </tr>
        <tr valign="top">
!               <td>If ISBN already in breeding farm: </td>
                <td><input type="radio" name="overwrite_biblio" value="0" 
checked>Ignore this one, keep the existing one<br/>
                        <input type="radio" name="overwrite_biblio" 
value="1">Overwrite the existing one with this</td>
--- 46,50 ----
        </tr>
        <tr valign="top">
!               <td>If ISBN is already in the reservoir: </td>
                <td><input type="radio" name="overwrite_biblio" value="0" 
checked>Ignore this one, keep the existing one<br/>
                        <input type="radio" name="overwrite_biblio" 
value="1">Overwrite the existing one with this</td>