[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.6,1.6.2.1 basket.tmpl,1.7.2.1,1.7.2.2 newbiblio.tmpl,1.8.2.1,1.8.2.2

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_0
        acqui-home.tmpl basket.tmpl newbiblio.tmpl 
Log Message:
TEMPLATE fixes.
Many fixes :
* replacing "X  Y" by "X Y" (2 spaces between 2 words by 1 only)
* updating some strings to ease translation.

ONLY FOR TRANSLATION PURPOSES.

Index: acqui-home.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** acqui-home.tmpl     9 Dec 2003 10:29:07 -0000       1.6
--- acqui-home.tmpl     26 Jan 2004 10:46:36 -0000      1.6.2.1
***************
*** 70,74 ****
                        <tr>
                                <td><b>Budgets</B></TD>
!                               <TD><b>Total</B></TD>
                                <TD><b>Spent</B></TD>
                                <TD><b>Comtd</B></TD>
--- 70,74 ----
                        <tr>
                                <td><b>Budgets</B></TD>
!                               <TD><b> Total</B></TD>
                                <TD><b>Spent</B></TD>
                                <TD><b>Comtd</B></TD>
***************
*** 85,89 ****
                        <!-- /TMPL_LOOP -->
                        <tr>
!                               <td><b>Total</b></TD>
                                <TD align=right><b><!-- TMPL_VAR name="total" 
--></b></TD>
                                <TD align=right><b><!-- TMPL_VAR 
name="totspent" --></b></TD>
--- 85,89 ----
                        <!-- /TMPL_LOOP -->
                        <tr>
!                               <td><b> Total</b></TD>
                                <TD align=right><b><!-- TMPL_VAR name="total" 
--></b></TD>
                                <TD align=right><b><!-- TMPL_VAR 
name="totspent" --></b></TD>
***************
*** 91,97 ****
                                <TD align=right><b><!-- TMPL_VAR 
name="totavail" --></b></TD>
                        </TR>
!               </table><br>
!               Use your reload button [ctrl + r] to get the most recent 
figures.
!               Committed figures are approximate only, as exchange rates will 
affect the amount actually paid.
        </TD>
  </TR>
--- 91,98 ----
                                <TD align=right><b><!-- TMPL_VAR 
name="totavail" --></b></TD>
                        </TR>
!               </table>
!               <p>
!               Use your reload button to get the most recent figures. 
Committed figures are approximate only, as exchange rates will affect the 
amount actually paid.
!               </p>
        </TD>
  </TR>

Index: basket.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** basket.tmpl 13 Jan 2004 17:29:30 -0000      1.7.2.1
--- basket.tmpl 26 Jan 2004 10:46:36 -0000      1.7.2.2
***************
*** 1,6 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Shopping Basket <!-- TMPL_VAR name="basket" --> for <a 
href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR 
name="name" --></h1><br />
! (Our Reference: <!-- TMPL_VAR name="entrydate" -->, #<!-- TMPL_VAR 
name="basket" -->, authorised by: <!-- TMPL_VAR name="loggedinusername" -->)<br 
/>
  <CENTER>
  <p>
--- 1,6 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Shopping Basket <b><!-- TMPL_VAR name="basket" --> </b>for <a 
href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR 
name="name" --></h1><br />
! (Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR 
name="basket" --></b>, authorised by: <!-- TMPL_VAR name="loggedinusername" 
-->)<br />
  <CENTER>
  <p>
***************
*** 8,12 ****
        <tr valign=top bgcolor="#ffdf61">
                <td width="5%"><b>Order</b></td>
!               <td width="10%"><b>Publisher</b></td>
                <td width="10%"><b>Isbn</b></td>
                <td width="30%"><b>Title</b></td>
--- 8,12 ----
        <tr valign=top bgcolor="#ffdf61">
                <td width="5%"><b>Order</b></td>
!               <td width="10%"><b> Publisher</b></td>
                <td width="10%"><b>Isbn</b></td>
                <td width="30%"><b>Title</b></td>
***************
*** 15,19 ****
                <td width="7%"><b>$est</b></td>
                <td width="7%"><b>Qty</b></td>
!               <td width="7%"><b>Total</b></td>
        </tr>
        <!-- TMPL_LOOP name="books_loop" -->
--- 15,19 ----
                <td width="7%"><b>$est</b></td>
                <td width="7%"><b>Qty</b></td>
!               <td width="7%"><b> Total</b></td>
        </tr>
        <!-- TMPL_LOOP name="books_loop" -->
***************
*** 35,39 ****
                <td colspan=6 rowspan=3  bgcolor="#ffdf61">
                        <b>HELP</b><br>
!                       To change any of the catalogue or accounting 
information attached to an order,  click on the title.<br>
                </td>
                <td><b>SubTotal</b></td>
--- 35,39 ----
                <td colspan=6 rowspan=3  bgcolor="#ffdf61">
                        <b>HELP</b><br>
!                       To change any of the catalogue or accounting 
information attached to an order, click on the title.<br>
                </td>
                <td><b>SubTotal</b></td>

Index: newbiblio.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** newbiblio.tmpl      13 Jan 2004 17:29:30 -0000      1.8.2.1
--- newbiblio.tmpl      26 Jan 2004 10:46:36 -0000      1.8.2.2
***************
*** 85,89 ****
        </tr>
        <TR VALIGN=TOP>
!               <TD>Publisher</td>
                <td><input type=text size=30 name=publishercode value="<!-- 
TMPL_VAR name="publishercode" -->" ></td>
        </tr>
--- 85,89 ----
        </tr>
        <TR VALIGN=TOP>
!               <TD> Publisher</td>
                <td><input type=text size=30 name=publishercode value="<!-- 
TMPL_VAR name="publishercode" -->" ></td>
        </tr>
***************
*** 153,157 ****
        </tr>
        <TR VALIGN=TOP>
!               <TD colspan=2><input type=image  name=submit src="<!-- TMPL_VAR 
name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" 
border=0 align=right>       </td>
        </tr>
  </table>
--- 153,158 ----
        </tr>
        <TR VALIGN=TOP>
!               <TD colspan=2>
!               <input type="submit" value="OK" class="button">
        </tr>
  </table>
***************
*** 161,166 ****
  <tr><td bgcolor=#cccc99  background="<TMPL_VAR 
name="themelang">/images/background-mem.gif"><B>HELP</B><br>
  <UL>
! <LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
! <LI>Shaded fields can be used to do a "quick" receive, when items have been 
purchased locally or gifted. In this case the quantity "ordered" will also  be 
entered into the database as the quantity received.
  </UL>
  </td></tr></table>
--- 162,167 ----
  <tr><td bgcolor=#cccc99  background="<TMPL_VAR 
name="themelang">/images/background-mem.gif"><B>HELP</B><br>
  <UL>
! <LI>Bold fields must be filled in to create a new bibilo and item.<p>
! <LI>Shaded fields can be used to do a "quick" receive, when items have been 
purchased locally or gifted. In this case the quantity "ordered" will also be 
entered into the database as the quantity received.
  </UL>
  </td></tr></table>