[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes auth-top.inc,1.2,1.3 bull-top.inc,1.2,1.3 parameters-top.inc,1.13,1.14

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/fr/includes

Modified Files:
	auth-top.inc bull-top.inc parameters-top.inc 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: auth-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/auth-top.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** auth-top.inc	5 Jan 2005 14:35:21 -0000	1.2
--- auth-top.inc	1 Mar 2005 13:40:59 -0000	1.3
***************
*** 74,78 ****
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Ajouter une autorité
  	</a>
  </div>
--- 74,78 ----
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Ajouter autorité
  	</a>
  </div>

Index: bull-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/bull-top.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** bull-top.inc	5 Jan 2005 14:35:21 -0000	1.2
--- bull-top.inc	1 Mar 2005 13:40:59 -0000	1.3
***************
*** 37,41 ****
  <div id="submenu">
  	<span class="koha">options >></span>
! 	<a href="/cgi-bin/koha/bull-home.pl" class="submenu"> Abonnement </a> <a href="/cgi-bin/koha/bull/lateissues.pl" class="submenu2"> Numéros </a>
  </div>
  
--- 37,41 ----
  <div id="submenu">
  	<span class="koha">options >></span>
! 	<a href="/cgi-bin/koha/bull-home.pl" class="submenu"> Recherche Abonnement </a> <a href="/cgi-bin/koha/bull/lateissues.pl" class="submenu2"> Numéros en retard </a>
  </div>
  

Index: parameters-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** parameters-top.inc	5 Jan 2005 14:35:21 -0000	1.13
--- parameters-top.inc	1 Mar 2005 13:40:59 -0000	1.14
***************
*** 38,42 ****
  <div id="submenu">
  	<span class="koha">options >></span>
! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Crédits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Valeurs autorisées</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->
--- 38,42 ----
  <div id="submenu">
  	<span class="koha">options >></span>
! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Crédits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Valeurs autorisées</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</ a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->