french translation, updated

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index b535e7e..4f08d73 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -114,7 +114,12 @@ NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modif
 <input type="hidden" name="damaged" value="<!-- TMPL_VAR NAME="damaged" -->" />
 
 <!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="wthdrawn" value="0" /><!-- TMPL_ELSE --><input type="hidden" name="wthdrawn" value="1" /><!-- /TMPL_IF -->
-<input type="submit" name="submit" class="submit" value="<!-- TMPL_IF NAME="wthdrawn" -->Restore<!-- TMPL_ELSE -->Make Withdrawn<!-- /TMPL_IF -->" /></form></li>
+<!-- TMPL_IF NAME="wthdrawn" -->
+    <input type="submit" name="submit" class="submit" value="Restore" />
+<!-- TMPL_ELSE -->
+    <input type="submit" name="submit" class="submit" value="Make Withdrawn" />
+<!-- /TMPL_IF -->
+</form></li>
 
 
 <li><span class="label">Total Issues:</span><!-- TMPL_IF NAME="" --><!-- TMPL_VAR NAME="issues" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF -->  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">View Circulation History</a>)</li>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/fr/css/staff-global.css
index 3660726..6110f1a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/fr/css/staff-global.css
@@ -12,6 +12,11 @@ body {
        text-align : left;
 }
 
+br.clear {
+       clear : both;
+       line-height : 1px;
+}
+
 form {
        display : inline;
 }
@@ -58,6 +63,10 @@ em {
        font-style : italic;
 }
 
+label {
+    font-style : italic;
+}
+
 #hd {
 }
 
@@ -245,6 +254,7 @@ div#header_search {
        float: left;
        padding-left : 14.2em;
        margin: .3em 0 .5em 0;
+       min-height : 52px;
 }
 
 div#header_search input {
@@ -262,7 +272,7 @@ div#header_search ul.link-tabs li.off a {
        padding : 0.1em .5em .2em .5em;
 }
 
-div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search,div#printer_search,div#checkin_search,div#suggestions_search,div#roadtype_search,div#stopword_search {
+div#header_search div.residentsearch {
        border : 0;
        border-bottom : 1px solid #FF9900;
        padding : 0 0 .2em 0;
@@ -408,37 +418,22 @@ dd {
 
 div#toolbar {
        background-color : #F3F3F3;
+       margin-bottom : .7em;
 }
 
 ul.toolbar {
+       padding-left : 0;
+}
+
+.yui-menu-button  {
+       
 }
 
 ul.toolbar li {
        display : inline;
-       float : left;
        list-style : none;
 }
 
-ul.toolbar li a {
-       background-color : #F3F3F3;
-       border : 1px solid #F3F3F3;
-       display : block;
-       margin : 3px;
-       padding : 3px;
-       text-decoration : none;
-}
-
-ul.toolbar li a:hover {
-       background-color : #FFFFCC;
-}
-
-ul.toolbar li:last-child a:hover {
-}
-
-ul.toolbar ul {
-       display : none;
-}
-
 div.message {
    border : 1px solid #6699CC;
        width : 33%;
@@ -529,7 +524,7 @@ fieldset.rows legend {
 fieldset.rows label, fieldset.rows span.label {  
        float: left;  
        font-weight : bold;
-       width: 12em;  
+       width: 9em;  
        margin-right: 1em;  
        text-align: right;
 }
@@ -556,6 +551,17 @@ fieldset.rows.left li {
        padding-bottom : .4em;
 }
 
+fieldset.rows li.radio {
+       padding-left: 9em;
+       width : auto;
+}
+
+fieldset.rows li.radio label {
+       float : none;
+       width : auto;
+       margin : 0 0 0 1em;
+}
+
 fieldset.rows ol.radio label {
        width : auto;
        float : none;
@@ -592,6 +598,11 @@ fieldset.rows fieldset.action {
        padding : 0 0 1em 1em;
 }
 
+fieldset.rows .inputnote {
+       float : left;
+       margin : .5em 0 0 10em;
+}
+
 .tabs-nav li {
        list-style : none;
 }
@@ -648,15 +659,15 @@ fieldset.rows fieldset.action {
     background: none;
 }
 
-#patronlists .tabs-nav a {
+.toptabs .tabs-nav a {
     top: 0;
  }
 
-#patronlists .tabs-nav li {
+.toptabs .tabs-nav li {
        margin-right : .5em;
 }
 
-#patronlists .tabs-nav li a {
+.toptabs .tabs-nav li a {
        background-color : #F3F3F3;
        border-top : 1px solid #E8E8E8;
        border-left : 1px solid #E8E8E8;
@@ -666,11 +677,11 @@ fieldset.rows fieldset.action {
        text-decoration : none;
 }
 
-#patronlists .tabs-nav li.tabs-selected  {
+.toptabs .tabs-nav li.tabs-selected  {
        background-color : #FFF;
 }
 
-#patronlists .tabs-nav li.tabs-selected a {
+.toptabs .tabs-nav li.tabs-selected a {
        background-color : #FFF;
        border-top : 1px solid #E8E8E8;
        border-left : 1px solid #E8E8E8;
@@ -680,6 +691,15 @@ fieldset.rows fieldset.action {
        text-align : center;
 }
 
+.toptabs.numbered .tabs-nav li {
+       min-width : 3em;
+}
+
+.toptabs .tabs-container {
+       border : 1px solid #E8E8E8;
+       padding : 1em;
+}
+
 .checkedout {
        color : #999999;
        font-style : italic;
@@ -687,4 +707,93 @@ fieldset.rows fieldset.action {
 
 .subfield_not_filled {
        background-color : #FFFF99;
+}
+.content_hidden {
+    visibility:hidden; /* you propably don't need to change this one */
+    display:none;
+}
+
+/* the property for the displayed tab */
+.content_visible {
+    visibility:visible; /* you propably don't need to change this one */
+    display:block;
+}
+#addbiblio a {
+       padding-left : 34px;
+       background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif");
+       background-position : center left;
+       background-repeat : no-repeat;
+}
+
+#deletebiblio a {
+       padding-left : 34px;
+       background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif");
+       background-position : center left;
+       background-repeat : no-repeat;
+}
+
+#printbiblio a {
+       padding-left : 34px;
+       background-image: url("/intranet-tmpl/prog/img/toolbar-print.gif");
+       background-position : center left;
+       background-repeat : no-repeat;
+}
+
+#addtoshelf a {
+       padding-left : 34px;
+       background-image: url("/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif");
+       background-position : center left;
+       background-repeat : no-repeat;
+}
+
+#placehold a {
+       padding-left : 34px;
+       background-image: url("/intranet-tmpl/prog/img/toolbar-hold.gif");
+       background-position : center left;
+       background-repeat : no-repeat;
+}
+
+div.error {
+       border : 2px dashed #990000;
+       background-color : #FFFF99;
+       padding : .5em;
+       margin : 1em;
+}
+
+ol.bibliodetails {
+       float: left;
+       margin : 0 0 1em 1em;
+}
+
+ol.bibliodetails li {
+       border-bottom: 1px solid #E8E8E8;
+       list-style-type : none;
+       padding : .1em;
+}
+
+ol.bibliodetails span.label {
+       border-right : 1px solid #E8E8E8;
+       float : left;
+       font-weight: bold;
+       width: 12em;  
+       margin-right: 1em;  
+}
+
+div.sysprefs h3 {
+       margin : .2em 0 .2em .4em;
+}
+
+div.sysprefs dl {
+       margin-left : 1.5em;
+}
+
+div.sysprefs div.hint {
+       width : 25%;
+       float : right;
+       padding : .5em;
+       margin : .7em;
+}
+
+tr.highlight td {
+       background-color : #F6F6F6;
 }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-menu.inc
index d3a72a8..57fec93 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-menu.inc
@@ -1,7 +1,5 @@
 <ul>
-       <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Ajout d'un fournisseur</a></li>
        <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Commandes en retard</a></li>
-       <li><a href="/cgi-bin/koha/acqui/histsearch.pl">Recherche historique</a></li>
        <li><a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Suggestions en attente</a></li>
-       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Paramètres</a></li>
+       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Ligne de crédit</a></li>
 </ul>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-search.inc
new file mode 100644 (file)
index 0000000..3747969
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-search.inc
@@ -0,0 +1,21 @@
+
+<div id="header_search">
+<div id="supplier_search" class="residentsearch">
+       <p class="tip">Rechercher fournisseurs :</p>
+        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
+           <input type="text" size="25" name="supplier" id="supplier" class="focus" />
+            <input type="submit" value="Rechercher"></form>
+</div>
+       <div id="orders_search" class="residentsearch">
+       <p class="tip">Recherche commande :</p>
+       
+               <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
+               <label for="title">Civilité :  </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="supplier">Fournisseur : </label> <input type="text" id="supplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
+       <input value="Valider" type="submit"> <a href="/cgi-bin/koha/acqui/histsearch.pl">Avancé</a>
+       </form>
+       </div>  
+                       <ul>
+                       <li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Recherche fournisseur</a></li>
+                       <li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Recherche sur les commandes</a></li>
+                       </ul>   
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-toolbar.inc
new file mode 100644 (file)
index 0000000..2298a66
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/acquisitions-toolbar.inc
@@ -0,0 +1,12 @@
+<div id="toolbar">
+       <ul class="toolbar">
+               <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Nouveau fournisseur</a></li>
+               <!-- TMPL_IF NAME="id" -->
+               <li><a href="/cgi-bin/koha/acqui/basket.pl?supplierid=<!-- TMPL_VAR NAME="id" -->">Nouvelle commande</a></li>
+               <li><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Modifier</a></li>
+               <li><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">Gérer les commandescommentaire</a></li>
+               <li><a href="/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Réceptionner un colis</a></li>
+               <!-- /TMPL_IF -->
+       </ul>
+<br clear="all" />
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/authorities-search.inc
new file mode 100644 (file)
index 0000000..ffb5d80
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/authorities-search.inc
@@ -0,0 +1,4 @@
+<!-- Begin Circulation Resident Search Box -->
+<div id="header_search">
+</div>
+<!-- End Circulation Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/authorities-toolbar.inc
new file mode 100644 (file)
index 0000000..ecb777d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/authorities-toolbar.inc
@@ -0,0 +1,16 @@
+<div id="toolbar">
+
+  <form name="f2" method="post" action="authorities.pl">
+       <label for="add_authtypecode">Nouveau : </label>
+        <select id="add_authtypecode" name="authtypecode">
+<!-- TMPL_LOOP name="authtypesloop" -->
+  <!-- TMPL_IF name="selected" -->
+        <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="authtypetext" --></option>
+  <!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="authtypetext" --></option>
+  <!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+        </select>
+      <input type="submit" value="Ajouter" class="button">
+  </form>
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/biblio-view-menu.inc
index 9d7ce73..182085d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/biblio-view-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/biblio-view-menu.inc
@@ -1,7 +1,8 @@
 <ul>
-<li>                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC</a></li>
        <li>                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal</a></li>
+<li>                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC</a></li>
        <li>                <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li>
+       <li><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Exemplaires</a></li>
        <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Réservations</a></li>
 <!-- TMPL_IF name="subscriptionsnumber" --><li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">Abonnement(s)</a></li><!-- /TMPL_IF -->
 </ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-search.inc
index ec0aa9e..82f30c8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Circulation Resident Search Box -->
 <div id="header_search">
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -10,7 +10,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -18,8 +18,8 @@
                </form>
        </div>
                        <ul>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li class="tabs-selected"><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li class="tabs-selected"><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Circulation Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-toolbar.inc
index f047101..d9a9665 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/cat-toolbar.inc
@@ -1,14 +1,13 @@
 <div id="toolbar">
-                               <a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">Nouveau</a>
-                       <input type="submit" id="editbutton" name="editbutton_button" value="Modifier">
-            <select id="editbuttonselect" name="editbuttonselect">
-                <option value="0">Notice bibliographique</option>
-                <option value="1">Exemplaires</option>
-                <option value="2">Comme une nouvelle notire (Dupliquer)</option>                
-            </select>
-                       <a id="deletebiblio" href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Supprimer</a> <a id="addtoshelf" href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Ajouter à l'étagère</a> <a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Imprimer</a>
-                       
-                       <!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Réserver</a><!-- /TMPL_IF -->
-       
+<ul class="toolbar">
 
-    <br clear="all" /></div>
+       <li><a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">Nouveau</a></li>
+       <li id="editmenucontainer"><a id="editbiblio" class="menubutton" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Editer notice</a></li>
+       <li><a id="edititems" class="menubutton" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Modifier exemplaire</a></li>
+       <li><a id="duplicatebiblio" class="menubutton" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Dupliquer notice</a></li>
+       <li><a id="deletebiblio" href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Supprimer</a></li>
+       <li><a id="addtoshelf" href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Ajouter à une étagère</a></li>
+       <li><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Imprimer</a></li>
+        <!-- TMPL_UNLESS name="bi_notforloan" -->
+       <!-- TMPL_UNLESS NAME="norequests" --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Réserver</a></li><!-- /TMPL_UNLESS --><!-- TMPL_UNLESS -->
+</ul></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/cataloging-search.inc
index d2a9607..207658b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/cataloging-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Circulation Resident Search Box -->
 <div id="header_search">
-<div id="addbooks_search">
-       <p class="tip">Recherche dans le catalogue : </p>
+<div id="addbooks_search" class="residentsearch">
+       <p class="tip">Recherche dans le catalogue et le réservoir :</p>
        <form name="search" action="addbooks.pl">
         <input type="text" name="q"  size="40" class="focus" />
         <input type="submit" value="Rechercher">
        </form>
 </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -18,8 +18,8 @@
        </form>
        </div>  
                        <ul>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#addbooks_search">Rechercher dans le catalogue</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#addbooks_search">Recherche catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
                        </ul>   
 </div>
 <!-- End Circulation Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-menu.inc
index 184d52d..fe54b56 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-menu.inc
@@ -40,16 +40,3 @@
        <!-- /TMPL_UNLESS -->
 </ul>
 
-
-
-<h5>Statistiques de circulation</h5>
-<ul class="left-nav">
-       <li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="Réservations à mettre de coté">Réservations à traiter</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="Réservations mis de coté pour : %s">Réservations mises de coté</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/transferstodo.pl" title="Transferts à faire depuis votre site">Transferts à effectuer</a></li>
-
-       <li>    <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="Transferts en cours vers votre site">Transfert à recevoir</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/overdue.pl">Retards</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Amendes</a></li>
-       <li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Etat de caisse quotidien</a></li>
-</ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search.inc
index bdabdb3..f6f508b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Circulation Resident Search Box -->
 <div id="header_search">
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
@@ -9,14 +9,14 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="checkin_search">
+       <div id="checkin_search" class="residentsearch">
        <p class="tip">Scanner un code à barre pour le retour</p>
        <form method="post" action="/cgi-bin/koha/circ/returns.pl">
                <input name="barcode" id="ret_barcode" size="40" maxlength="14" />
            <input value="Valider" type="submit">
     </form>
        </div>
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" />
@@ -24,9 +24,9 @@
                </form>
        </div>
                        <ul>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
                        <li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Retours</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Circulation Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-toolbar.inc
index 70e0537..fa294d7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-toolbar.inc
@@ -1,5 +1,5 @@
 <div id="toolbar"><ul class="toolbar">
-       <li><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Préter</a></li>
+       <li><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Prêt</a></li>
        <!-- TMPL_IF name="adultborrower" --><li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Ajouter un enfant</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/cities-admin-search.inc
new file mode 100644 (file)
index 0000000..c530d41
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/cities-admin-search.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+       <div id="city_search" class="residentsearch">
+       <p class="tip">Recherche commune</p>
+       <form action="<TMPL_VAR NAME="script_name">" method="post">
+               <input type="text" name="city_name" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
+               <input type="submit" name="submit" value="OK" class="button" />
+       </form>
+       </div>
+       <div id="circ_search" class="residentsearch">
+       <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
+       <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+                       <label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+       <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+       <input value="Valider" type="submit">
+       </form>
+       </div>  
+       <div id="catalog_search" class="residentsearch">
+       <p class="tip">Entrer les termes de recherche :</p>
+               <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+                        <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
+                               <input type="submit" name="op" id="opac-submit" value="Valider" class="form-submit">
+               </form>
+       </div>
+                       <ul>
+                       <li><a href="/cgi-bin/koha/admin/cities.pl#city_search">Recherche commune</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
+                       </ul>   
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/currencies-admin-search.inc
index 9ed3e6a..39c9ecb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/currencies-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="currency_search">
+       <div id="currency_search" class="residentsearch">
        <p class="tip">Recherche devise :</p>
         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                 <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="Search" value="Rechercher">
         </form>        
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -17,7 +17,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -26,8 +26,8 @@
        </div>
                        <ul>
                        <li><a href="/cgi-bin/koha/admin/currency.pl#currency_search">Recherche devises</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/header.inc
index 009fa1b..5892ac5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/header.inc
@@ -2,7 +2,7 @@
        
 <div id="toplevelnav">
 <ul id="toplevelmenu">
-       <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li><!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="CAN_user_borrowers" --><li><a href="/cgi-bin/koha/members/members-home.pl">Adhérents</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></li><!-- /TMPL_IF -->
        <li class="more"><a href="/cgi-bin/koha/mainpage.pl">Plus</a><ul>
@@ -12,7 +12,7 @@
        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Périodiques</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_reports" --><li><a href="/cgi-bin/koha/reports/reports-home.pl">Bilans et statistiques</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_tools" --><li><a href="/cgi-bin/koha/tools/tools-home.pl">Outils</a></li><!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="CAN_user_parameters" --><li><a href="/cgi-bin/koha/admin/admin-home.pl">AdministrationKoha</a></li><!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="CAN_user_parameters" --><li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li><!-- /TMPL_IF -->
        <li><a href="/cgi-bin/koha/about.pl">A propos de Koha</a></li></ul></li>
 </ul>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/hold-menu.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/hold-menu.inc
index c9aec82..c4388c3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/hold-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/hold-menu.inc
@@ -16,6 +16,8 @@
     <!-- TMPL_ELSE -->
         <span class="problem">Pas de téléphone enregistré.</span>    
     <!-- /TMPL_IF --></li>
+       <li><!-- TMPL_VAR NAME="borrowerphonepro" --></li>
+       <li><!-- TMPL_VAR NAME="borrowermobile" --></li>
            <!-- TMPL_IF NAME="borroweremail" -->
    <li> <a href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="borroweremail" --></a></li>
     <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/letters-search.inc
index 8596603..0880c1c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/letters-search.inc
@@ -1,23 +1,23 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="notices_search">
+       <div id="notices_search" class="residentsearch">
        <p class="tip">Recherche des notifications existantes :</p>
 <form action="/cgi-bin/koha/tools/letter.pl" method="post">
                <input type="text" name="searchfield" size="40" value="" />
                 <input type="submit" name="Search" value="Rechercher">
         </form>        
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-       <input name="branch" value="CPL" type="hidden" />
+       <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -26,8 +26,8 @@
        </div>
                        <ul>
                        <li><a href="/cgi-bin/koha/admin/currency.pl#notices_search">Rechercher notifications</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/members-menu.inc
index 30d96f3..37dad65 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/members-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/members-menu.inc
@@ -3,7 +3,7 @@
     <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Adulte</a></li>
     <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Enfant</a></li>
     <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Professionnel</a></li>
-    <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Collectivités</a></li>
+    <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Collectivité</a></li>
 </ul>
 <!-- TMPL_IF NAME="borrowernumber" -->
 <h5>Détails de l'adhérent</h5>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/members-search.inc
index fb8166e..bc63708 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/members-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/members-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="patron_search">
+       <div id="patron_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/members/member.pl" method="post">
     <input id="searchmember" size="25" name="member" type="text" /> Trié par
@@ -11,7 +11,7 @@
     <input value="Rechercher" type="submit">
 </form>
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -21,7 +21,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -29,9 +29,9 @@
                </form>
        </div>
                        <ul>
-                       <li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Rechercher adhérents</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Recherche adhérents</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/patrons-admin-search.inc
new file mode 100644 (file)
index 0000000..6f4e4ec
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/patrons-admin-search.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+       <div id="patron_category_search" class="residentsearch">
+       <p class="tip">Recherche par catégorie d'adhérent :</p>
+       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+               <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+               <input type="submit" name="search" value="Rechercher">
+       </form> 
+       </div>
+       <div id="circ_search" class="residentsearch">
+       <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
+       <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+                       <label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+       <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+       <input value="Valider" type="submit">
+       </form>
+       </div>  
+       <div id="catalog_search" class="residentsearch">
+       <p class="tip">Entrer les termes de recherche :</p>
+               <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+                        <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
+                               <input type="submit" name="op" id="opac-submit" value="Valider" class="form-submit">
+               </form>
+       </div>
+                       <ul>
+                       <li><a href="/cgi-bin/koha/admin/categorie.pl#patron_category_search">Chercher catégories d'adhérent</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
+                       </ul>   
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/printers-admin-search.inc
index a8affa4..2e6e653 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/printers-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="printer_search">
+       <div id="printer_search" class="residentsearch">
        <p class="tip">Recherche imprimante :</p>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                 <input type="text" size="40" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="submit" value="Rechercher">
         </form>
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -17,7 +17,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -26,8 +26,8 @@
        </div>
                        <ul>
                        <li><a href="/cgi-bin/koha/admin/printers.pl#printer_search">Rechercher imprimantesinternet</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/roadtype-admin-search.inc
new file mode 100644 (file)
index 0000000..4841bbc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/roadtype-admin-search.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+       <div id="roadtype_search" class="residentsearch">
+       <p class="tip">Rechercher le type de voie :</p>
+               <form action="<TMPL_VAR NAME="script_name">" method="post">
+               <input type="text" name="road_type" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
+               <input type="submit" name="submit" value="OK" class="button" />
+       </form>
+       </div>
+       <div id="circ_search" class="residentsearch">
+       <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
+       <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+                       <label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+       <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+       <input value="Valider" type="submit">
+       </form>
+       </div>  
+       <div id="catalog_search" class="residentsearch">
+       <p class="tip">Entrer les termes de recherche :</p>
+               <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+                        <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
+                               <input type="submit" name="op" id="opac-submit" value="Valider" class="form-submit">
+               </form>
+       </div>
+                       <ul>
+                       <li><a href="/cgi-bin/koha/admin/roadtype.pl#roadtype_search">Rechercher types de voie</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
+                       </ul>   
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-menu.inc
index 9dc5ecc..c0a5d28 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-menu.inc
@@ -4,20 +4,9 @@
        <!-- TMPL_IF NAME="routing" --><li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Modifier la liste de circulation</a></li><!-- TMPL_ELSE -->
        <li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Créer une liste de circulation</a></li><!-- /TMPL_IF -->
 </ul>
-<!-- TMPL_ELSE -->
-       <!-- TMPL_IF NAME="subscriptions" -->
-       <ul>
-       <li>Gérer les abonnements
-               <!-- TMPL_LOOP NAME="subscriptions" -->
-                       <li>#<!-- TMPL_VAR name="subscriptionid" --> <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">État de collection</a<</li>
-                       <!-- TMPL_IF NAME="routing" --><li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">#<!-- TMPL_VAR name="subscriptionid" --> Modifier la liste de circulation</a></li><!-- TMPL_ELSE -->
-       <li><a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">#<!-- TMPL_VAR name="subscriptionid" --> Créer une liste de circulation</a></li><!-- /TMPL_IF -->
-               <!-- /TMPL_LOOP -->
-       </li></ul>
-       <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 <ul>
-       <li>        <a href="/cgi-bin/koha/serials/claims.pl">Réclamations</a></li>
-       <li>        <a href="/cgi-bin/koha/serials/checkexpiration.pl">Vérificater dates d'expiration</a></li>
+       <li><a href="/cgi-bin/koha/serials/claims.pl">Réclamations</a></li>
+       <li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Vérificater dates d'expiration</a></li>
 </ul>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-search.inc
index 805a135..be9e1cf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-search.inc
@@ -1,11 +1,11 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="subscription_search">
+       <div id="subscription_search" class="residentsearch">
        <p class="tip">Rechercher périodiques :</p>
  <form action="/cgi-bin/koha/serials/serials-home.pl" method="get"><!-- TMPL_IF NAME="routing" --><input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" /><!-- /TMPL_IF --><input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN : </label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" /> <label for="title_filter">Civilité : </label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" /><input type="submit" value="Rechercher" class="button">
 </form>
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
@@ -14,7 +14,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -23,8 +23,8 @@
        </div>
                        <ul>
                        <li><a href="/cgi-bin/koha/serials/serials-home.pl#subscription_search">Rechercher périodique</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-toolbar.inc
index 41a20d3..4c4ef76 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/serials-toolbar.inc
@@ -1,10 +1,10 @@
 <div id="toolbar">
 <ul class="toolbar">
        <li><a href="/cgi-bin/koha/serials/subscription-add.pl">Nouveau</a></li>
-       <li><a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Modifier</a></li>
+       <!-- TMPL_IF NAME="subscriptionid" --><li><a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Modifier</a></li>
        <li><a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Dupliquer </a></li>
        <li><a href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renouvellement </a></li>
        <li><a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">RecevoirReçu</a></li>
-       <li><a href="javascript:confirm_deletion()">Supprimer</a></li>
+       <li><a href="javascript:confirm_deletion()">Supprimer</a></li><!-- /TMPL_IF -->
 </ul>
 <br clear="all" />    </div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/stopwords-admin-search.inc
index c606d56..1a57ea8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/stopwords-admin-search.inc
@@ -1,14 +1,14 @@
 
        <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="stopword_search">
+       <div id="stopword_search" class="residentsearch">
        <p class="tip">Rechercher un mot vide :</p>
            <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="text" size="40" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
         <input type="submit" name="ok" value="Rechercher">
     </form>
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -18,7 +18,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -27,8 +27,8 @@
        </div>
                        <ul>
                        <li><a href="/cgi-bin/koha/admin/roadtype.pl#stopword_search">Rechercher mots vides</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/suggestions-add-search.inc
index 8a284cd..8895c62 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/suggestions-add-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="suggestions_search">
+       <div id="suggestions_search" class="residentsearch">
        <p class="tip">Rechercher suggestions</p>
        <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
        <label for="searchtitle">Civilité : </label> <input type="text" id="searchtitle" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
@@ -9,7 +9,7 @@
     <input type="submit" class="button" value="Rechercher suggestions">
         </form>
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -19,7 +19,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -28,8 +28,8 @@
        </div>
                        <ul>
                        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->#suggestions_search">Rechercher imprimantesinternet</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/z3950-admin-search.inc
index 1d54ae4..1f5b580 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/z3950-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-       <div id="z3950_search">
+       <div id="z3950_search" class="residentsearch">
        <p class="tip">Rechercher serveur Z39.50</p>
        <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
                 <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="search" value="Rechercher">
         </form>
        </div>
-       <div id="circ_search">
+       <div id="circ_search" class="residentsearch">
        <p class="tip">Entrer le n° de carte d'adhérent ou une partie du nom : </p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
                        <label for="findborrower"> </label>
@@ -17,7 +17,7 @@
        <input value="Valider" type="submit">
        </form>
        </div>  
-       <div id="catalog_search">
+       <div id="catalog_search" class="residentsearch">
        <p class="tip">Entrer les termes de recherche :</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                         <input type="text" name="q" id="search-form" size="40" value="" title="Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche." class="form-text">
@@ -26,8 +26,8 @@
        </div>
                        <ul>
                        <li><a href="/cgi-bin/koha/admin/z3950servers.pl#z3950_search">Rechercher serveurs Z39.50</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Préter</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Rechercher dans le catalogue</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Prêt</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Recherche catalogue</a></li>
                        </ul>   
 </div>
 <!-- End Members Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/js/members.js b/koha-tmpl/intranet-tmpl/prog/fr/js/members.js
index a092205..d8657c7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/fr/js/members.js
@@ -1,5 +1,3 @@
-function _(s) { return s } // dummy function for gettext
-
 // this function checks id date is like DD/MM/YYYY
 function CheckDate(field) {
 var d = field.value;

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/fr/js/staff-global.js
index 9b6e169..9615fd9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/fr/js/staff-global.js
@@ -1,5 +1,7 @@
 // staff-global.js
 
+function _(s) { return s } // dummy function for gettext
+
  $(document).ready(function() {
        $(".focus").focus();
        $('#toplevelmenu').clickMenu(); 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/acqui-home.tmpl
index c618351..5f93525 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/acqui-home.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo;<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; </div>
 
@@ -14,6 +14,8 @@
        <div id="yui-main">
        <div class="yui-b">
 
+<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
+
 <h1>Acquisitions</h1>
 <div id="acqui_acqui_home_order">
     <fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/basket.tmpl
index 06a6aa0..e965da7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/basket.tmpl
@@ -3,7 +3,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_UNLESS name="closedate" -->
 <script type="text/javascript">
-//<![CDATA[            function confirm_close() {
+//<![CDATA[
+            function confirm_close() {
                 var is_confirmed = confirm('Are you sure you want to close this basket?');
                 if (is_confirmed) {
                     window.location = "/cgi-bin/koha/acqui/booksellers.pl?op=close&basketno=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->";
@@ -15,7 +16,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo;<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->Nouveau <!-- /TMPL_UNLESS -->Panier d'achat <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> pour <!-- TMPL_VAR NAME="name" --></div>
@@ -69,7 +70,7 @@
                     <td><!-- TMPL_VAR NAME="publishercode" --></td>
                     <!-- TMPL_IF name="closedate" -->
                         <td><p>
-                            <!-- TMPL_VAR NAME="title" --><br />
+                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><br />
                                 <!-- TMPL_VAR NAME="author" -->
                                 <!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
                                 <!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
@@ -78,7 +79,7 @@
                     <!-- TMPL_ELSE -->
                         <td>
                             <p>
-                            <!-- TMPL_VAR NAME="title" --></p>
+                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
                                 <p><!-- TMPL_VAR NAME="author" -->
                                 <!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
                                 <!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
@@ -149,7 +150,7 @@
             <ul><li><label for="q">A partir d'une notice existante :  </label><input id="q" type="text"  size="25" name="q" />
             <input type="submit" value="Rechercher"></li>
             <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">A partir d'une suggestion</a></li>
-            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Nouvelle notice</a></li>
+            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Nouvelle commande</a></li>
             </ul>
         </form>
     </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/bookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/bookfund.tmpl
index bbd8be3..69dbd18 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/bookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/bookfund.tmpl
@@ -4,7 +4,7 @@
 </head>   
 <body>  
 <!-- TMPL_INCLUDE NAME="header.inc" -->                                   
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->   
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->   
                                                                            
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Budgets</div>
@@ -20,7 +20,7 @@
    <th>Titre</th>
        <th>Commande</th>
        <th>Type de document</th>
-       <th>Left on Order</th>
+       <th>Commande en cours</th>
        <th>Coût estimé par document</th>
        <th>Date budget</th>
        <th>Sous-total</th>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/booksellers.tmpl
index 606b0e2..9bb0810 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/booksellers.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo;<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; </div>
 
@@ -14,6 +14,8 @@
        <div id="yui-main">
        <div class="yui-b">
        
+<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
+       
 <h1>Vous recherchiez le <b>fournisseur <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> résultat(s) trouvé(s)</h1>
 <div id="acqui_order_supplierlist">
        <table>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/histsearch.tmpl
index 002f33a..0f5db6f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/histsearch.tmpl
@@ -6,7 +6,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Recherche commande</div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/lateorders.tmpl
index d9cc04e..699cad8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/lateorders.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Commandes en retard</div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderbiblio.tmpl
index 2186c98..89a3741 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderbiblio.tmpl
@@ -1,10 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Acquisitions &rsaquo; Rechercher dans le catalogueListe des Réponses</title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Rechercher dans le catalogue</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Recherche dans le catalogue</div>
 
@@ -39,7 +39,7 @@
 <div class="searchresults">
     <table>
     <tr>
-       <th>Abrégé</th>
+       <th colspan="2">Abrégé</th>
     </tr>
     <!-- TMPL_LOOP NAME="resultsloop" -->
         <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderempty.tmpl
index aeb4c72..493e3a1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/neworderempty.tmpl
@@ -69,7 +69,7 @@ if (quantity ==0) {
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">Panier <!-- TMPL_VAR NAME="basketno" --></a> &rsaquo; <!-- TMPL_IF name="ordnum" -->Modifier les détails de la commande (ligne #<!-- TMPL_VAR NAME="ordnum" -->)<!-- TMPL_ELSE -->Nouvelle commande<!-- /TMPL_IF --></div>
 
@@ -79,7 +79,6 @@ if (quantity ==0) {
        <div id="yui-main">
        <div class="yui-b">
        
-
 <h1>
     <!-- TMPL_IF name="ordnum" -->
         Modifier les détails de la commande (ligne #<!-- TMPL_VAR NAME="ordnum" -->)
@@ -101,7 +100,7 @@ if (quantity ==0) {
 <!-- /TMPL_IF -->
 
 <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
-    <fieldset>
+    <fieldset class="rows">
         <legend>Détails du catalogue</legend>
         <!-- TMPL_UNLESS name="existing" -->
                <input type="hidden" name="existing" value="no" />
@@ -120,65 +119,65 @@ if (quantity ==0) {
         <!-- TMPL_LOOP NAME="loop_currencies" -->
             <input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
         <!-- /TMPL_LOOP -->
-        <p>
+        <ol><li>
             <!-- TMPL_IF name="biblio" -->
-                       <strong>Titre</strong>
-                <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
+                       <span class="label">Titre</span>
+                <input type="hidden" size="20" id="title" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
             <!-- TMPL_ELSE -->
             <label for="title" class="required">Titre</label>
                 <input type="text" id="title" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-                       <strong>Auteur</strong>
-                <input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
+                       <span class="label">Auteur</label>
+                <input type="hidden" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
             <!-- TMPL_ELSE -->
             <label for="author">Auteur</label>
-                <input type="text" id="author" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+                <input type="text" id="author" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-                       <strong>Editeur</strong>
-                <input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
+                       <span class="label">Editeur</label>
+                <input type="hidden" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
             <!-- TMPL_ELSE -->
             <label for="publishercode"> Editeur</label>
-                <input type="text" id="publishercode" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+                <input type="text" id="publishercode" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-                       <strong>Date de copyright</strong>
-                <input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
+                       <lspan class="label">Date de copyright</label>
+                <input type="hidden" size="20" name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
             <!-- TMPL_ELSE -->
             <label for="copyrightdate">Date de copyright</label>
-                <input type="text" id="copyrightdate" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+                <input type="text" id="copyrightdate" size="20" name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <label for="format">Format</label>
             <!-- TMPL_VAR NAME="CGIitemtype" -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-                       <strong>ISBN</strong>
-                <input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
+                       <span class="label">ISBN</label>
+                <input type="hidden" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
             <!-- TMPL_ELSE -->
             <label for="ISBN">ISBN</label>
-                <input type="text" id="ISBN" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+                <input type="text" id="ISBN" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-                       <strong>Collections</strong>
-                <input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
+                       <span class="label">Collections</label>
+                <input type="hidden" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
             <!-- TMPL_ELSE -->
             <label for="series">Collections</label>
-                <input type="text" id="series" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+                <input type="text" id="series" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <label for="branch">Site</label>
             <select name="branch" id="branch">
             <!-- TMPL_LOOP name="branchloop" -->
@@ -188,109 +187,108 @@ if (quantity ==0) {
                                <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
             </select>
-        </p>
+        </li>
     </fieldset>
-    <fieldset>
+    <fieldset class="rows">
         <legend>Détails de comptabilité</legend>
-            <p>
+            <li>
                 <!-- TMPL_IF name="close" -->
-                       <strong>Quantité</strong>
-                    <input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
+                       <span class="label">Quantité</label>
+                    <input type="hidden" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
                 <!-- TMPL_ELSE -->
                 <label for="quantity">Quantité</label>
-                    <input type="text" id="quantity" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
+                    <input type="text" id="quantity" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-                       <strong>Ligne de crédit</strong>
-                    <input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
+                       <span class="label">Ligne de crédit</label>
+                    <input type="hidden" size="20" name="bookfund" id="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
                 <!-- TMPL_ELSE -->
                 <label for="bookfund">Ligne de crédit</label>
                     <!-- TMPL_VAR NAME="CGIbookfund" -->
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-                       <strong>Prix fournisseur</strong>
-                    <input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
+                       <span class="label">Prix fournisseur</label>
+                    <input type="hidden" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
                 <!-- TMPL_ELSE -->
                 <label for="list_price">Prix fournisseur</label>
-                    <input type="text" id="list_price" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
+                    <input type="text" id="list_price" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-                       <strong>Coût de remplacement</strong>
-                    <input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
+                       <span class="label">Coût de remplacement</label>
+                    <input type="hidden" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
                 <!-- TMPL_ELSE -->
                 <label for="rrp">Coût de remplacement </label>
-                    <input type="text" id="rrp" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+                    <input type="text" id="rrp" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-                       <strong>Coût budgété</strong>
-                    <input type="text" id="" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
+                       <label for="ecost">Coût budgété</label>
+                    <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
                 <!-- TMPL_ELSE -->
                 <label for="ecost">Coût budgété</label>
-                    <input type="text" id="ecost" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
+                    <input type="text" id="ecost" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
                 <!--/TMPL_IF-->
-            </p>
+            </li>
             <!-- TMPL_IF NAME="GST"-->
-            <p>
+            <li>
                                <!-- TMPL_IF name="close" -->
-                       <strong>TVA budgetée</strong>
-                <input type="text" id="" size="20" name="GST" value="" readonly="readonly" />
+                       <label for="GST">TVA budgetée</label>
+                <input type="text" id="" size="20" name="GST" value="" id="GST" readonly="readonly" />
                                <!-- TMPL_ELSE -->
                 <label for="GST">TVA budgetée</label>
-                <input type="text" id="GST" size="20" name="GST" value="" />
+                <input type="text" id="GST" size="20" name="GST" id="GST" value="" />
                                <!--/TMPL_IF-->
-            </p>
+            </li>
             <!-- /TMPL_IF -->
-            <p>
+            <li>
                 <!-- TMPL_IF name="close" -->
-                       <strong>Total</strong>
-                               <input type="text" id="" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
+                       <label for="total">Total</label>
+                               <input type="text" id="total" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
                                <!-- TMPL_ELSE -->
-                <label for="total"><strong>Total</strong></label>
+                <label for="total"><label for="">Total</label></label>
                 <input type="text" id="total" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" />
                                <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                                <!-- TMPL_IF name="close" -->
-                       <strong>Coût réel</strong>
-                <input type="text" id="" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
+                       <label for="cost">Coût réel</label>
+                <input type="text" id="cost" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
                                <!-- TMPL_ELSE -->
                 <label for="cost">Coût réel</label>
                 <input type="text" id="cost" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" />
                                <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <label for="invoice">Numéro de facture</label>
                 <input type="text" id="invoice" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /> (habituellement vide)
-            </p>
-            <p>
+            </li>
+            <li>
                 <label for="notes">Notes</label>
                 <input type="text" id="notes" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
-            </p>
-            <p>Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent servir à des usages statistiques.</p>
-            <p>
+            </li>
+            <li>Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent servir à des usages statistiques.
                 <!-- TMPL_IF Name="CGIsort1" -->
                     <!-- TMPL_VAR Name="CGIsort1" -->
                 <!-- TMPL_ELSE -->
                 <label for="sort1">Champ de tri 1</label>
                     <input type="text" id="sort1" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
                 <!--/TMPL_IF -->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF Name="CGIsort2" -->
                     <!-- TMPL_VAR Name="CGIsort2" -->
                 <!-- TMPL_ELSE -->
                 <label for="sort2">Champ de tri 2</label>
                     <input type="text" id="sort2" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
                 <!--/TMPL_IF -->
-            </p>
+            </li></ol>
     </fieldset>
     <p>
         <input type="button" value="OK" onclick="check(this.form)" />

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/orderreceive.tmpl
index c11d1f2..86fc0fd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/orderreceive.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Réception de commande pour <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Colis <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --> (Commande N°<!-- TMPL_VAR NAME="ordernumber" -->)</div>
 
@@ -50,7 +50,7 @@
         <!-- TMPL_IF name="unitprice"-->
          <input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->" />
         <!-- TMPL_ELSE -->
-            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="rrp" -->" />
+            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost" -->" />
         <!-- /TMPL_IF --></p>
         <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
     <!-- TMPL_IF name="catview" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcel.tmpl
index 7afd008..dc046c3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcel.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo;<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  <!-- TMPL_IF name="date" -->
             Récapitulatif de réception de <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"-->Colis <i><!-- TMPL_VAR NAME="invoice" --></i><!--/TMPL_IF --> en <i><!-- TMPL_VAR NAME="date" --></i>
@@ -41,14 +41,13 @@
             <th>Quantité commandée</th>
             <th>Coût estimé</th>
             <th>REEL</th>
-            <th>P&P</th>
             <th>Quantité reçue</th>
             <th>TOTAL</th>
         </tr>
         <!-- TMPL_LOOP NAME="loop_received" -->
             <tr>
-                <td><!-- TMPL_VAR NAME="basketno" --></td>
-                <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a></td>
+                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
                 <!-- TMPL_IF NAME="isbn" --><br />ISBN : <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
                 <!-- TMPL_IF NAME="author" --><br />auteur : <!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
                 <!-- TMPL_IF NAME="publishercode" --><br />Editeur : <!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
@@ -56,8 +55,7 @@
                 <td><!-- TMPL_VAR NAME="quantity" --></td>
                 <td><!-- TMPL_VAR NAME="ecost" --></td>
                 <td><!-- TMPL_VAR NAME="unitprice" --></td>
-                <td>&nbsp;</td>
-                <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
+                <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="quantityreceived" --></a></td>
                 <td><!-- TMPL_VAR NAME="total" --></td>
             </tr>
         <!-- /TMPL_LOOP -->
@@ -100,21 +98,27 @@
             <th>Abrégé</th>
             <th>Qté cmde</th>
             <th>Coût cmd</th>
-            <th>Qté recue</th>
+            <th>Déjà reçus </th>
             <th>Coût reçufactur</th>
         </tr>
         <!-- TMPL_LOOP NAME="loop_orders" -->
             <tr>
-                <td><!-- TMPL_VAR NAME="basketno" --></td>
+                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a></td>
                 <td>
-                  <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+                  <!-- TMPL_VAR NAME="title" --></a>
                 <!-- TMPL_IF NAME="isbn" --><br />ISBN : <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
                 <!-- TMPL_IF NAME="author" --><br />auteur : <!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
                 <!-- TMPL_IF NAME="publishercode" --><br />Editeur : <!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
                 </td>
                 <td><!-- TMPL_VAR NAME="quantity" --></td>
                 <td><!-- TMPL_VAR NAME="ecost" --></td>
-                <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
+                <td><!-- TMPL_IF name="quantityreceived" -->
+                        <!-- TMPL_VAR NAME="quantityreceived" --> <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Plus</a>
+                    <!-- TMPL_ELSE -->
+                        <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Recevoir</a>
+                    <!-- /TMPL_IF -->
+                </td>
                 <td><!-- TMPL_IF EXPR="unitprice ne '0.00'" --><!-- TMPL_VAR NAME="unitprice" --><!-- /TMPL_IF --></td>
             </tr>
         <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcels.tmpl
index 193735f..b075866 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/parcels.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Réception de colis de <!-- TMPL_VAR NAME="name" --></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/spent.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/spent.tmpl
index cfacb5c..117be0a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/spent.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/spent.tmpl
@@ -4,7 +4,7 @@
 </head>   
 <body>  
 <!-- TMPL_INCLUDE NAME="header.inc" -->                                   
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Budgets et dépenses</div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/supplier.tmpl
index bd476a7..393e87c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/acqui/supplier.tmpl
@@ -13,17 +13,17 @@ function confirm_deletion() {
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo;<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Mise à jour <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Ajout d'un fournisseur<!-- /TMPL_IF --> <!-- /TMPL_IF --></div>
 
-
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo;<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;     <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" -->Mettre à jour : <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Ajout d'un fournisseur<!-- /TMPL_IF --> <!-- /TMPL_IF --></div>
-
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b">
+       <div class="yui-g">
+       
+<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
        
 <!--TMPL_IF Name="enter"-->
     <form action="updatesupplier.pl" method="post">
@@ -35,151 +35,160 @@ function confirm_deletion() {
     <!-- TMPL_ELSE -->
         <h1>Ajout d'un fournisseur</h1>
     <!-- /TMPL_IF -->
-        <fieldset>
+        <fieldset class="rows">
             <legend>Coordonnées société</legend>
-            <p><label for="company">Nom de société</label>
-                <input type="text" size="40" id="company" name="company" value="<!-- TMPL_VAR NAME="name" -->" /></p>
-            <p><label for="company_postal">Adresse postale</label>
-                    <textarea id="company_postal" name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea></p>
-            <p><label for="physical">Adresse physique</label>
-                <textarea id="physical" name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea></p>
-            <p><label for="company_phone">Téléphone</label>
-                <input type="text" size="20" id="company_phone" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" /></p>
-            <p><label for="company_fax">Fax</label>
-                <input type="text" size="20" id="company_fax" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" /></p>
-            <p><label for="website">Site Web</label>
-                <input type="text" size="40" id="website" name="website" value="<!-- TMPL_VAR NAME="url" -->" /></p>
+            <ol><li><label for="company">Nom de société</label>
+                <input type="text" size="40" id="company" name="company" value="<!-- TMPL_VAR NAME="name" -->" /></li>
+            <li><label for="company_postal">Adresse postale</label>
+                    <textarea id="company_postal" name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea></li>
+            <li><label for="physical">Adresse physique</label>
+                <textarea id="physical" name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea></li>
+            <li><label for="company_phone">Téléphone</label>
+                <input type="text" size="20" id="company_phone" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" /></li>
+            <li><label for="company_fax">Fax</label>
+                <input type="text" size="20" id="company_fax" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" /></li>
+            <li><label for="website">Site Web</label>
+                <input type="text" size="40" id="website" name="website" value="<!-- TMPL_VAR NAME="url" -->" /></li></ol>
         </fieldset>
-        <fieldset>
+        <fieldset class="rows">
             <legend>Coordonnées du contact</legend>
-            <p><label for="company_contact_name">Nom du contact</label>
-                <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></p>
-            <p><label for="company_contact_position">Poste</label>
-                <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></p>
-            <p><label for="contact_phone">Téléphone</label>
-                <input type="text" size="20" id="contact_phone" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" /> </p>
-            <p><label for="contact_phone_2">Autre téléphone</label>
-                <input type="text" size="20" id="contact_phone_2" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" /></p>
-            <p><label for="contact_fax">Fax</label>
-                <input type="text" size="20" id="contact_fax" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" /></p>
-            <p><label for="company_email">Email</label>
-                <input type="text" size="40" id="company_email" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" /></p>
-            <p><label for="contact_notes">Notes</label>
-                <textarea id="contact_notes" name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></p>
+           <ol> <li><label for="company_contact_name">Nom du contact</label>
+                <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></li>
+            <li><label for="company_contact_position">Poste</label>
+                <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></li>
+            <li><label for="contact_phone">Téléphone</label>
+                <input type="text" size="20" id="contact_phone" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" /> </li>
+            <li><label for="contact_phone_2">Autre téléphone</label>
+                <input type="text" size="20" id="contact_phone_2" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" /></li>
+            <li><label for="contact_fax">Fax</label>
+                <input type="text" size="20" id="contact_fax" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" /></li>
+            <li><label for="company_email">Email</label>
+                <input type="text" size="40" id="company_email" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" /></li>
+            <li><label for="contact_notes">Notes</label>
+                <textarea id="contact_notes" name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></li></ol>
         </fieldset>
-        <fieldset>
+        <fieldset class="rows">
             <legend>Informations sur les commandes</legend>
-            <p><strong>Le fournisseur est</strong>
+            <ol class="radio"><li><label for="activestatus" class="radio">Le fournisseur est :</label>
                     <!-- TMPL_IF name="active" -->
-                        <input type="radio" id="activestatus" name="status" value="1" checked="checked" /><label for="activestatus">Actif</label>
-                        <input type="radio" id="inactivestatus" name="status" value="0" /><label for="inactivestatus">Inactif</label>
+                        <label for="activestatus">Actif</label> <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
+                        <label for="inactivestatus">Inactif</label> <input type="radio" id="inactivestatus" name="status" value="0" />
                     <!-- TMPL_ELSE -->
-                        <input type="radio" id="activestatus" name="status" value="1" /><label for="activestatus">Actif</label>
-                        <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" /><label for="inactivestatus">Inactif</label>
-                    <!-- /TMPL_IF --></p>
-            <p><label for="publishers_imprints">Editeurs référencés</label>
-                <textarea id="publishers_imprints" name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea></p>
-            <p><label for="list_currency">La liste des prix est en</label>
+                        <label for="activestatus">Actif</label> <input type="radio" id="activestatus" name="status" value="1" />
+                        <label for="inactivestatus">Inactif</label> <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
+                    <!-- /TMPL_IF --></li>
+                       </ol>
+                       <ol>
+            <li><label for="publishers_imprints">Editeurs référencés</label>
+                <textarea id="publishers_imprints" name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea></li>
+            <li><label for="list_currency">La liste des prix est en</label>
                     <select name="list_currency" id="list_currency">
                     <!-- TMPL_LOOP NAME="loop_pricescurrency" -->
                         <!-- TMPL_VAR NAME="currency" -->
                     <!-- /TMPL_LOOP -->
-                    </select></p>
-            <p><label for="invoice_currency">Les prix facturés sont en</label>
+                    </select></li>
+            <li><label for="invoice_currency">Les prix facturés sont en</label>
                     <select name="invoice_currency" id="invoice_currency">
                     <!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
                         <!-- TMPL_VAR NAME="currency" -->
                     <!-- /TMPL_LOOP -->
-                    </select></p>
-            <!-- TMPL_IF NAME="GST" --><p><strong>TVA enregistrée</strong>
+                    </select></li>
+            <!-- TMPL_IF NAME="GST" --><li>TVA enregistrée
                                <!-- TMPL_IF name="gstreg" -->
                                        <input type="radio" name="gst" id="gstyes" value="1" checked="checked" /><label for="gstyes">Oui</label>
                     <input type="radio" name="gst" id="gstno" value="0" /><label for="gstno">Non</label>
                                <!-- TMPL_ELSE -->
                     <input type="radio" name="gst" id="gstyes" value="1" /><label for="gstyes">Oui</label>
                     <input type="radio" name="gst" id="gstno" value="0" checked="checked" /><label for="gstno">Non</label>
-                               <!-- /TMPL_IF --></p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
+                               <!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
                        
-            <!-- TMPL_IF NAME="GST" --><p><strong>Prix de commande</strong>
+            <!-- TMPL_IF NAME="GST" --><li>Prix de commande
                                <!-- TMPL_IF name="listincgst" -->
                                        <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" /><label for="list_gstyes">TVA inclusebudgetée</label>
                     <input type="radio" id="list_gstno" name="list_gst" value="0" /><label for="list_gstno">ne comprend pas la TVA</label>
                                <!-- TMPL_ELSE -->
                     <input type="radio" id="list_gstyes" name="list_gst" value="1" /><label for="list_gstyes">TVA inclusebudgetée</label>
                     <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" /><label for="list_gstno">ne comprend pas la TVA</label>
-                               <!-- /TMPL_IF --></p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0" /><!-- /TMPL_IF -->
+                               <!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0" /><!-- /TMPL_IF -->
                        
-            <!-- TMPL_IF NAME="GST" --><p><strong>Prix facturés</strong>
+            <!-- TMPL_IF NAME="GST" --><li>Prix facturés
                                <!-- TMPL_IF name= "invoiceincgst" -->
                     <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" /><label for="invoice_gstyes">TVA inclusebudgetée</label>
                     <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" /><label for="invoice_gstno">ne comprend pas la TVA</label>
                                        <!-- TMPL_ELSE -->
                     <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1"><label for="invoice_gstyes">TVA inclusebudgetée</label>
                     <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" /><label for="invoice_gstno">ne comprend pas la TVA</label>
-                               <!-- /TMPL_IF --></p><!-- TMPL_ELSE --><input type="hidden"  name="invoice_gst" value="0" /><!-- /TMPL_IF -->
-            <p><label for="discount">Remise</label>
-                <input type="text" size="3" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</p>
-            <p><label for="notes">Notes</label>
-                <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></p>
+                               <!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden"  name="invoice_gst" value="0" /><!-- /TMPL_IF -->
+            <li><label for="discount">Remise</label>
+                <input type="text" size="3" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
+            <li><label for="notes">Notes</label>
+                <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>
         </fieldset>
         <p><input type="submit" value="Valider"></p>
     </form>
 <!--TMPL_ELSE-->
     <h1>Renseignements sur : <!-- TMPL_VAR NAME="name" --></h1>
-    <div id="action">
-<ul>
-       <li>        <a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Modifier</a></li>
-       <li>        <a href="booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">Gérer les commandescommentaire</a></li>
-       <li>        <a href="parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Réceptionner un colis</a></li>
-</ul>
-        </div>
+
         <div id="supplier-company-details">
             <h3>Coordonnées société</h3>
-            <p>Nom de société <!-- TMPL_VAR NAME="name" --></p>
-            <p>Adresse postale <!-- TMPL_VAR NAME="postal" --></p>
-            <p>Adresse physique <!-- TMPL_VAR NAME="address1" --> <!-- TMPL_VAR NAME="address2" --> <!-- TMPL_VAR NAME="address3" --> <!-- TMPL_VAR NAME="address4" --></p>
-            <p>Téléphone <!-- TMPL_VAR NAME="phone" --></p>
-            <p>Fax <!-- TMPL_VAR NAME="fax" --></p>
-            <p>Site Web <!-- TMPL_VAR NAME="url" --></p>
+            <p><strong>Nom de société : </strong>
+                <!-- TMPL_VAR NAME="name" --></p>
+            <p><strong>Adresse postale : </strong>
+                    <!-- TMPL_VAR NAME="postal" --></p>
+            <p><strong>Adresse physique : </strong>
+                <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></p>
+            <p><strong>Téléphone :  </strong>
+                <!-- TMPL_VAR NAME="phone" --></p>
+            <p><strong>Fax :  </strong>
+                <!-- TMPL_VAR NAME="fax" --></p>
+           <!-- TMPL_IF NAME="url" --> <p><strong>Site Web : </strong>
+                <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></p><!-- /TMPL_IF -->
         </div>
         <div id="supplier-contact-details">
             <h3>Coordonnées du contact</h3>
-            <p>Nom du contact <!-- TMPL_VAR NAME="contact" --></p>
-            <p>Poste <!-- TMPL_VAR NAME="contpos" --></p>
-            <p>Téléphone <!-- TMPL_VAR NAME="contphone" --></p>
-            <p>Autre téléphone <!-- TMPL_VAR NAME="contaltphone" --></p>
-            <p>Fax <!-- TMPL_VAR NAME="contfax" --></p>
-            <p>Email <!-- TMPL_VAR NAME="contemail" --></p>
-            <p>Notes <!-- TMPL_VAR NAME="contnotes" --></p>
+            <p><strong>Nom du contact : </strong>
+                <!-- TMPL_VAR NAME="contact" --></p>
+            <p><strong>Poste : </strong>
+                <!-- TMPL_VAR NAME="contpos" --></p>
+            <p><strong>Téléphone :  </strong>
+                <!-- TMPL_VAR NAME="contphone" --></p>
+            <p><strong>Autre téléphone : </strong>
+                <!-- TMPL_VAR NAME="contaltphone" --></p>
+            <p><strong>Fax :  </strong>
+                <!-- TMPL_VAR NAME="contfax" --></p>
+            <!-- TMPL_IF NAME="contemail" --><p><strong>Email : </strong>
+                <a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></p><!-- /TMPL_IF -->
+            <p><strong>Notes :  </strong>
+                <!-- TMPL_VAR NAME="contnotes" --></p>
         
         </div>
         <div id="supplier-ordering-information">
         <h3>Informations sur les commandes</h3>
-            <p>Le fournisseur est
+            <p><strong>Le fournisseur est : </strong>
                     <!-- TMPL_IF name="active" -->
                         Actif
                     <!-- TMPL_ELSE -->
                         Inactif
                     <!-- /TMPL_IF --></p>
-            <p>Editeurs et imprimeurs <!-- TMPL_VAR NAME="specialty" --></p>
-            <p>La liste des prix est en <!--TMPL_VAR Name="listprice"--></p>
-            <p>Les prix facturés sont en <!--TMPL_VAR Name="invoiceprice"--></p>
-            <p>TVA enregistrée
+            <p><strong>Editeurs et imprimeurs : </strong>
+                <!-- TMPL_VAR NAME="specialty" --></p>
+            <p><strong>La liste des prix est en : </strong><!--TMPL_VAR Name="listprice"--></p>
+            <p><strong>Les prix facturés sont en : </strong><!--TMPL_VAR Name="invoiceprice"--></p>
+            <p><strong>TVA : </strong>
                     <!-- TMPL_IF name="gstreg" -->Oui<!--TMPL_ELSE-->Non<!-- /TMPL_IF --></p>
-            <p>Liste des prix des documents incluant la TVA
+            <p><strong>Liste des prix des documents incluant la TVA </strong>
                     <!-- TMPL_IF name="listincgst" -->Oui<!--TMPL_ELSE-->Non<!-- /TMPL_IF --></p>
-            <p>Le prix facturé comprend la TVA
+            <p><strong>Le prix facturé comprend la TVA : </strong>
                     <!-- TMPL_IF name= "invoiceincgst" -->Oui<!--TMPL_ELSE-->Non<!-- /TMPL_IF --></p>
-            <p>Remise <!-- TMPL_VAR NAME="discount" --> %</p>
-            <p>Notes <!-- TMPL_VAR NAME="notes" --></p>
+            <p><strong>Remise : </strong>
+                <!-- TMPL_VAR NAME="discount" --> %</p>
+            <p><strong>Notes :  </strong>
+                <!-- TMPL_VAR NAME="notes" --></p>
         </div>
 
 <!--/TMPL_IF-->
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/admin-home.tmpl
index 15a3fad..ec5774b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/admin-home.tmpl
@@ -8,104 +8,70 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsquo; Administration système</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><h1>Administration du système</h1>
+       <div id="yui-main" class="sysprefs">
+       <div class="yui-g"><h1>Préférences système</h1>
 
-<table>
-<caption>Préférences système</caption>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/systempreferences.pl">Préférences système</a></td>
-       <td>Change les préférences systèmes principales comme le format MARC, le format de la date, le gestionaire de mails, et les templates.</td>
-</tr>
-</table>
-<table>
-<caption>Configurer ces paramètres dans leur ordre d'apparition</caption>
-<tr>
-<th colspan="2">Paramètres de base</th>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/branches.pl">Sites de la bibliothèque</a></td>
-       <td>Définir les sites.</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/aqbookfund.pl">Postes et budgets</a></td>
-       <td>Postes et budgets pour les acquisitions</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/currency.pl">Devises et taux de change</a></td>
-       <td>Définit des monnaies et taux de change utilisés dans les acquisitions.</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/itemtypes.pl">Types de documents et règles de prêt.</a></td>
-       <td>Définir les types de documents utilisés pour les règles de prêt.</td>
-</tr>
+<dl>
+       <dt><a href="/cgi-bin/koha/admin/systempreferences.pl">Préférences système</a></dt>
+       <dd>Change les préférences systèmes principales comme le format MARC, le format de la date, le gestionaire de mails, et les templates.</dd>
+</dl>
 
-<tr>
-<th colspan="2">Adhérents et circulation</th>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/categorie.pl">Catégories adhérent</a></td>
-       <td>Catégories d'adhérent</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/cities.pl">Gestion des communes</a></td>
-       <td>Définit les villes dans lesquelles vos lecteurs habitent habituellement.</td>
-</tr>  
-<tr>
-       <td><a href="/cgi-bin/koha/admin/roadtype.pl" >Types de voie</a>
-       </td>
-       <td>Définit des types de voies : remplir cette table pour avoir une liste de types de voie (cela vous aidera pour les statistiques géographiques)</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/issuingrules.pl">Règles de circulation</a></td>
-       <td>Définit les règles de prêt par site/type d'adhérent/de document (nombre de prêts, durée, coût...)</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/finesrules.pl">Règles de retard</a></td>
-       <td>Définit les règles de retard par site/type d'adhérent/de document (coût, période de grâce...)</td>
-</tr>
-<tr>
-<th colspan="2">Catalogue</th>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/authorised_values.pl">Valeurs autorisées</a></td>
-       <td>Définit des catégories et les valeurs autorisées pour eux.</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grille de catalogage MARC</a></td>
-       <td>Créer et gérer les grilles de catalogage (champ et sous champs) qui définissent les caractéristiques de vos notices MARC (champs et sous champs), ainsi que l'organisation de la grille.</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Liens Koha => MARC</a></td>
-       <td>Définit les liens entre la base de données Koha et la base MARC.Noter que ces liens peuvent être définis dans la structure MARC.Cet outil est juste un raccourci pour activer les liens.</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/checkmarc.pl">Validation grilles de catalogage</a></td>
-       <td>Vérifie la structure MARC. Si vous avez modifié les grille de catalogage MARC, il est recommandé de lancer ce script pour vérifier qu'il n'y a pas d'erreurs dans vos grilles</td></tr>
-<tr>
-    <td><a href="/cgi-bin/koha/admin/authtypes.pl">Grille d'autorité Marc</a></td>
-    <td>Créer et gérer les autorités (champs et sous champs)</td>
-</tr>
 
-<tr>
-<th colspan="2">Paramètres divers</th>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/stopwords.pl">Mots vides</a></td>
-       <td>Mots ignorés dans la recherche</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/printers.pl">Imprimantes</a></td>
-       <td>Imprimantes (chemin UNIX)</td>
-</tr>
-<tr>
-       <td><a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs Z39.50</a></td>
-       <td>Définir les serveurs z3950 à utiliser pour le catalogage rapide.</td>
-</tr>
-</table>
+<div class="hint"><h4>Truc :</h4><p>Configurer ces paramètres dans leur ordre d'apparition</p></div>
+<h3>Paramètres de base</h3>
+<dl>
+       <dt><a href="/cgi-bin/koha/admin/branches.pl">Sites de la bibliothèque</a></dt>
+       <dd>Définir les sites.</dd>
+       <dt><a href="/cgi-bin/koha/admin/aqbookfund.pl">Postes et budgets</a></dt>
+       <dd>Postes et budgets pour les acquisitions</dd>
+       <dt><a href="/cgi-bin/koha/admin/currency.pl">Devises et taux de change</a></dt>
+       <dd>Définit des monnaies et taux de change utilisés dans les acquisitions.</dd>
+       <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Types de documents et règles de prêt.</a></dt>
+       <dd>Définir les types de documents utilisés pour les règles de prêt.</dd>
+</dl>
+
+<h3>Adhérents et circulation</h3>
+<dl>
+       <dt><a href="/cgi-bin/koha/admin/categorie.pl">Catégories adhérent</a></dt>
+       <dd>Catégories d'adhérent</dd>
+       <dt><a href="/cgi-bin/koha/admin/cities.pl">Gestion des communes</a></dt>
+       <dd>Définit les villes dans lesquelles vos lecteurs habitent habituellement.</dd>
+       <dt><a href="/cgi-bin/koha/admin/roadtype.pl" >Types de voie</a>
+       </dt>
+       <dd>Définit des types de voies : remplir cette table pour avoir une liste de types de voie (cela vous aidera pour les statistiques géographiques)</dd>
+       <dt><a href="/cgi-bin/koha/admin/issuingrules.pl">Règles de circulation</a></dt>
+       <dd>Définit les règles de prêt par site/type d'adhérent/de document (nombre de prêts, durée, coût...)</dd>
+       <dt><a href="/cgi-bin/koha/admin/finesrules.pl">Règles de retard</a></dt>
+       <dd>Définit les règles de retard par site/type d'adhérent/de document (coût, période de grâce...)</dd>
+</dl>
+
+<h3>Catalogue</h3>
+<dl>
+       <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Valeurs autorisées</a></dt>
+       <dd>Définit des catégories et les valeurs autorisées pour eux.</dd>
+       <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grille de catalogage MARC</a></dt>
+       <dd>Créer et gérer les grilles de catalogage (champ et sous champs) qui définissent les caractéristiques de vos notices MARC (champs et sous champs), ainsi que l'organisation de la grille.</dd>
+       <dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Liens Koha => MARC</a></dt>
+       <dd>Définit les liens entre la base de données Koha et la base MARC.Noter que ces liens peuvent être définis dans la structure MARC.Cet outil est juste un raccourci pour activer les liens.</dd>
+       <dt><a href="/cgi-bin/koha/admin/checkmarc.pl">Validation grilles de catalogage</a></dt>
+       <dd>Vérifie la structure MARC. Si vous avez modifié les grille de catalogage MARC, il est recommandé de lancer ce script pour vérifier qu'il n'y a pas d'erreurs dans vos grilles</dd>
+    <dt><a href="/cgi-bin/koha/admin/authtypes.pl">Grille d'autorité Marc</a></dt>
+    <dd>Créer et gérer les autorités (champs et sous champs)</dd>
+</dl>
+
+<h3>Paramètres divers</h3>
+<dl>
+       <dt><a href="/cgi-bin/koha/admin/stopwords.pl">Mots vides</a></dt>
+       <dd>Mots ignorés dans la recherche</dd>
+       <dt><a href="/cgi-bin/koha/admin/printers.pl">Imprimantes</a></dt>
+       <dd>Imprimantes (chemin UNIX)</dd>
+       <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs Z39.50</a></dt>
+       <dd>Définir les serveurs z3950 à utiliser pour le catalogage rapide.</dd>
+</dl>
+
 
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbookfund.tmpl
index a810f87..bcf4c60 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbookfund.tmpl
@@ -163,37 +163,30 @@
   <input type="hidden" name="op" value="add_validate" />
   <input type="hidden" name="checked" value="0" />
 
-  <table>
-    <caption><!-- TMPL_VAR name="header" --></caption>
+  <fieldset class="rows">
+    <legend><!-- TMPL_VAR name="header" --></legend>
     
-  <!-- TMPL_IF name="add_or_modify" -->
-    <tr>
-      <th>Ligne de crédit</th>
-      <td>
-        <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
+  <ol><!-- TMPL_IF name="add_or_modify" -->
+    <li>
+       <span class="label">Ligne de crédit : </span>
+        <input type="hidden" name="bookfundid" id="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
         <!-- TMPL_VAR name="bookfundid" -->
-      </td>
-    </tr>
+    </li>
   <!-- TMPL_ELSE -->
-    <tr>
-      <th>Ligne de crédit</th>
-      <td>
-        <input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" />
-      </td>
-    </tr>
+    <li>
+      <label for="bookfundid">Ligne de crédit : </label>
+      <input type="text" name="bookfundid" id="bookfundid" size="5" maxlength="5" onblur="toUC(this)" />
+    </li>
   <!-- /TMPL_IF --> <!-- add_or_modify -->
     
-    <tr>
-      <th>Nom</th>
-      <td>
-        <input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" />
-      </td>
-    </tr>
+    <li>
+      <label for="bookfundname">Nom :  </label>
+         <input type="text" name="bookfundname" id="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" />
+      </li>
 
-    <tr>
-      <th>Site</th>
-      <td>
-        <select name="branchcode">
+    <li>
+      <label for="branchcode">Site :  </label>
+      <select name="branchcode" id="branchcode">
           <option value="">Aucun</option>
   <!-- TMPL_LOOP NAME="branches" -->
     <!-- TMPL_IF NAME="selected" -->
@@ -203,10 +196,9 @@
     <!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
        </select>
-      </td>
-    </tr>
+    </li></ol>
     
-  </table>
+  </fieldset>
 
   <p>
     <input type="button" value="Valider" onclick="Check(this.form); return false;">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbudget.tmpl
index 5369135..7b0d3f4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/aqbudget.tmpl
@@ -241,26 +241,21 @@
 <!-- TMPL_IF name="add_form" -->
 
 <form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
-  <fieldset>
+  <fieldset class="rows">
     <legend><!-- TMPL_IF NAME="aqbudgetid" -->Modifier<!-- TMPL_ELSE -->Ajouter<!-- /TMPL_IF --> budget</legend>
     <input type="hidden" name="op" value="add_validate" />
     <input type="hidden" name="checked" value="0" />
 
-    <table>
-      <tr>
-        <th>Ligne de crédit</th>
-        <td>
-          <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" />
+    
+     <ol> <li>
+        <span class="label">Ligne de crédit : </span>
+        <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" />
           <!-- TMPL_VAR NAME="bookfundname" -->
-        </td>
-      </tr>
+      </li>
 
-      <tr>
-        <th>
-          <label for="startdate">Date de début (<!-- TMPL_VAR NAME="dateformat" -->)</label>
-        </th>
-        <td>
-          <input type="text" size="8" maxlength="10" id="startdate" name="startdate" value="<!-- TMPL_VAR Name="startdate" -->" />
+      <li>
+          <label for="startdate">Date de début (<!-- TMPL_VAR NAME="dateformat" -->) : </label>
+                       <input type="text" size="8" maxlength="10" id="startdate" name="startdate" value="<!-- TMPL_VAR Name="startdate" -->" />
           <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="startdate_button" alt="Voir calendrier">
           <script type="text/javascript">
 //<![CDATA[
@@ -273,13 +268,10 @@
             );
           //]]>
 </script>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="enddate">Date de fin (<!-- TMPL_VAR NAME="dateformat" -->)</label>
-        </th>
-        <td>
+        
+      </li>
+      <li>
+          <label for="enddate">Date de fin (<!-- TMPL_VAR NAME="dateformat" -->) : </label>
           <input type="text" size="8" maxlength="10" id="enddate" name="enddate" value="<!-- TMPL_VAR Name="enddate" -->" />
           <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="enddate_button" alt="Voir calendrier">
           <script type="text/javascript">
@@ -293,28 +285,23 @@
             );
           //]]>
 </script>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="budgetamount">Montant budget</label>
-        </th>
-        <td>
+        
+      </li>
+      <li>
+          <label for="budgetamount">Montant budget : </label>
           <input type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->" size="8" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="branch">Site</label>
-        </th>
-        <td>
+        
+      </li>
+      <li>
+          <label for="branch">Site :  </label>
+        
   <!-- TMPL_IF NAME="disable_branchselection" -->
           <!-- Pierrick's note: I've found that a disabled select was not -->
           <!-- giving its value to Perl :-/ So I use a hidden field trick -->
           <input type="hidden" name="branch" id="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
           <select name="branch" disabled="disabled">
   <!-- TMPL_ELSE -->
-          <select name="branch">
+          <select name="branch" id="branch">
   <!-- /TMPL_IF -->
 
             <option value="">----</option>
@@ -326,19 +313,18 @@
     <!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
           </select>
-        </td>
-      </tr>
-    </table>
+        
+      </li></ol>
+    
 
   <!-- TMPL_IF NAME="aqbudgetid" -->
     <input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" />
   <!-- /TMPL_IF -->
 
+  </fieldset>
     <p id="action">
       <input type="button" value="Valider" onclick="Check(this.form)">
-      <input type="submit" value="Annuler" onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;">
-    </p>
-  </fieldset>
+     </p>
 </form>
 <!-- /TMPL_IF --> <!-- add_form -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_subfields_structure.tmpl
index bcbcbbf..bd56c79 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_subfields_structure.tmpl
@@ -9,77 +9,75 @@
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Structure MARC des autorités</div>
 
 <div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
+
+<div id="bd">
+    <div id="yui-main">
+    <div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
 
-       <h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
-       <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Modifier les restrictions des sous-champs MARC<!-- /TMPL_IF -->
-       <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
-       <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-       <input type="hidden" name="op" value="add_validate" />
-       <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-       <!-- TMPL_LOOP NAME="loop" -->
-       <div class="data <!-- TMPL_VAR NAME="toggle" -->">
-          <h2>Champ <!-- TMPL_VAR NAME="tagfield" -->, sous-champ <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-          <p><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Répétable : </label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
-          <p><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Obligatoire : </label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
-          <p><label for="seealso<!-- TMPL_VAR NAME="row" -->">Rechercher aussi : </label><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (exemple pour 200a : '200c','200d','200e'...)</p>
-          <p><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Texte pour bibliothécaire : </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></p>
-          <p><label for="libopac<!-- TMPL_VAR NAME="row" -->">Texte à l'OPAC : </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></p>
-          <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Géré dans l'onglet</label><!-- TMPL_VAR NAME="tab" --> (ignore signifie que le sous-champ n'est PAS géré par Koha)</p>
-          <p><label for="hidden<!-- TMPL_VAR NAME="row" -->">Caché</label> Opac : <!-- TMPL_VAR name="ohidden" --> Intranet : <!-- TMPL_VAR name="ihidden" --> Editeur : <!-- TMPL_VAR name="ehidden" --> (voir aide en ligne)</p>
-          <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Est une URL </label> <!-- TMPL_VAR NAME="isurl" --> (coché, indique que le sous-champ est une URL valide et peut être cliqué)</p>
-        <p>Aide à la saisie :  </p>   
-        <ul>
-            <li>Valeur autorisée : <!-- TMPL_VAR NAME="authorised_value" --></li>
-            <li>Thésaurus <!-- TMPL_VAR NAME="frameworkcode" --></li>
-            <li>Plugin : <!-- TMPL_VAR NAME="value_builder" --></li>
-        </ul> 
-    </div>
-       <!-- /TMPL_LOOP -->
-       <input type="submit" class="submit" value="Valider les modifications">
-       <p>Remarque : dans la dernière colonne, vous pouvez choisir : 
-       <ul><li>Une "valeur autorisée" : renvoie à une liste de valeurs autorisées pour ce sous-champ. Voir dans la table de gestion correspondante.</li>
-       <li>Une " categorie de Thesaurus" : se rapporte à une catégorie de Thésaurus.Voir la Table de gestion correspondante.</li>
-       <li>Un "value builder" les constructeurs de valeur sont des programmes Perl qui vous aident à remplir un sous-champ. Ils changent en fonction de votre format MARC et remplissent parfois un autre champ automatiquement.</li>
-       </ul>
-       </p>
-       </form>
+    <h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
+    <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Modifier les restrictions des sous-champs MARC<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+        <!-- TMPL_LOOP NAME="loop" -->
+        <div class="data <!-- TMPL_VAR NAME="toggle" -->">
+            <h2>Champ <!-- TMPL_VAR NAME="tagfield" -->, sous-champ <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+            <p><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Répétable : </label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
+            <p><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Obligatoire : </label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
+            <p><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Texte pour bibliothécaire : </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></p>
+            <p><label for="libopac<!-- TMPL_VAR NAME="row" -->">Texte à l'OPAC : </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></p>
+            <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Géré dans l'onglet</label><!-- TMPL_VAR NAME="tab" --> (ignore signifie que le sous-champ n'est PAS géré par Koha)</p>
+            <p><label for="hidden<!-- TMPL_VAR NAME="row" -->">Caché</label> Opac : <!-- TMPL_VAR name="ohidden" --> Intranet : <!-- TMPL_VAR name="ihidden" --> Editeur : <!-- TMPL_VAR name="ehidden" --> (voir aide en ligne)</p>
+            <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Est une URL </label> <!-- TMPL_VAR NAME="isurl" --> (coché, indique que le sous-champ est une URL valide et peut être cliqué)</p>
+            <p>Aide à la saisie :  </p>       
+            <ul>
+                <li>Valeur autorisée : <!-- TMPL_VAR NAME="authorised_value" --></li>
+                <li>Thésaurus <!-- TMPL_VAR NAME="frameworkcode" --></li>
+                <li>Plugin : <!-- TMPL_VAR NAME="value_builder" --></li>
+            </ul> 
+        </div>
+        <!-- /TMPL_LOOP -->
+        <input type="submit" class="submit" value="Valider les modifications">
+        <p>Remarque : dans la dernière colonne, vous pouvez choisir : 
+            <ul><li>Une "valeur autorisée" : renvoie à une liste de valeurs autorisées pour ce sous-champ. Voir dans la table de gestion correspondante.</li>
+            <li>Une " categorie de Thesaurus" : se rapporte à une catégorie de Thésaurus.Voir la Table de gestion correspondante.</li>
+            <li>Un "value builder" les constructeurs de valeur sont des programmes Perl qui vous aident à remplir un sous-champ. Ils changent en fonction de votre format MARC et remplissent parfois un autre champ automatiquement.</li>
+            </ul>
+        </p>
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
-<h3>Confirmer la suppression du sous-champ <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" --> ?</span></h3>
-       <p>Sous-champ : <!-- TMPL_VAR NAME="tagsubfield" --></p>
-       <p>Description : <!-- TMPL_VAR NAME="liblibrarian" --></p>
-
-               <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
-                               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-                               <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
-                               <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-                               <input type="submit" class="cancel" value="Oui, supprimer ce sous-champ">
-               </form>
-               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                       <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                       <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-                       <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
-                       <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-                       <input type="submit" class="submit" value="Non, ne pas supprimer">
-               </form>
+    <h3>Confirmer la suppression du sous-champ <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" --> ?</span></h3>
+    <p>Sous-champ : <!-- TMPL_VAR NAME="tagsubfield" --></p>
+    <p>Description : <!-- TMPL_VAR NAME="liblibrarian" --></p>
+    <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+        <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+        <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+        <input type="submit" class="cancel" value="Oui, supprimer ce sous-champ">
+    </form>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+        <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+        <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+        <input type="submit" class="submit" value="Non, ne pas supprimer">
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-       <h3>Donnée supprimée</h3>
-       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-               <input type="submit" class="submit" value="OK" />
-       </form>
+    <h3>Donnée supprimée</h3>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+        <input type="submit" class="submit" value="OK" />
+    </form>
 <!-- /TMPL_IF -->
 
 
@@ -89,66 +87,62 @@
 <p>La colonne <b>Champ Koha</b> montre que le sous-champ est lié à un champ Koha. Koha peut présenter une interface MARC ou une interface Koha. Ce lien assure la synchronisation des deux modes (dans la base de données), de cette façon vous pouvez passer du mode MARC au mode non-MARC facilement.</p>
 
 <table>
-<tr>
-       <th>Sous-champ</th>
-       <th>Texte</th>
-       <th>Restricteurs</th>
-       <th>Supprimer</th>
-</tr>
-<!-- TMPL_LOOP NAME="loop" -->
-<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-       <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-       <td>
-               <!-- TMPL_IF NAME="subfield_ignored" -->
-                       <i><!-- TMPL_VAR NAME="liblibrarian" --></i>
-               <!-- TMPL_ELSE -->
-                       <!-- TMPL_VAR NAME="liblibrarian" -->
-               <!-- /TMPL_IF -->
-       </td>
-       <td>
-               <!-- TMPL_IF NAME="subfield_ignored" -->
-                       <i>sous-champ ignoré</i>
-               <!-- TMPL_ELSE -->
-                       <strong>Onglet : %s,</strong><!-- TMPL_VAR NAME="tab" -->,
-                       <!-- TMPL_IF NAME="kohafield" --> | <strong>Champ Koha : </strong> <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
-                       <!-- TMPL_IF NAME="repeatable" -->Répétable, <!-- TMPL_ELSE -->Non répétable
-            <!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="mandatory" -->Obligatoire, <!-- TMPL_ELSE -->Facultatif,
-            <!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="seealso" --> | <strong>Voir aussi : </strong> <!-- TMPL_VAR NAME="seealso" -->,
-            <!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="hidden" -->caché
+    <tr>
+        <th>Sous-champ</th>
+        <th>Texte</th>
+        <th>Restricteurs</th>
+        <th>Supprimer</th>
+    </tr>
+    <!-- TMPL_LOOP NAME="loop" -->
+    <!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+        <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+        <td>
+            <!-- TMPL_IF NAME="subfield_ignored" -->
+                    <i><!-- TMPL_VAR NAME="liblibrarian" --></i>
+            <!-- TMPL_ELSE -->
+                    <!-- TMPL_VAR NAME="liblibrarian" -->
             <!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="isurl" -->est une URL
-            <!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="authorised_value" --> | <strong>Valeur autorisée : </strong><!-- TMPL_VAR NAME="authorised_value" -->,
-            <!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="frameworkcode" --> | <strong>Autorité : </strong><!-- TMPL_VAR NAME="frameworkcode" -->,
-            <!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin : </strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
-          <!--/TMPL_IF-->
-       </td>
-       <td><a href="<!-- TMPL_VAR NAME="delete" -->">Supprimer</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
+        </td>
+        <td>
+            <!-- TMPL_IF NAME="subfield_ignored" -->
+                    <i>sous-champ ignoré</i>
+            <!-- TMPL_ELSE -->
+                <strong>Onglet : %s,</strong><!-- TMPL_VAR NAME="tab" -->,
+                <!-- TMPL_IF NAME="kohafield" --> | <strong>Champ Koha : </strong> <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
+                <!-- TMPL_IF NAME="repeatable" -->Répétable, <!-- TMPL_ELSE -->Non répétable
+                <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="mandatory" -->Obligatoire, <!-- TMPL_ELSE -->Facultatif,
+                <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="hidden" -->caché
+                <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="isurl" -->est une URL
+                <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="authorised_value" --> | <strong>Valeur autorisée : </strong><!-- TMPL_VAR NAME="authorised_value" -->,
+                <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="frameworkcode" --> | <strong>Autorité : </strong><!-- TMPL_VAR NAME="frameworkcode" -->,
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin : </strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+            <!--/TMPL_IF-->
+        </td>
+        <td><a href="<!-- TMPL_VAR NAME="delete" -->">Supprimer</a></td>
+    </tr>
+    <!-- /TMPL_LOOP -->
 </table>
 <div id="action">
     <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;tagfield=<!-- TMPL_VAR name="edit_tagfield" -->&amp;authtypecode=<!-- TMPL_VAR name="edit_authtypecode" -->">Modifier les sous-champs</a> <a href="auth_tag_structure.pl?searchfield=<!-- TMPl_VAR name="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode"-->">Retourner à la structure de l'autorité</a>
 </div>
     <!-- TMPL_IF NAME="previous" -->
-      <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="précédent" alt="précédent" border="0">
-      </a>
+    <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="précédent" alt="précédent" border="0">
+    </a>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="next" -->
-       <!-- TMPL_VAR NAME="next" -->
-      <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="suivant" alt="suivant" border="0">
-      </a>
+        <!-- TMPL_VAR NAME="next" -->
+    <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="suivant" alt="suivant" border="0">
+    </a>
     <!-- /TMPL_IF -->
 
 <!-- /TMPL_IF -->
 
-
-
 </div>
 </div>
 <div class="yui-b">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_tag_structure.tmpl
index 572d6b3..9d938fb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/auth_tag_structure.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; Grilles d'autoritévérification MARC :  <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-modify-tag-p" -->&rsaquo; Modifier le champ<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" -->&rsaquo; Ajouter un champ<!-- /TMPL_IF -->
-    <!-- TMPL_ELSE -->&rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->&rsaquo; Confirmer la suppression<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->&rsaquo; Donnée supprimée<!-- /TMPL_IF --></title>
+    <!-- TMPL_IF NAME="heading-modify-tag-p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage<!-- TMPL_ELSE -->Grille par défaut<!-- /TMPL_IF --> &rsaquo; Modifier le champ<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage<!-- TMPL_ELSE -->Grille par défaut<!-- /TMPL_IF --> &rsaquo; Ajouter un champ<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE -->&rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage<!-- TMPL_ELSE -->Grille par défaut<!-- /TMPL_IF --> &rsaquo; Confirmer la suppression<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage<!-- TMPL_ELSE -->Grille par défaut<!-- /TMPL_IF --> &rsaquo; Donnée supprimée<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -62,9 +62,9 @@ return false;
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-modify-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité Marc<a> &rsaquo; Modifier le champ<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité Marc pour</a> &rsaquo; Ajouter un champ<!-- /TMPL_IF -->
-    <!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité Marc pour</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité Marc </a> &rsaquo; Confirmer la suppression<!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirmed" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité Marc pour</a> &rsaquo; Entrée supprimée<!-- TMPL_ELSE -->Grille d'autorité MARC<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></div>
+    <!-- TMPL_IF NAME="heading-modify-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité </a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille par défaut</a><!-- /TMPL_IF --> &rsaquo; Modifier le champ<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité </a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille par défaut</a><!-- /TMPL_IF --> &rsaquo; Ajouter un champ<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité Marc pour</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité </a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille par défaut</a><!-- /TMPL_IF --> &rsaquo; Confirmer la suppression<!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirmed" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Grille d'autorité Marc pour</a> &rsaquo; Entrée supprimée<!-- TMPL_ELSE -->Grille d'autorité MARC <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Grille de catalogage<!-- TMPL_ELSE -->Grille par défaut<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -86,45 +86,42 @@ return false;
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-        <p><label>Champ</label><!-- TMPL_VAR NAME="searchfield" --></p>
-        <p><label>Texte pour les bibliothécaires</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="40" maxlength="100" /></p>
-        <p><label>Texte à l'OPAC</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape="HTML" -->" size="40" maxlength="100" /></p>
-        <p><label for="repeatable">Répétable</label>
+        <fieldset class="rows"><ol>
+               <li><span class="label">Champ</span><!-- TMPL_VAR NAME="searchfield" --></li>
+        <li><label for="liblibrarian">Texte pour les bibliothécaires</label><input type="text" name="liblibrarian" id="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="40" maxlength="100" /></li>
+        <li><label for="libopac">Texte à l'OPAC</label><input type="text" name="libopac" id="libopac" value="<!-- TMPL_VAR NAME="libopac" escape="HTML" -->" size="40" maxlength="100" /></li>
+        <li><label for="repeatable">Répétable</label>
             <!-- TMPL_IF NAME="repeatable" -->
                 <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="repeatable" id="repeatable" value="1" />
             <!-- /TMPL_IF -->
-        </p>
-        <p><label for="mandatory">Obligatoire</label>
+        </li>
+        <li><label for="mandatory">Obligatoire</label>
             <!-- TMPL_IF NAME="mandatory" -->
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked" />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" />
             <!-- /TMPL_IF -->
-            </p>
-        <p><label>Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les indicateurs seront limités à la liste des valeurs autorisées)</p>
-        <p><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
+            </li>
+        <li><label for="authorised_value">Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les indicateurs seront limités à la liste des valeurs autorisées)</li>
+</ol></fieldset>
+        <p><input type="button" value="Valider" class="button" onclick="Check(this.form)"></p>
     </form>
 <!-- /TMPL_IF -->
 
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 <h3>Confirmer la suppression</h3>
-<table>
-    <tr>
-        <td>Champ</td>
-        <td><!-- TMPL_VAR NAME="searchfield" --></td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-    </tr>
-    
-    <tr><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+
+               <ul>
+                       <li><strong>Champ : </strong><!-- TMPL_VAR NAME="searchfield" --> <!-- TMPL_VAR NAME="liblibrarian" --></li>
+               </ul>
+               
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
-        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="OUI"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NON" class="submit"></form></td></tr>
-</table>
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="OUI"></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NON" class="submit"></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/authorised_values.tmpl
index 4f990f4..0e42bab 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/authorised_values.tmpl
@@ -3,7 +3,7 @@
           <!-- TMPL_IF name="action_add_value" -->Ajout valeur autorisée<!-- /TMPL_IF -->
           <!-- TMPL_IF name="action_add_category" -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Confirmer la suppression<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Gestion des valeurs autorisées<!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="else" -->Valeurs autorisées<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -14,7 +14,7 @@
           <!-- TMPL_IF name="action_add_value" -->Ajout valeur autorisée<!-- /TMPL_IF -->
           <!-- TMPL_IF name="action_add_category" -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/authorised_values.pl">Valeur autorisées</a> &rsaquo; Confirmer la suppression<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Gestion des valeurs autorisées<!-- /TMPL_IF --></div>
+<!-- TMPL_IF name="else" -->Valeurs autorisées<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -30,24 +30,24 @@
        </h1>
        <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
        <input type="hidden" name="op" value="add_validate" />
-        <table>
-        <tr>
-            <th><label for="category">Catégorie</label></th>
-            <td><!-- TMPL_VAR name="category" --></td>
-        </tr>
-        <tr>
-            <th><label for="authorised_value">Valeur autorisée</label></th>
-            <td><input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" /></td>
-        </tr>
-        <tr>
-            <th><label for="lib">Description</label></th>
-            <td><input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" /></td>
-        </tr>
-        </table>
+        <fieldset class="rows"><ol>
+        <li>
+                        <!-- TMPL_IF name="action_add_category" --><label for="category">Catégorie</label><!-- TMPL_ELSE --><span class="label">Catégorie</span><!-- /TMPL_IF -->
+            
+            <!-- TMPL_VAR name="category" -->
+        </li>
+        <li>
+            <label for="authorised_value">Valeur autorisée</label>
+            <input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" />
+        </li>
+        <li>
+            <label for="lib">Description</label>
+            <input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" />
+        </li>
+        </ol></fieldset>
         <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
         <input type="submit" value="Valider">
     </form>
-    <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" value="Annuler et retourner à valeurs autorisées"></form>
 <!-- /TMPL_IF -->
 
 
@@ -70,7 +70,7 @@
 
 <!-- TMPL_IF name="else" -->
 
-<h1>Gestion des valeurs autorisées</h1>
+<h1>Valeurs autorisées</h1>
 <p>Cette table est utilisée dans la définition de MARC. Vous pouvez définir autant de catégories que vous le souhaitez, et autant de valeurs autorisées que vous souhaitez dans chaque catégorie.</p>
 <p>Lorsque vous déterminez la structure des sous-champs MARC, vous pouvez lier un sous-champ à une catégorie de valeurs autorisées. Lorsque le bibliothécaire créée une notice, le sous champ n'est plus une zone de saisie libre, mais une liste déroulante.</p>
 <form action="/cgi-bin/koha/admin/authorised_values.pl" method="post"><label for="searchfield">Voir catégorie :  </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Valider"></form>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/biblio_framework.tmpl
index b3a0c85..6a19e0c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/biblio_framework.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;système <!-- TMPL_IF NAME="add_form" --> Grille de catalogage &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modifier le texte de la grille<!-- TMPL_ELSE -->Ajouter une grille<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Grille de catalogage &rsaquo; Supprimer la grille pour <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Grille de catalogage<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo;système <!-- TMPL_IF NAME="add_form" --> Grille de catalogage &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modifier le texte de la grille<!-- TMPL_ELSE -->Ajouter une grille<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Grille de catalogage &rsaquo; Supprimer la grille pour <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->) ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Grille de catalogage<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -61,7 +61,7 @@ function Check(f) {
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grille de catalogage</a> &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modifier le texte de la grille<!-- TMPL_ELSE -->Ajouter une grille<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grille de catalogage</a> &rsaquo; Supprimer la grille pour <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Grille de catalogage<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grilles de catalogage</a> &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modifier le texte de la grille<!-- TMPL_ELSE -->Ajouter une grille<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grilles de catalogage</a> &rsaquo; Supprimer la grille pour <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->) ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Grille de catalogage<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -74,14 +74,14 @@ function Check(f) {
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="checked" value="0" />
-        <!-- TMPL_IF NAME="frameworkcode" -->
-            <p><label for="frameworkcode">Code de grille de catalogage</label><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></p>
+<fieldset class="rows">        <ol><!-- TMPL_IF NAME="frameworkcode" -->
+            <li><span class="label">Code de grille de catalogage</span><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></li>
         <!-- TMPL_ELSE -->
-            <p><label for="frameworkcode">Code de grille de catalogage</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></p>
+            <li><label for="frameworkcode">Code de grille de catalogage</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></li>
         <!-- /TMPL_IF -->
-        <p><label for="description">Description</label>
-        <input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" ESCAPE="HTML" -->" /></p>
-        <p>    <input type="button" value="Valider" class="submit" onclick="Check(this.form)"></p>
+        <li><label for="description">Description</label>
+        <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" ESCAPE="HTML" -->" /></li></ol></fieldset>
+        <p>    <input type="submit" value="Valider" class="submit" onclick="Check(this.form)"></p>
     </form>
 <!-- /TMPL_IF -->
 
@@ -109,7 +109,7 @@ function Check(f) {
     <tr>
         <td>&nbsp;</td>
         <td>Grille par défaut</td>
-        <td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Structure MARC</td>
+        <td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Structure MARC</a></td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
     </tr>
@@ -127,8 +127,7 @@ function Check(f) {
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
     <input type="hidden" name="op" value="add_form" />
     <input type="submit" value="Ajouter une grille">
-    <td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Précédent</a><!-- /TMPL_IF --></td>
-    <td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Suivant >></a><!-- /TMPL_IF --></td>
+    <!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Précédent</a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Suivant >></a><!-- /TMPL_IF -->
 </form>
 
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/branches.tmpl
index 1113b0c..8a3d1ed 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/branches.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;système <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" -->Modifier catégorie de site <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_category" -->Confirmer la suppression de la catégorie <!-- TMPL_VAR name="categorycode" --> ?<!-- /TMPL_IF --><!-- TMPL_IF name="add" -->
-    <!-- TMPL_IF name="heading-branches-add-branch-p" -->Ajouter un site<!-- TMPL_ELSE -->Modifier site <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Confirmer la suppression du site '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Sites de la bibliothèque<!-- /TMPL_IF --></title>
+    <!-- TMPL_IF name="heading-branches-add-branch-p" -->Ajouter un site<!-- TMPL_ELSE -->Modifier site <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Confirmer la suppression du site '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Sites de la bibliothèque &amp; catégories<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -9,15 +9,15 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  
 
-<!-- TMPL_IF NAME="editcategory" --><a href="/cgi-bin/koha/admin/branches.pl">Sites</a> &rsaquo;  <!-- TMPL_IF NAME="categorycode" -->Modifier catégorie de site <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_category" --><a href="/cgi-bin/koha/admin/branches.pl">Sites</a> &rsaquo; Confirmer la suppression de la catégorie <!-- TMPL_VAR name="categorycode" --> ?<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="editcategory" --><a href="/cgi-bin/koha/admin/branches.pl">Sites &amp; Catégories de sites</a> &rsaquo;  <!-- TMPL_IF NAME="categorycode" -->Modifier catégorie de site <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_category" --><a href="/cgi-bin/koha/admin/branches.pl">Sites &amp; Catégories de sites</a> &rsaquo; Confirmer la suppression de la catégorie <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="add" --><a href="/cgi-bin/koha/admin/branches.pl">Sites</a> &rsaquo;  
+<!-- TMPL_IF name="add" --><a href="/cgi-bin/koha/admin/branches.pl">Sites &amp; Catégories de sites</a> &rsaquo;  
 <!-- TMPL_IF name="heading-branches-add-branch-p" -->Ajouter un site<!-- TMPL_ELSE -->Modifier site <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/branches.pl">Sites</a> &rsaquo;  Confirmer la suppression du site '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/branches.pl">Sites &amp; Catégories de sites</a> &rsaquo;  Confirmer la suppression du site '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="else" -->Sites de la bibliothèque<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Sites de la bibliothèque &amp et catégories<!-- /TMPL_IF -->
 
 </div>
 
@@ -28,47 +28,46 @@
        <div class="yui-b">
 
 <!-- TMPL_IF name="add" -->
-    <!-- TMPL_IF name="heading-branches-add-branch-p" -->
-        <h1>Ajouter un site</h1>
-    <!-- TMPL_ELSE -->
-        <h1>Modifier un site</h1>
-    <!-- /TMPL_IF -->
+  <h3><!-- TMPL_IF name="heading-branches-add-branch-p" -->Ajouter un site<!-- TMPL_ELSE -->Modifier un site<!-- /TMPL_IF --></h3>
     <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
+       <fieldset class="rows">
         <input type="hidden" name="op" value="add_validate" />
         <!-- TMPL_IF name="heading-branches-add-branch-p" -->
             <input type="hidden" name="add" value="1" />
         <!-- TMPL_ELSE -->
             <input type="hidden" name="add" value="0" />
         <!-- /TMPL_IF -->
-        <p>
-            <label><b>Code du site</b></label>
+        <ol><li>
             <!-- TMPL_IF name="branchcode" -->
+                       <span class="label">Code du site</span>
                 <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
                 <!-- TMPL_VAR name="branchcode" -->
             <!-- TMPL_ELSE -->
-                <input type="text" name="branchcode" size="10" maxlength="10" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+            <label for="branchcode">Code du site</label>
+                <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
-            <label><b>Nom</b></label>
-            <input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;
-        </p>
-               Catégories de site :
-        <!-- TMPL_LOOP name="categoryloop" -->
-            <p>
-                <input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> />
-                               <label for="<!-- TMPL_VAR name="categorycode" -->"><!-- TMPL_VAR name="categoryname" --></label>
-                               : <!-- TMPL_VAR name="codedescription" -->
-            </p>
-        <!-- /TMPL_LOOP -->
-        <p><label>Adresse</label><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></p>
-        <p><label>&nbsp;</label><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></p>
-        <p><label>&nbsp;</label><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></p>
-        <p><label>Téléphone</label><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></p>
-        <p><label>Fax</label><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></p>
-        <p><label>Email</label><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></p>
-        <p><label>Adresses IP du site</label><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /></p>
-        <p><label>Imprimante site</label>
+        </li>
+        <li>
+            <label for="branchname">Nom</label>
+            <input type="text" name="branchname" id="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;
+        </li>
+               <li><fieldset><legend>Catégories de site :</legend>
+        <ol>
+               <!-- TMPL_LOOP name="categoryloop" -->
+            <li><label for="<!-- TMPL_VAR name="categorycode" -->"><!-- TMPL_VAR name="categoryname" --></label>
+                <input type="checkbox" id="<!-- TMPL_VAR name="categorycode" -->" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /> <span class="hint"><!-- TMPL_VAR name="codedescription" --></span>
+            </li>
+        <!-- /TMPL_LOOP --></fieldset>
+               </ol>
+               </li>
+        <li><label for="branchaddress1">Adresse 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li>
+        <li><label for="branchaddress2">Adresse 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li>
+        <li><label for="branchaddress3">Adresse 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li>
+        <li><label for="branchphone">Téléphone</label><input type="text" name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></li>
+        <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></li>
+        <li><label for="branchemail">Email</label><input type="text" name="branchemail" id="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></li>
+        <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /> <span class="hint">Peut être saisi comme une adresse IP simple, un sous réseau tel que 192.168.1.*</span></li>
+        <li><label for="branchprinter">Imprimante site</label>
             <select id="branchprinter" name="branchprinter">
                 <option value="">Aucun</option>
             <!-- TMPL_LOOP NAME="printerloop" -->
@@ -78,7 +77,8 @@
                                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchprinter" --></option>
                                <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-            </select></p>
+            </select></li></ol>
+                       </fieldset>
         <p><input type="submit" value="Valider"></p>
     </form>
 <!-- /TMPL_IF -->
@@ -185,25 +185,16 @@
         <td><!-- TMPL_VAR name="categoryname" --></td>
         <td><!-- TMPL_VAR name="categorycode" --></td>
         <td><!-- TMPL_VAR name="codedescription" --></td>
-        <td>
-            <form action="<!-- TMPL_VAR name="action" -->" method="post">
-            <input type="hidden" name="op" value="editcategory" />
-            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
-            <input type="submit" value="Modifier">
-            </form>
+        <td><a href="<!-- TMPL_VAR name="action" -->?op=editcategory&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="HTML" -->">Modifier</a>
         </td>
-        <td>
-            <form action="<!-- TMPL_VAR name="action" -->" method="post">
-            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
-            <input type="hidden" name="op" value="delete_category" /><input type="submit" value="Supprimer">
-            </form>
+        <td><a href="<!-- TMPL_VAR name="action" -->?op=delete_category&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="HTML" -->">Supprimer</a>
         </td>
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
     <!-- TMPL_ELSE -->
         <p>
-            <b>Pas de catégorie définie.</b>
+            Pas de catégorie définie.
         </p>
     <!-- /TMPL_IF --> <!-- NAME="branchcategories" -->
     <form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
@@ -213,31 +204,30 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="editcategory" -->
-    
+    <h3><!-- TMPL_IF NAME="categorycode" -->Modifier catégorie de site <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --></h3>
     <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
     <input type="hidden" name="op" value="addcategory_validate" />
-    <table>
-        <caption><!-- TMPL_IF NAME="categorycode" -->Modifier catégorie de site <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --></caption>
-        <tr>
-            <td>Code catégorie</td>
-            <td>
+    <fieldset class="rows">
+        
+        <ol><li>
                 <!-- TMPL_IF name="categorycode" -->
-                    <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
+                               <span class="label">Code catégorie : </span>
+                    <input type="hidden" name="categorycode" id="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
                     <!-- TMPL_VAR name="categorycode" -->
                 <!-- TMPL_ELSE -->
-                    <input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
+            <label for="categorycode">Code catégorie :</label>
+                    <input type="text" name="categorycode" id="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
                 <!-- /TMPL_IF -->
-            </td>
-        </tr>
-        <tr>
-            <td>Nom</td>
-            <td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name="categoryname" escape="HTML" -->" /></td>
-        </tr>
-        <tr>
-            <td>Description</td>
-            <td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" /></td>
-        </tr>
-    </table><input type="submit" value="Valider">
+            </li>
+        <li>
+            <label for="categoryname">Nom :  </label>
+            <input type="text" name="categoryname" id="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name="categoryname" escape="HTML" -->" />
+        </li>
+        <li>
+            <label for="codedescription">Description : </label>
+            <input type="text" name="codedescription" id="codedescription" size="70" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />
+        </li></ol>
+    </fieldset><input type="submit" value="Valider">
     </form>
 <!-- /TMPL_IF -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/categorie.tmpl
index 3e28478..6244341 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/categorie.tmpl
@@ -1,9 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;système <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modifier la catégorie <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo; Catégories d'adhérents <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modifier la catégorie <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Donnée enregistrée<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirmer la suppression de la catégorie <!-- TMPL_VAR NAME="categorycode" --> ?<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Catégorie supprimée<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="else" -->Catégories adhérent<!-- /TMPL_IF --></title>
+<!-- TMPL_IF NAME="delete_confirm" --><!-- TMPL_IF NAME="totalgtzero" -->Impossible de supprimer cette catégorie (utilisée <!-- TMPL_VAR NAME="categorycode" --> fois)<!-- TMPL_ELSE -->Confirmer la suppression de la catégorie <!-- TMPL_VAR NAME="categorycode" --> ?<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Catégorie supprimée<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -72,12 +71,12 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patrons-admin-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modifier la catégorie <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->Donnée enregistrée<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirmer la suppression de la catégorie <!-- TMPL_VAR NAME="categorycode" --> ?<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Catégorie supprimée<!-- /TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --> <a href="/cgi-bin/koha/admin/categorie.pl">Catégories de lecteurs</a> &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Modifier la catégorie <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Ajouter une catégorie<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/categorie.pl">Catégories de lecteurs</a> &rsaquo; donnée enregistrée<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/categorie.pl">Catégories de lecteurs</a> &rsaquo; <!-- TMPL_IF NAME="totalgtzero" -->Impossible de supprimer cette catégorie (utilisée <!-- TMPL_VAR NAME="categorycode" --> fois)<!-- TMPL_ELSE -->Confirmer la suppression de la catégorie <!-- TMPL_VAR NAME="categorycode" --> ?<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/categorie.pl">Catégories de lecteurs</a> &rsaquo; Catégories supprimée<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Catégories adhérent<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
@@ -99,19 +98,19 @@
        <!-- TMPL_ELSE -->
                <h1>Ajouter une catégorie</h1>
        <!-- /TMPL_IF -->
-       <table>
-       <!-- TMPL_IF NAME="categorycode" -->
-       <tr><th>Code catégorie</th><td><!-- TMPL_VAR NAME="categorycode" -->
-                               <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="hidden" name="is_a_modif" value="1" /></td></tr>
+       <fieldset class="rows">
+       <ol><!-- TMPL_IF NAME="categorycode" -->
+       <li><span class="label">Code catégorie</span><!-- TMPL_VAR NAME="categorycode" -->
+                               <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="hidden" name="is_a_modif" value="1" /></li>
        <!-- TMPL_ELSE -->
-       <tr><th>Code catégorie</th><td><input type="text" name="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
+       <li><label for="categorycode">Code catégorie</label><input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></li>
        <!-- /TMPL_IF -->
-       <tr><th>Description</th><td>&nbsp; <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->" /></td></tr>
-       <tr><th>Durée d'inscription</th><td>&nbsp; <input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" /> mois</td></tr>
-       <tr><th>Age requis</th><td>&nbsp; <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="3" /> ans</td></tr>
-       <tr><th>Limite d'âge supérieure</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->" /> ans</td></tr>
-       <tr><th>Frais d'inscription</th><td><input type="text" name="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /> €</td></tr>
-       <tr><th>Message de retard demandé</th><td>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
+       <li><label for="description">Description</label>&nbsp; <input type="text" name="description" id="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->" /></li>
+       <li><label for="enrolmentperiod">Durée d'inscription</label>&nbsp; <input type="text" name="enrolmentperiod" id="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" /> mois</li>
+       <li><label for="dateofbirthrequired">Age requis</label>&nbsp; <input type="text" name="dateofbirthrequired" id="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="3" /> ans</li>
+       <li><label for="upperagelimit">Limite d'âge supérieure</label>&nbsp; <input type="text" name="upperagelimit" id="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->" /> ans</li>
+       <li><label for="enrolmentfee">Frais d'inscription</label><input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /> €</li>
+       <li><label for="overduenoticerequired">Message de retard demandé</label>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
                        <!-- TMPL_IF NAME="overduenoticerequired" -->
                                                <option value="0">Non</option>
                                                <option value="1" selected="selected">Oui</option>
@@ -119,19 +118,19 @@
                                                <option value="0" selected="selected">Non</option>
                                                <option value="1">Oui</option>
                        <!-- /TMPL_IF -->
-                                       </select></td></tr>
-       <tr><th>Droits de réservation</th><td><input type="text" name="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /> €</td></tr>
-       <tr><th>Type de catégorie</th><td><select name="category_type" >
+                                       </select></li>
+       <li><label for="reservefee">Droits de réservation</label><input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /> €</li>
+       <li><label for="category_type">Type de catégorie</label><select name="category_type" id="category_type">
                                                <!-- TMPL_IF NAME="type_n" --><option value="" selected="selected">Sélectionnez un type de catégorie</option><!-- TMPL_ELSE --><option value="">Sélectionnez un type de catégorie</option><!-- /TMPL_IF -->
                                        <!-- TMPL_IF NAME="type_A" --><option value="A" selected="selected">Adulte</option><!-- TMPL_ELSE --><option value="A">Adulte</option><!-- /TMPL_IF -->
                                        <!-- TMPL_IF NAME="type_C" --><option value="C" selected="selected">Enfant</option><!-- TMPL_ELSE --><option value="C">Enfant</option><!-- /TMPL_IF -->
-                                       <!-- TMPL_IF NAME="type_I" --><option value="I" selected="selected">Collectivités</option><!-- TMPL_ELSE --><option value="I">Collectivités</option><!-- /TMPL_IF -->
+                                       <!-- TMPL_IF NAME="type_I" --><option value="I" selected="selected">Collectivité</option><!-- TMPL_ELSE --><option value="I">Collectivité</option><!-- /TMPL_IF -->
                                        <!-- TMPL_IF NAME="type_P" --><option value="P" selected="selected">Professionnel</option><!-- TMPL_ELSE --><option value="P">Professionnel</option><!-- /TMPL_IF -->
-                                       </select></td>
-       </tr>
-</table>
+                                       </select>
+       </li></ol>
+</fieldset>
 
-       <p>                             <input type="button" value='<!-- TMPL_IF NAME="categorycode" -->Valider les modifications<!-- TMPL_ELSE -->Ajout catégorie<!-- /TMPL_IF -->' onclick="Check(this.form);"> <input type="button" value="Annuler" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;"></p>
+       <p>                             <input type="submit" value='<!-- TMPL_IF NAME="categorycode" -->Valider les modifications<!-- TMPL_ELSE -->Ajout catégorie<!-- /TMPL_IF -->' onclick="Check(this.form);"> </p>
        </form>
 
 <!-- /TMPL_IF -->
@@ -149,23 +148,23 @@
                
        <!-- TMPL_IF NAME="totalgtzero" --><h3>Cette catégorie est utilisée <!-- TMPL_VAR NAME="categorycode" --> fois. Suppression impossible!</h3><!-- TMPL_ELSE --><h2>Confirmer la suppression de la catégorie <!-- TMPL_VAR NAME="categorycode" --> ?</h2><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="totalgtzero" --><div class="error">Cet enregistrement est utilisé <!-- TMPL_VAR NAME="total" --> fois. Suppression impossible<!-- /TMPL_IF -->
-       <div class="compact"><table>
-       <tr><th>Code catégorie</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
-       <tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
-       <tr><th>Durée d'inscription</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> mois</td></tr>
-       <tr><th>Age requis</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> années</td></tr>
-       <tr><th>Limite d'âge supérieure</th><td><!-- TMPL_VAR NAME="upperagelimit" --> années</td></tr>
-       <tr><th>Frais d'inscription</th><td><!-- TMPL_VAR NAME="enrolmentfee" --> €</td></tr>
-       <tr><th>Message de retard demandé</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td></tr>
-       <tr><th>Droits de réservation</th><td><!-- TMPL_VAR NAME="reservefee" --> €</td></tr>
-</table>
+       <ul>
+       <li><strong>Code catégorie : </strong><!-- TMPL_VAR NAME="categorycode" --></li>
+       <li><strong>Description : </strong><!-- TMPL_VAR NAME="description" --></li>
+       <li><strong>Durée d'inscription : </strong><!-- TMPL_VAR NAME="enrolmentperiod" --> mois</li>
+       <li><strong>Age requis </strong><!-- TMPL_VAR NAME="dateofbirthrequired" --> années</li>
+       <li><strong>Limite d'âge supérieure : </strong><!-- TMPL_VAR NAME="upperagelimit" --> années</li>
+       <li><strong>Frais d'inscription : </strong><!-- TMPL_VAR NAME="enrolmentfee" --> €</li>
+       <li><strong>Message de retard demandé </strong><!-- TMPL_IF NAME="overduenoticerequired" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></li>
+       <li><strong>Droits de réservation : </strong><!-- TMPL_VAR NAME="reservefee" --> €</li>
+</ul>
                <!-- TMPL_IF NAME="totalgtzero" -->
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" /></form>
                <!-- TMPL_ELSE -->
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                        <input type="hidden" name="op" value="delete_confirmed" />
                        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> <input type="submit" value="Supprimer cette catégorie"></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Ne pas supprimer"></form>
-               <!-- /TMPL_IF -->
+               <!-- /TMPL_IF --></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
@@ -181,10 +180,7 @@
 <!-- TMPL_IF NAME="searchfield" -->
                Vous recherchiez <!-- TMPL_VAR NAME="searchfield" --></span>
        <!-- /TMPL_IF -->
-       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-               <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-               <input type="submit" name="search" value="Rechercher">
-       </form> 
+
         <table>
                <tr>
                        <th scope="col">Code</th>
@@ -216,8 +212,8 @@
                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                         <td><!-- TMPL_IF NAME="overduenoticerequired" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Modifier"></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Supprimer"></form></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Modifier</a></td>
+                                               <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Supprimer</a></td>
                </tr>
                <!-- /TMPL_LOOP -->
        </table><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/checkmarc.tmpl
index 434a5db..760fb28 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/checkmarc.tmpl
@@ -104,6 +104,30 @@
     </tr>
 <!-- /TMPL_IF -->
 <!-- -->
+<!-- TMPL_IF name="itemtypes_empty" -->
+    <tr>
+        <td>Type de document non défini</td>
+        <td>Vous devez créer au moins un type de document</td>
+    </tr>
+<!-- TMPL_ELSE -->
+    <tr>
+        <td>OK</td>
+        <td>Au moins un type de document existe</td>
+    </tr>
+<!-- /TMPL_IF -->
+<!-- -->
+<!-- TMPL_IF name="branches_empty" -->
+    <tr>
+        <td>Site non défini</td>
+        <td>Vous devez créer au moins 1 site</td>
+    </tr>
+<!-- TMPL_ELSE --> 
+    <tr>
+        <td>OK</td>             
+        <td>Au moins un site existe</td>
+    </tr>                                       
+<!-- /TMPL_IF -->
+<!-- -->
 <!-- TMPL_IF name="biblionumber" -->
     <tr>
         <td>biblio et biblionumber</td>
@@ -122,7 +146,7 @@
             <td>Il y a une valeur NULL dans frameworkcode. Vérifier les tables suivantes<br />
                 <li>select * from marc_subfield_structure where frameworkcode is NULL</li>
                 <li>select * from marc_tag_structure where frameworkcode is NULL</li>
-                <li>select * from marc_biblio where frameworkcode is NULL</li></td>
+            </td>
         </tr>
     <!-- TMPL_ELSE -->
         <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/cities.tmpl
index 65f7e0d..c842506 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/cities.tmpl
@@ -52,7 +52,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cities-admin-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="cities-admin-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/cities.pl">Villes</a> &rsaquo; <!-- TMPL_IF NAME="cityid" --> Modifier une commune<!-- TMPL_ELSE --> Ajouter une commune<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/cities.pl">Villes</a> &rsaquo; Confirmer la suppression de la ville<!-- TMPL_ELSE --> Communes<!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
@@ -74,24 +74,21 @@
        <input type="hidden" name="checked" value="0" />
        <input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" />
 
-       <!-- TMPL_IF NAME="cityid" -->
-               <p class="p_borrowers">
-       
-               <label>Identifiant commune</label>
-               <label><b><!-- TMPL_VAR NAME="cityid" --></b></label>
-               </p>
+<fieldset class="rows"><ol>    <!-- TMPL_IF NAME="cityid" -->
+               <li>
+               <span class="label">Identifiant commune</span><!-- TMPL_VAR NAME="cityid" --></li>
        <!-- /TMPL_IF -->
-       <p>
-       <label>Nom de commune</label>
-       <input  type="text" name="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->" />
-       </p>
-       <p>                             
-       <label>Code postal de la commune</label>
-       <input type="text" name="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->" />
-       </p>
+       <li>
+       <label for="city_name">Nom de commune</label>
+       <input  type="text" name="city_name" id="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->" />
+       </li>
+       <li>                            
+       <label for="city_zipcode">Code postal de la commune</label>
+       <input type="text" name="city_zipcode" id="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->" />
+       </li></ol></fieldset>
        
        <p>
-               <input class="button" type="button" onclick="Check(this.form)" value="OK" />
+               <input class="button" type="button" onclick="Check(this.form)" value="Valider">
        </p>
        </form>
 
@@ -140,18 +137,18 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-       <h2>Gestion des communes</h2>
+       <h2>Communes</h2>
        <!-- TMPL_IF NAME="searchfield" -->
                Recherche : <!-- TMPL_VAR NAME="searchfield" -->
        <!-- /TMPL_IF -->
 
-       <table>
+<!-- TMPL_IF NAME="loop" -->   <table>
                <tr>
                        <th>Identifiant commune</th>
                        <th>Nom de commune</th>
                        <th>Code postal de la commune</th>
-                       <th> </th>
-                       <th> </th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
                        
                </tr>
                <!-- TMPL_LOOP NAME="loop" -->
@@ -168,8 +165,8 @@
                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;cityid=<!-- TMPL_VAR NAME="cityid" -->">Supprimer</a></td>
                </tr>
                <!-- /TMPL_LOOP -->
-
-       </table>
+       </table><!-- /TMPL_IF -->
+       
        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                <input type="hidden" name="op" value="add_form" />
                <p><input type="submit" class="button" value="Ajouter une commune" alt="Ajouter une commune"></p>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/currency.tmpl
index 5e64d92..e16adf9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/currency.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;système
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modifier une devise<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Ajouter une devise<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration système &rsaquo; Devises &amp; Taux de change &rsaquo; 
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modifier une devise '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Ajouter une devise<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Donnée enregistrée<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirmer la suppression de la devise <!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Devise supprimée<!-- /TMPL_IF -->
@@ -68,7 +68,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="currencies-admin-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modifier une devise<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Ajouter une devise<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/currency.pl">Devises &amp; Taux de change</a>&rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modifier une devise '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Ajouter une devise<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Donnée enregistrée<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirmer la suppression de la devise <!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Devise supprimée<!-- /TMPL_IF -->
@@ -86,37 +86,31 @@
 <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
 <input type="hidden" name="op" value="add_validate" />
 
-       <table>
-       <caption><!-- TMPL_IF NAME="searchfield" -->
+       <fieldset class="rows">
+       <legend><!-- TMPL_IF NAME="searchfield" -->
                Modifier la devise
        <!-- TMPL_ELSE -->
                Ajouter une devise
-       <!-- /TMPL_IF --></caption>
-       <!-- TMPL_IF NAME="searchfield" -->
-               <tr>
-                       <th>Devise</th>
-                       <td>
-                               <input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                       </td>
-               </tr>
+       <!-- /TMPL_IF --></legend>
+       <ol><!-- TMPL_IF NAME="searchfield" -->
+               <li>
+                       <span class="label">Devise : </span>
+                       <input type="hidden" name="currency" id="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
+                       </li>
        <!-- TMPL_ELSE -->
-               <tr>
-                       <th>Devise</th>
-                       <td>
-                               <input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this);" />
-                       </td>
-               </tr>
+               <li>
+                       <label for="currency">Devise : </label>
+                       <input type="text" name="currency" id="currency" size="50" maxlength="50" onblur="toUC(this);" />
+                       </li>
        <!-- /TMPL_IF -->
 
-               <tr>
-                       <th>Taux</th    >
-                       <td>
-                               <input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
-                       </td>
-               </tr>
-        </table>
+               <li>
+                       <label for="rate">Taux : </label>
+                       <input type="text" name="rate" id="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
+                       </li></ol>
+        </fieldset>
                
-               <input type="button" value="OK" onclick="Check(this.form)" /> <input type="button" value="Annuler" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;">
+               <input type="submit" value="Valider" onclick="Check(this.form)"> 
         </form>
 
 <!-- /TMPL_IF -->
@@ -184,8 +178,8 @@
                <tr>
                        <td><!-- TMPL_VAR NAME="currency" --></td>
                        <td><!-- TMPL_VAR NAME="rate" --></td>
-                       <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Modifier"></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Supprimer"></form></td>
+                       <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Modifier</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Supprimer</a></td>
                </tr>
                <!-- /TMPL_LOOP -->
        </table>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/finesrules.tmpl
index ee910c6..9c7a36a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/finesrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/finesrules.tmpl
@@ -8,77 +8,69 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Amendes</div>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
+<div id="doc" class="yui-t7">
 
-       <h1>Définition <!-- TMPL_IF NAME="branch" -->règles de retard pour <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->règles de retard par défaut<!-- /TMPL_IF --></h1>
-               
-       <div class="help">
-               <h3>CONSEIL pour les amendes</h3>
-               <p>Chaque case doit être remplie avec l'amende, l'échéance et la durée des frais</p>
-               <p>= 1 [Eur, USD] d'amende, au bout de 7 jours, par tranche de 7 jours</p>
-               <p>Demandez à votre administrateur d'ajouter ce script dans le planificateur de tâches (crontab), après minuit, pour que les amendes soient calculées chaque nuit</p>
-       </div>
-       <div class="help">
-               <h3>Valeurs par défaut</h3>
-               <p> Si une case n'est pas remplie, la première des valeurs suivantes est recherchée : </p>
-               <ul>
-                       <li>Même site et même catégorie d'adhérent et type de document*</li>
-                       <li>Même site, même type de document et catégorie d'adhérent *</li>
-                       <li>Même type de document, catégorie d'adhérent et site *</li>
-                       <li>Même site, même type de document et catégorie d'adhérent *</li>
-                       <li>Même site et même catégorie d'adhérent et type de document* </li>
-                       <li>Même site et même catégorie d'adhérent et type de document*</li>
-               </ul>
-       </div>
-               <form method="post" action="/cgi-bin/koha/admin/finesrules.pl">
-               <label for="branch">Sélection d'un site : </label>
-                       <select id="branch" name="branch">
-                               <option value="">Par défaut</option>
-                       <!-- TMPL_LOOP NAME="branchloop" -->
-                               <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
-                               <!-- TMPL_ELSE -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
-                               <!-- /TMPL_IF -->
-                       <!-- /TMPL_LOOP -->
-                       </select>
-                       <input type="submit" value="Sélectionner">
-               </form>
-               <form method="post" action="/cgi-bin/koha/admin/finesrules.pl">
-                       <input type="hidden" name="op" value="save" />
-                       <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-                       
-                       <table>
-                       <caption>Définition des règles de retard pour <!-- 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>
-                       <!-- TMPL_LOOP NAME="row" -->
-                               <tr>
-                                       <th scope="row"><!-- TMPL_VAR NAME="categorycode" --></th>
-                                       <!-- TMPL_LOOP NAME="cell" -->
-                                               <!-- TMPL_IF NAME="toggle" -->
-   <td class="highlight">
-<!-- TMPL_ELSE -->
-   <td>
-<!-- /TMPL_IF -->
-                                                       <input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
-                                               </td>
-                                       <!-- /TMPL_LOOP -->
-                               </tr>
-                       <!-- /TMPL_LOOP -->
-                       </table>
-                       
-                       <input type="submit" value="Valider les modifications">
-               </form>
+<div id="bd">
+    <div id="yui-main">
+    <div class="yui-g">
+    
+    <h1>Définition <!-- TMPL_IF NAME="branch" -->règles de retard pour <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->règles de retard par défaut<!-- /TMPL_IF --></h1>
+            
+    <div class="help">
+        <h3>CONSEIL pour les amendes</h3>
+        <p>Chaque case doit être remplie avec l'amende, l'échéance et la durée des frais</p>
+        <p>= 1 [Eur, USD] d'amende, au bout de 7 jours, par tranche de 7 jours</p>
+        <p>Demandez à votre administrateur d'ajouter ce script dans le planificateur de tâches (crontab), après minuit, pour que les amendes soient calculées chaque nuit</p>
+        <p>Les règles sont appliquées de la plus spécifique à la plus générale. La première qui est saisie :</p>
+        <ul>
+            <li>Même site, même catégorie</li>
+            <li>Même site, catégorie par défaut</li>
+            <li>Site par défaut, même catégorie</li>
+            <li>Site par défaut, catégorie par défaut</li>
+        </ul>
+    </div>
+        <form method="post" action="/cgi-bin/koha/admin/finesrules.pl">
+        <label for="branch">Sélection d'un site : </label>
+            <select id="branch" name="branch">
+                <option value="">Par défaut</option>
+                <!-- TMPL_LOOP NAME="branchloop" -->
+                    <!-- TMPL_IF NAME="selected" -->
+                        <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
+                    <!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+                    <!-- /TMPL_IF -->
+                <!-- /TMPL_LOOP -->
+            </select>
+            <input type="submit" value="Sélectionner">
+        </form>
+        <form method="post" action="/cgi-bin/koha/admin/finesrules.pl">
+            <input type="hidden" name="op" value="save" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+            
+            <table>
+            <caption>Définition des règles de retard pour <!-- TMPL_VAR NAME="branch" --></caption>
+            <tr>
+                <th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_IF EXPR="in_title eq '*'" -->Par défaut<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="in_title" --><!-- /TMPL_IF --></th><!-- /TMPL_LOOP -->
+            </tr>
+            <!-- TMPL_LOOP NAME="row" -->
+                <tr>
+                    <th scope="row"><!-- TMPL_IF name="total" -->Total <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></th>
+                    <!-- TMPL_LOOP NAME="cell" -->
+                        <!-- TMPL_IF NAME="toggle" -->
+                            <td class="highlight">
+                        <!-- TMPL_ELSE -->
+                            <td>
+                        <!-- /TMPL_IF -->
+                            <input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
+                        </td>
+                    <!-- /TMPL_LOOP -->
+                </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+        <input type="submit" value="Valider les modifications">
+    </form>
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/issuingrules.tmpl
index e5de0ea..5dd7a86 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/issuingrules.tmpl
@@ -8,74 +8,68 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Règles de prêt</div>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
+<div id="doc" class="yui-t7">
 
-       <h1>Définition <!-- TMPL_IF NAME="branch" -->règles de prêt pour <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->règles de prêt par défaut<!-- /TMPL_IF --></h1>
-       <div class="help">
-               <h3>CONSEIL pour les prêts</h3>
-               <p>Remplir chaque case  avec la durée du prêt, le nombre maximum de prêts</p>
-               <p>autorise 5 prêts pour 21 jours</p>
-       </div>
+<div id="bd">
+    <div id="yui-main">
+    <div class="yui-g">
 
-       <div class="help">
-               <h3>Valeurs par défaut</h3>
-               <p> Si une case n'est pas remplie, la première des valeurs suivantes est recherchée : </p>
-               <ul>
-                       <li>Même site et même catégorie d'adhérent et type de document*</li>
-                       <li>Même site, même type de document et catégorie d'adhérent *</li>
-                       <li>Même type de document, catégorie d'adhérent et site *</li>
-                       <li>Partout</li>
-                       <li>Si rien n'est défini, la valeur par défaut est 21,5 (fixé dans le code)</li>
+    <h1>Définition <!-- TMPL_IF NAME="branch" -->règles de prêt pour <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->règles de prêt par défaut<!-- /TMPL_IF --></h1>
+    <div class="help">
+        <h3>CONSEIL pour les prêts</h3>
+        <p>Remplir chaque case  avec la durée du prêt, le nombre maximum de prêts. Par exemple : 21,5 permet 5 prêts pour 21 jours</p>
+    </div>
+
+    <div class="help">
+        <h3>Valeurs par défaut</h3>
+        <ul>
+            <li>Si une case n'est pas remplie, la valeur saisie dans la colonne de droite ("défaut") est utilisée</li>
+            <li>Si un total est saisi (ligne du bas), l'adhérent doit remplir à la fois la règle du type de documents et la règle du total.</li>
+            <li>Si une règle est saisie pour un site donné, elle est utilisée. Sinon, la règle pour le site "par défaut" est prise en compte.</li>
                </ul>
-       </div>
-               <form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
-               <label for="branch">Sélection d'un site : </label>
-                       <select id="branch" name="branch">
-                               <option value="">Par défaut</option>
-                       <!-- TMPL_LOOP NAME="branchloop" -->
-                               <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
-                               <!-- TMPL_ELSE -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
-                               <!-- /TMPL_IF -->
-                       <!-- /TMPL_LOOP --></select>
-                       <input type="submit" value="Sélectionner">
-               </form>
-               <form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
-                       <input type="hidden" name="op" value="save" />
-                       <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-                       
-                       <table>
-                       <caption>Définition des règles de prêt pour <!-- 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>
-                       <!-- TMPL_LOOP NAME="row" -->
-                               <tr>
-                                       <th><!-- TMPL_VAR NAME="categorycode" --></th>
-                                       <!-- TMPL_LOOP NAME="cell" -->
-                                               <!-- TMPL_IF NAME="toggle" -->
-   <td class="highlight">
-<!-- TMPL_ELSE -->
-   <td>
-<!-- /TMPL_IF -->
-                                                       <input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" />
-                                               </td>
-                                       <!-- /TMPL_LOOP -->
-                               </tr>
-                       <!-- /TMPL_LOOP -->
-                       </table>
-                       
-                       <input type="submit" value="Valider les modifications">
-               </form>
+    </div>
+        <form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
+        <label for="branch">Sélection d'un site : </label>
+            <select id="branch" name="branch">
+                <option value="">Par défaut</option>
+                <!-- TMPL_LOOP NAME="branchloop" -->
+                    <!-- TMPL_IF NAME="selected" -->
+                        <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
+                    <!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+                    <!-- /TMPL_IF -->
+                <!-- /TMPL_LOOP -->
+            </select>
+            <input type="submit" value="Sélectionner">
+        </form>
+        <form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
+            <input type="hidden" name="op" value="save" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+            
+            <table>
+                <caption>Définition des règles de prêt pour <!-- TMPL_VAR NAME="branch" --></caption>
+                <tr>
+                    <th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_IF EXPR="in_title eq '*'" -->Par défaut<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="in_title" --><!-- /TMPL_IF --></th><!-- /TMPL_LOOP -->
+                </tr>
+                <!-- TMPL_LOOP NAME="row" -->
+                    <tr>
+                        <th scope="row"><!-- TMPL_IF name="total" -->Total <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></th>
+                        <!-- TMPL_LOOP NAME="cell" -->
+                            <!-- TMPL_IF NAME="toggle" -->
+                                <td class="highlight">
+                            <!-- TMPL_ELSE -->
+                                <td>
+                            <!-- /TMPL_IF -->
+                                <input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" />
+                            </td>
+                        <!-- /TMPL_LOOP -->
+                    </tr>
+                <!-- /TMPL_LOOP -->
+            </table>
+            <input type="submit" value="Valider les modifications">
+        </form>
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/itemtypes.tmpl
index 3ce5ad5..49bbf09 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/itemtypes.tmpl
@@ -1,23 +1,19 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;système<!-- TMPL_IF name="add_form" -->
+<title>Koha &rsaquo; Administration système &Asaquo; types de documents <!-- TMPL_IF name="add_form" -->&rsaquo; 
   <!-- TMPL_IF name="itemtype" -->
 Modifier le type de document '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
 Ajouter un type de document
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->
+<!-- TMPL_IF name="delete_confirm" -->&rsaquo; 
   <!-- TMPL_IF name="total" -->
 Impossible de supprimer le type de document '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
 Supprimer le type de document '<!-- TMPL_VAR name="itemtype" -->'?
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->
-Donnée supprimée
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->
-Gestion des types de document
+<!-- TMPL_IF name="delete_confirmed" -->&rsaquo; Donnée supprimée
 <!-- /TMPL_IF -->
 </title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><script type="text/javascript">
@@ -85,20 +81,20 @@ function Check(f) {
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" -->
   <!-- TMPL_IF name="itemtype" -->
-Modifier le type de document '<!-- TMPL_VAR name="itemtype" -->'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Types de documents</a> &rsaquo; Modifier le type de document '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
-Ajouter un type de document
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Types de documents</a> &rsaquo; Ajouter un type de documetns
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->
   <!-- TMPL_IF name="total" -->
-Impossible de supprimer le type de document '<!-- TMPL_VAR name="itemtype" -->'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Types de document</a> &rsaquo; Impossible de supprimer le type de document <!-- TMPL_VAR name="itemtype" -->
   <!-- TMPL_ELSE -->
-Supprimer le type de document '<!-- TMPL_VAR name="itemtype" -->'?
+<a href="/cgi-bin/koha/admin/itemtypes.pl">types de document</a> &rsaquo; Supprimer le type de documents '<!-- TMPL_VAR name="itemtype" -->' ?
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirmed" -->
-Donnée supprimée
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Types de documents</a> &rsaquo; Donnée supprimée
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->
 Gestion des types de document
@@ -120,41 +116,30 @@ Gestion des types de document
   <input type="hidden" name="op" value="add_validate" />
     <input type="hidden" name="checked" value="0" />
                
-    <table>
+    <fieldset class="rows">
+       <ol>
   <!-- TMPL_IF name="itemtype" -->
-      <tr>
-        <th>
-          <label>Type de document</label>
-        </th>
-        <td>
-          <input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" />
+      <li>
+          <span class="label">Type de document</span> <input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" />
           <!-- TMPL_VAR name="itemtype" -->
-        </td>
-      </tr>
+     </li>
   <!-- TMPL_ELSE -->
-      <tr>
-        <th>
-          <label for="itemtype">Type de document</label>
-        </th>
-        <td>
-          <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" onblur="toUC(this)" />
-        </td>
-      </tr>
+      <li>
+          <label for="itemtype">Type de document</label> <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" onblur="toUC(this)" />
+      </li>
   <!-- /TMPL_IF -->
-      <tr>
-        <th>
-          <label for="description">Description</label>
-        </th>
-       <td>
-          <input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />
-        </td>
-      </tr>
-      <tr>
-        <th>Image</th>
-        <td>
-          <p>
+      <li>
+          <label for="description">Description</label><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />      </li>
+      <li><fieldset>
+         <legend>Image : </legend>
+        
+          <ol>
   <!-- TMPL_LOOP NAME="IMAGESLOOP" -->
-            <label>
+                       <li style="float: none; display: inline; clear : none; width: auto;">
+            <label> <!-- TMPL_IF NAME="KohaImageSrc" -->
+              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="<!-- TMPL_VAR name="KohaImageSrc" -->" title="<!-- TMPL_VAR name="KohaImageSrc" -->" />
+        <!-- TMPL_ELSE -->
+        <!-- /TMPL_IF -->
     <!-- TMPL_IF name="checked" -->
               <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" checked="checked" />
     <!-- TMPL_ELSE -->
@@ -162,80 +147,58 @@ Gestion des types de document
               <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" />
               <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="KohaImageSrc" -->
-              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="<!-- TMPL_VAR name="KohaImageSrc" -->" title="<!-- TMPL_VAR name="KohaImageSrc" -->" />
-        <!-- TMPL_ELSE -->
-              <br />
-        <!-- /TMPL_IF -->
             </label>
+                       </li>
   <!-- /TMPL_LOOP -->
-          </p>
-
-          <p>
-            <label>
+       <li>
+            <label for="remote_image_check"> Image distante :</label>
   <!-- TMPL_IF name="remote_image" -->
             <input type="radio" id="remote_image_check" name="image" value="remoteImage" checked="checked" />
   <!-- TMPL_ELSE -->
             <input type="radio" id="remote_image_check" name="image" value="remoteImage" />
   <!-- /TMPL_IF -->
-            retirer l'image
-            </label>
+           
             <input type="text" name="remoteImage" size="48" maxlength="200" value="<!-- TMPL_VAR name="remote_image" -->" onmousedown="document.getElementById('remote_image_check').checked = true;" />
 
   <!-- TMPL_IF name="remote_image" -->
             <img src="<!-- TMPL_VAR name="remote_image" -->" alt="" />
   <!-- /TMPL_IF -->
-          </p>
-          <hr />
-          <p>
-            <label><input type="radio" name="image" value="removeImage" /> enlever l'image</label>
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="notforloan">Exclu du prêt</label>
-        </th>
-        <td>
-            <!-- TMPL_IF name="notforloan" -->
+          </li>
+          <li>
+            <label for="noimage">Pas d'image </label><input type="radio" name="image" id="noimage" value="removeImage" />
+          </li>
+        
+          </ol>
+                 </fieldset>
+      </li>
+      <li>
+          <label for="notforloan">Exclu du prêt</label>   <!-- TMPL_IF name="notforloan" -->
                 <input type="checkbox" id="notforloan" name="notforloan" checked="checked" value="1" />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" id="notforloan" name="notforloan" value="1" />
             <!-- /TMPL_IF -->
           (Coché aucun document de ce type ne pourra être prêté.Décoché, tous les documents de ce type pourront être prêtés sauf si l'option exclu du prêt est choisie pour un exemplaire précis.)
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="renewalsallowed">Renouvellements</label>
-        </th>
-        <td>
-                 <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="renewalsallowed" -->" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="rentalcharge">Coût du prêt</label>
-        </th>
-        <td>
-          <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="rentalcharge">Abrégé</label>
-        </th>
-        <td><p>Saisissez un abrégé qui effacera celui par défaut dans la liste de résultats d'une recherche</p>
-          <p><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></p>
-          <p>Exemple, pour un type de document de type site web :  </p>
+        
+      </li>
+      <li>
+          <label for="renewalsallowed">Renouvellements : </label>
+                 <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="renewalsallowed" -->" />
+        </li>
+      <li>
+          <label for="rentalcharge">Coût du prêt : </label>
+                 <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" />
+         </li>
+      <li>
+          <label for="summary">Abrégé : </label>
+         <textarea id="summary" name="summary" cols="55" rows="5"><!-- TMPL_VAR NAME="summary" --></textarea>
+          <p>Saisissez un abrégé qui effacera celui par défaut dans la liste de résultats d'une recherche. Exemple pour un type de documents "site web" </p>
           <p><b>&lt;a href="[856u]"&gt;voir site&lt;/a&gt;</b> affichera le lien sous le titre</p>
-        </td>
-      </tr>
-    </table>
+      </li>
+         </ol>
+    </fieldset>
 
     <p id="action">
       <input type="button" value="Valider les modifications" onclick="Check(this.form)">
-      <input type="button" value="Annuler" onclick="history.back();">
     </p>
 </form>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/koha2marclinks.tmpl
index 1ba6242..4bdbafa 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/koha2marclinks.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;système
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" -->Liens MARC &rsaquo; ><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->Liens MARC <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></title>
 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -9,17 +9,23 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Liaisons MARC </a> &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->Liens MARC <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></div>
-
+<!-- TMPL_IF name="add_form" -->
+<div id="doc" class="yui-t7">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-g">
+<!-- TMPL_ELSE -->
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->
-<!-- -->
 <h1><!-- TMPL_VAR name="action" --></h1>
        <p>Choisir et valider 1 des champs suivants pour <b><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></b></p><table>
 <tr><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">     <input type="hidden" name="op" value="add_validate" />
@@ -123,7 +129,7 @@
        </table>
 <!-- /TMPL_IF -->
 
-<!-- -->
+
 <!-- TMPL_IF name="else" -->
 
 <h1>Liens MARC <!-- TMPL_VAR name="tagfield" --></h1>
@@ -152,8 +158,10 @@
 
 </div>
 </div>
+<!-- TMPL_UNLESS name="add_form" -->
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
 </div>
+<!-- /TMPL_UNLESS -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marc_subfields_structure.tmpl
index efccb9c..82bdb3d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marc_subfields_structure.tmpl
@@ -5,33 +5,9 @@
 <script type="text/javascript">
 //<![CDATA[
 
-function active(numlayer){
-    var contentdiv   = document.getElementById("content");
-    var subfields    = contentdiv.getElementsByTagName("div");
-    var numSubfield  = subfields.length;
-    var tabs = document.getElementById("tabs").getElementsByTagName('a');
-
-    // all others must be hidden
-    for (i=0; i < numSubfield ; i++ ) {
-        if (subfields[i].getAttribute('id') == "content_"+numlayer) {
-        
-            // display this subfield
-            subfields[i].removeAttribute("class");
-            subfields[i].setAttribute("class","content_visible");
-            
-            // change css class
-            tabs[i].removeAttribute('class');
-            tabs[i].setAttribute('class',"tab_active");
-            
-        } else {
-            tabs[i].removeAttribute('class');
-            tabs[i].setAttribute('class',"tab_inactive");
-            subfields[i].removeAttribute("class");
-            subfields[i].setAttribute("class","content_hidden");
-        }
-    }
-}
-
+        $(document).ready(function() {
+               $('#subfieldtabs').tabs();
+        });
 
 function displayMoreConstraint(numlayer){
     var thisdiv = document.getElementById(numlayer);
@@ -51,80 +27,79 @@ function displayMoreConstraint(numlayer){
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">Structure MARC</a> &rsaquo; Edition des contraintes de sous-champs MARC<!-- /TMPL_IF --><!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">Structure MARC</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">Structure MARC</a> &rsaquo; Confirmez la suppression du sous-champ <!-- TMPL_VAR NAME="tagsubfield" --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">Structure MARC</a> &rsaquo; Sous-champ supprimé<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Structure des sosu-champs MARC<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Structure MARC des autorités</a> &rsaquo<a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Structure de la grille <!-- TMPL_VAR NAME="frameworkcode" --></a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Structure du champ <!-- TMPL_VAR NAME="tagfield" --></a> &rsaquo; Edition des contraintes de sous-champs MARC<!-- /TMPL_IF --><!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Structure du champ <!-- TMPL_VAR NAME="tagfield" --></a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Structure du champ <!-- TMPL_VAR NAME="tagfield" --></a> &rsaquo; Confirmez la suppression du sous-champ <!-- TMPL_VAR NAME="tagsubfield" --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Structure du champ <!-- TMPL_VAR NAME="tagfield" --></a> &rsaquo; Sous-champ supprimé<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Champ <!-- TMPL_VAR NAME="tagfield" -->, Structure des souq-champs<!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b">
+       <div class="yui-g">
 
 <!-- TMPL_IF NAME="add_form" -->
     <h1>
         <!-- TMPL_IF NAME="use-heading-flags-p" -->
-            <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Modifier les restrictions des sous-champs MARC<!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Champ <!-- TMPL_VAR NAME="tagfield" -->, sous-champ<!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <!-- TMPL_VAR NAME="action" -->
         <!-- /TMPL_IF -->
     </h1>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
     <input type="hidden" name="op" value="add_validate" />
+       <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
     <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
     <input type="submit" value="Valider les modifications">
     
-    <h2>Champ : <!-- TMPL_VAR NAME="tagfield" --></h2>
-    <div id="tabs">
-     <p>Modifier les sous-champs
+    <div id="subfieldtabs" class="toptabs numbered">
+   <ul>
         <!-- TMPL_LOOP NAME="loop" -->
-               <a 
-                    href="javascript:active('sub<!-- TMPL_VAR NAME='subfieldcode' -->');"
-                    class="tab_inactive"
-                    id="sub<!-- TMPL_VAR NAME="subfieldcode" -->"
-                    title="<!-- TMPL_VAR NAME="liblibrarian" -->"
-                >
+               <li><!-- TMPL_IF NAME="subfieldcode" --><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl#sub<!-- TMPL_VAR NAME="subfieldcode" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">
                     <!-- TMPL_VAR NAME="subfieldcode" -->
-               </a>
+               </a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl#sub<!-- TMPL_VAR NAME="subfieldcode" -->field" title="<!-- TMPL_VAR NAME="liblibrarian" -->">Nouveau</a><!-- /TMPL_IF --></li>
         <!-- /TMPL_LOOP -->
-    </p>
-    </div>
+    </ul>
     
-    <div id="content" style="display:block">
-        <!-- TMPL_LOOP NAME="loop" --> 
-        <div id="content_sub<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden">
+    <!-- TMPL_LOOP NAME="loop" --> 
+        <div id="sub<!-- TMPL_VAR NAME="subfieldcode" -->field">
         
-        <h3>Éditeur des restrictions</h3>
-                <!-- TMPL_IF name="subfieldcode" -->
-                    <p>Sous-champ <!-- TMPL_VAR NAME="subfieldcode" --> <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></p>
-                <!-- TMPL_ELSE -->
-                    <p>Sous-champ <input type="text" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></p>
-            <!-- /TMPL_IF -->
-            <p><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Texte pour le bibliothécaire</label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></p>
-            <p><label for="libopac<!-- TMPL_VAR NAME="row" -->">Texte pour l'OPAC</label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></p>
-            <p><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Répétable</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
-            <p><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Obligatoire</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
-            <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Géré dans l'onglet</label><!-- TMPL_VAR NAME="tab" --> (ignore signifie que le sous-champ n'est PAS géré par Koha)</p>
-            
+               <fieldset class="rows"><legend>Contraintes de base</legend>
+                       <ol>
+                               <!-- TMPL_IF name="subfieldcode" -->
+                               <li><span class="label">Sous-champ :</span> <!-- TMPL_VAR NAME="subfieldcode" --> <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></li>
+                               <!-- TMPL_ELSE -->
+                               <li><span class="label">Sous-champ :</span> <input type="text" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></li>
+                               <!-- /TMPL_IF -->
+                               <li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Texte pour bibliothécaire :  </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
+                               <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Texte à l'OPAC :  </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
+                               <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Répétable :  </label><!-- TMPL_VAR NAME="repeatable" --></li>
+                               <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Obligatoire :  </label><!-- TMPL_VAR NAME="mandatory" --></li>
+                               <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Géré dans l'onglet : </label><!-- TMPL_VAR NAME="tab" --> (ignore signifie que le sous-champ n'est PAS géré par Koha)</li>
+                       </ol>
+            </fieldset>
+                       
             <a href="javascript:displayMoreConstraint('more<!-- TMPL_VAR NAME="subfieldcode" -->')">Éditeur des restrictions</a>
-            <div id="more<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden">
-                <h3>Restrictions MARC</h3>
-                <p>
-                    <label for="defaultvalue">Valeurs par défaut</label>
-                    <input type="text" name="defaultvalue" id="defaultvalue" value="<!-- TMPL_VAR NAME="defaultvalue" -->" />
-                </p>
-                <p><label for="hidden">caché</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (voir aide en ligne)</p>
-                <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Est une URL</label> <!-- TMPL_VAR NAME="isurl" --> (coché, indique que le sous-champ est une URL valide et peut être cliqué</p>
-                <p><label>Lien</label><input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple : 200b)</p>
-                <p><label>Autres options : </label> (en choisir un)</p>
-                    <p><label>Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --></p>
-                    <p><label>Thésaurus</label><!-- TMPL_VAR NAME="authtypes" --></p>
-                    <p><label>Plugin</label><!-- TMPL_VAR NAME="value_builder" --></p>
-                </p>
-                <p><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Lien Koha</label><!-- TMPL_VAR NAME="kohafield" --></p>
-            </div>
-        </div>
+            <div id="more<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden" style="clear: both">
+             <fieldset class="rows" id="advanced-constraints">
+                               <legend>Contraintes avancées</legend>
+                <ol><li><label for="defaultvalue">Valeur par défaut</label>
+                    <input type="text" name="defaultvalue" id="defaultvalue" value="<!-- TMPL_VAR NAME="defaultvalue" -->" /></li>
+                <li><label for="hidden<!-- TMPL_VAR NAME="row" -->">caché</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (voir aide en ligne)</li>
+                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Est une URL</label> <!-- TMPL_VAR NAME="isurl" --> (coché, indique que le sous-champ est une URL valide et peut être cliqué</li>
+                <li><label for="link">Lien</label><input type="text" id="link" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple : 200b)</li>
+                <li><span class="label">Autres options : </span> (en choisir un)
+                       <ol>
+                               <li><label for="authorised_value">Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --></li>
+                               <li><label for="authtypecode">Thésaurus</label><!-- TMPL_VAR NAME="authtypes" --></li>
+                               <li><label for="value_builder">Plugin</label><!-- TMPL_VAR NAME="value_builder" --></li>
+                       </ol>
+                </li>
+                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Lien Koha</label><!-- TMPL_VAR NAME="kohafield" --></li>
+                               </ol>
+                               </fieldset>
+            </div><br class="clear" /><!-- /more  -->
+        </div><!-- /content_sub -->
         <!-- /TMPL_LOOP -->
-    </div>
+               </div><!-- /content -->
     </form>
 <!-- /TMPL_IF -->
 
@@ -228,8 +203,5 @@ function displayMoreConstraint(numlayer){
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marctagstructure.tmpl
index c0f33f8..f401c5d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/marctagstructure.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;système
-<!-- TMPL_IF name="add_form" -->Structure des champs MARC &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" -->Grille d'autorité Marc pour &rsaquo; <!-- TMPL_VAR name="action" --> <!-- TMPL_VAR NAME="searchfield" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Structure des champs MARC &rsaquo; Confirmer la suppression du champ '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Structure des champs MARC &rsaquo; Donnée supprimée<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Structure des champs MARC<!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="delete_confirmed" -->Grille de catalogage &rsaquo; Entrée supprimée<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Grille de catalogage<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -62,10 +62,10 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">Structure MARC</a> &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">Structure MARC</a> &rsaquo; Confirmez la suppression du champ '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">Structure MARC</a> &rsaquo; Information supprimée<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Structure des champs MARC<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">Grilles de catalogage</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Grille de catalogage <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->) </a> &rsaquo; <!-- TMPL_VAR name="action" --> <!-- TMPL_VAR NAME="searchfield" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">Grille de catalogage</a> &rsaquo; Confirmez la suppression du champ '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">Grilles de catalogage</a> &rsaquo; Entrée supprimée<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grilles de catalogage</a> &rsaquo; Grille de catalogage pour  <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->) ?<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -73,25 +73,26 @@
        <div id="yui-main">
        <div class="yui-b">
 
-<h1>Gestion de la structure des champs MARC pour <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->Grille MARC par défaut<!-- /TMPL_IF --></h1>
+<h1>Grille Marc pour <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->Grille MARC par défaut<!-- /TMPL_IF --></h1>
 
 
 <!-- TMPL_IF NAME="add_form" -->
 
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate" />
+       
+      <fieldset class="rows"><legend><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modifier le champ '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Ajouter un champ<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></legend>  <input type="hidden" name="op" value="add_validate" />
        <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-        <h2><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modifier le champ<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Ajouter un champ<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h2>
-        <p><label>Champ</label><input id="tagfield" type="text" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" maxlength="3" size="3" /></p>    
-    <p><label for="liblibrarian">Texte pour bib</label><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" ESCAPE="HTML" -->" size="40" maxlength="100" /></p>
-    <p><label for="libopac">Texte pour OPAC</label><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" ESCAPE="HTML" -->" size="40" maxlength="100" /></p>
-    <p><label for="repeatable">Répétable</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
-    <p><label for="mandatory">Obligatoire</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
-    <p><label for="authorised_value">Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les indicateurs seront limités à la liste des valeurs autorisées)</p>
-        <p>
+
+       <ol> <li><label for="tagfield">Champ</label><input id="tagfield" type="text" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" maxlength="3" size="3" /></li>    
+    <li><label for="liblibrarian">Texte pour bib</label><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" ESCAPE="HTML" -->" size="40" maxlength="100" /></li>
+    <li><label for="libopac">Texte pour OPAC</label><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" ESCAPE="HTML" -->" size="40" maxlength="100" /></li>
+    <li><label for="repeatable">Répétable</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</li>
+    <li><label for="mandatory">Obligatoire</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</li>
+    <li><label for="authorised_value">Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les indicateurs seront limités à la liste des valeurs autorisées)</li>
+        <li>
             <input type="submit" value="Valider les modifications" onclick="Check(this.form)">
             <input type="submit" value="Annuler et retourner à la structure des champs MARC" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;">
-        </p>
+        </li></ol></fieldset>
     </form>
 <!-- /TMPL_IF -->
 
@@ -113,7 +114,7 @@
 
     <div class="details"><h3>Champ supprimé</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-    <input type="submit" value="Retour structure MARC">
+    <input type="submit" value="Retourner aux grilles de catalogage">
     </form>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="framework_create" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/printers.tmpl
index ca83258..089ce95 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/printers.tmpl
@@ -91,32 +91,32 @@
        <!-- /TMPL_IF -->
         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
-       <table>
-       <!-- TMPL_IF NAME="searchfield" -->
-               <tr>
-                       <th scope="row">Nom de l'imprimante</th>
-                       <td>
-                               <input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                       </td>
-               </tr>
+       <fieldset class="rows">
+<ol>   <!-- TMPL_IF NAME="searchfield" -->
+               <li>
+                       <span class="label">Nom de l'imprimante : </span>
+                       
+                               <input type="hidden" name="printername" id="" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
+                       
+               </li>
        <!-- TMPL_ELSE -->
-               <tr>
-                       <th scope="row">Nom de l'imprimante</th>
-                       <td>
-                               <input type="text" name="printername" size="50" maxlength="50" />
-                       </td>
-               </tr>
+               <li>
+                       <label for="printername">Nom de l'imprimante : </label>
+                       
+                               <input type="text" name="printername" id="printername" size="50" maxlength="50" />
+                       
+               </li>
        <!-- /TMPL_IF -->
 
-               <tr>
-                       <th scope="row">File d'attente</th>
-                       <td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> </td>
-               </tr>
-               <tr>
-                       <th scope="row">Type</th>
-                       <td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->" /> </td>
-               </tr>
-        </table><p><input type="button" value="OK" onclick="Check(this.form);" /> <input type="button" value="Annuler" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';"></p>
+               <li>
+                       <label for="printqueue">File d'attente : </label>
+                       <input type="text" name="printqueue" id="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> 
+               </li>
+               <li>
+                       <label for="printtype">Type : </label>
+                       <input type="text" name="printtype" id="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->" /> 
+               </li></ol>
+        </fieldset><p><input type="submit" value="Valider" onclick="Check(this.form);"> </p>
         </form>
 
 <!-- /TMPL_IF -->
@@ -130,28 +130,20 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 <h3>Confirmer la suppression de l'imprimante <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>
-<table>
-               <tr>
-                       <td>Imprimante</td>
-                       <td><!-- TMPL_VAR NAME="searchfield" --></td>
-               </tr>
-               <tr>
-                       <td>File d'attente</td>
-                       <td><!-- TMPL_VAR NAME="printqueue" --></td>
-               </tr>
-               <tr>
-                       <td>Type</td>
-                       <td><!-- TMPL_VAR NAME="printtype" --></td>
-               </tr>
-               <tr>
-                       <td>
-
-                       </td>
-                       <td>
-
-                       </td>
-               </tr>
-       </table>
+<ul>
+               <li>
+                       <strong>Imprimante : </strong>
+                       <!-- TMPL_VAR NAME="searchfield" -->
+               </li>
+               <li>
+                       <strong>File d'attente : </strong>
+                       <!-- TMPL_VAR NAME="printqueue" -->
+               </li>
+               <li>
+                       <strong>Type : </strong>
+                       <!-- TMPL_VAR NAME="printtype" -->
+               </li>
+       </ul>
        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                        <input type="hidden" name="op" value="delete_confirmed" />
                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
@@ -186,8 +178,7 @@
                        <td><!-- TMPL_VAR NAME="printername" --></td>
                        <td><!-- TMPL_VAR NAME="printqueue" --></td>
                        <td><!-- TMPL_VAR NAME="printtype" --></td>
-                       <td><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Modifier"></form> <form class="inline" action="" method="get"><input type="hidden" name=
-"op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Supprimer"></form></td>
+                       <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Modifier</a> <a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Supprimer</a></td>
                </tr>
                <!-- /TMPL_LOOP -->
        </table><!-- TMPL_ELSE --><div class="notice">Pas d'imprimante définie.</div><!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/roadtype.tmpl
index 7d88936..cdb5e1f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/roadtype.tmpl
@@ -52,7 +52,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="roadtype-admin-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="roadtype-admin-search.inc" -->
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/roadtype.pl">Type de voie</a> &rsaquo;  <!-- TMPL_IF NAME="roadtypeid" --> Modifier un type de voie<!-- TMPL_ELSE --> Ajouter un type de voie<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/roadtype.pl">Imprimante</a> &rsaquo; Confirmer la suppression<!-- TMPL_ELSE --> Type de voie<!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
@@ -73,20 +73,16 @@
        <input type="hidden" name="checked" value="0" />
        <input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" />
 
+<fieldset class="rows"><ol>
 <!-- TMPL_IF NAME="roadtypeid" -->
-
-       <p>
-       <label>Type de voie</label>
-       <label><b><!-- TMPL_VAR NAME="roadtypeid" --></b></label>
-       </p>
-       
+<li>
+       <span class="label">Type de voie : </span><!-- TMPL_VAR NAME="roadtypeid" -->
+       </li>
 <!-- /TMPL_IF -->
-       <p>                     
-       <label>Type de voie</label>
-               
-       <input  type="text" name="road_type" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="road_type" ESCAPE="HTML" -->" />
-                               
-       </p>
+       <li>                    
+               <label for="road_type">Type de voie : </label>
+       <input  type="text" name="road_type" id="road_type" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="road_type" ESCAPE="HTML" -->" />
+       </li></ol></fieldset>
        
        <p>                                       
        <input class="button" type="button" onclick="Check(this.form)" value="OK" />    
@@ -96,23 +92,20 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
        <h3>Confirmer la suppression du type de voie</h3>
-       <table>
-               <tr>
-                       <th>Identifiant type de voie </th>
-                       <td><!-- TMPL_VAR NAME="roadtypeid" --></td>
-               </tr>
-               <tr>
-                       <th>Type de voie</th>
-                       <td><!-- TMPL_VAR NAME="road_type" --></td>
-               </tr>
-               <tr>
-                       <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+       <ul>
+               <li>
+                       <strong>Identifiant type de voie : </strong>
+                       <!-- TMPL_VAR NAME="roadtypeid" --></td>
+               </li>
+               <li>
+                       <strong>Type de voie : </strong>
+                       <!-- TMPL_VAR NAME="road_type" -->
+               </li>
+
+       </ul><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                        <input type="hidden" name="op" value="delete_confirmed" />
-                       <input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" value="OUI"></form></td>
-                       <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                       <input type="submit" value="NON"></form></td>
-               </tr>   
-       </table>
+                       <input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" value="Oui, supprimer"></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                       <input type="submit" value="Non, ne pas supprimer"></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
@@ -121,8 +114,7 @@
                Rechercher <!-- TMPL_VAR NAME="searchfield" -->
        <!-- /TMPL_IF -->
 
-
-       <table>
+<!-- TMPL_IF NAME="loop" -->   <table>
                <tr>
                        <th>Type de voie</th>
                        <th colspan="2">&nbsp;</th>
@@ -138,8 +130,8 @@
                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">Supprimer</a></td>
                </tr>
                <!-- /TMPL_LOOP -->
-
-       </table>
+       </table><!-- /TMPL_IF -->
+       
        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                <input type="hidden" name="op" value="add_form" />
                <p><input type="submit" class="button" value="Ajouter un type de voie"></p>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/z3950servers.tmpl
index d0e1960..709d106 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/admin/z3950servers.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;système <!-- TMPL_IF NAME="else" -->Serveurs Z39.50<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modifier le serveur Z39.50 <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Ajouter un serveur Z39.50<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirmer la suppression<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->Serveur Z39.50 ajouté<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Serveur Z39.50 supprimé<!-- /TMPL_IF --></title>
+<!-- TMPL_IF NAME="add_form" --> Serveurs Z39.50 &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modifier le serveur Z39.50 <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Ajouter un serveur Z39.50<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Serveurs z3950 &rsaquo; Confirmer la suppression<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Serveurs z3950 &rsaquo; serveur ajouté<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Serveurs z3950 &rsaquo; Serveur supprimé<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_IF NAME="add_form" -->
@@ -84,10 +84,10 @@
 <!-- TMPL_INCLUDE NAME="z3950-admin-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="else" -->Serveurs Z39.50<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modifier le serveur Z39.50 <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Ajouter un serveur Z39.50<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirmer la suppression<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->Serveur Z39.50 ajouté<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Serveur Z39.50 supprimé<!-- /TMPL_IF --></div>
+<!-- TMPL_IF NAME="add_form" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs z3950</a> &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modifier le serveur Z39.50 <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Ajouter un serveur Z39.50<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs z3950</a> &rsaquo; Confirmer la suppression<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs z3950</a> &rsaquo; Serveur ajouté<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs z3950</a> &rsaquo; Serveur supprimé<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -106,74 +106,74 @@
         <!-- TMPL_ELSE -->
                 <h1>Ajouter un serveur Z39.50</h1>
         <!-- /TMPL_IF -->                
-        <table>
-        <!-- TMPL_IF NAME="searchfield" -->
-                <tr>
-                        <th scope="row">Serveur Z39.50</th>
-                        <td>
+        <fieldset class="rows">
+        <ol><!-- TMPL_IF NAME="searchfield" -->
+                <li>
+                        <span class="label">Serveur Z39.50 : </span>
+                        
                                 <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
+                        
+                </li>
         <!-- TMPL_ELSE -->
-                <tr>
-                        <th scope="row">Serveur Z39.50</th>
-                        <td>
-                                <input type="text" name="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
-                        </td>
-                </tr>
+                <li>
+                        <label for="searchfield">Serveur Z39.50 : </label>
+                        
+                                <input type="text" name="searchfield" id="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
+                        
+                </li>
         <!-- /TMPL_IF -->
 
-               <tr>
-                       <th scope="row">Nom du serveur hôte</th>
-                       <td>
-                               <input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <th scope="row">Port</th>
-                       <td>
-                               <input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
-                       </td>
-               </tr>
-               <tr>
-                       <th scope="row">Base de données</th>
-                       <td>
-                               <input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <th scope="row">Identifiant utilisateur</th>
-                       <td>
-                               <input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <th scope="row">Mot de passe</th>
-                       <td>
-                               <input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
-                       </td>
-               </tr>
-               <tr>
-                       <th scope="row">Vérifié(recherché par défaut)</th>
-                       <td>
-                               <input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  </td></tr>
-               <tr>
-                       <th scope="row">Rang (ordre d'affichage)</th>
-                       <td>
-                               <input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
-                       </td>
-               </tr>
-                               <tr>
-                       <th scope="row">Syntaxe (Z39-50 peut envoyer<br />
-                        notices dans divers formats. En choisir un)</th>
-                       <td>
-                               <select name="syntax">
+               <li>
+                       <label for="host">Nom du serveur hôte : </label>
+                       
+                               <input type="text" name="host" id="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
+                       
+               </li>
+               <li>
+                       <label for="port">Port : </label>
+                       
+                               <input type="text" name="port" id="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
+                       
+               </li>
+               <li>
+                       <label for="db">Base de données : </label>
+                       
+                               <input type="text" name="db" id="db" value="<!-- TMPL_VAR NAME="db" -->" />
+                       
+               </li>
+               <li>
+                       <label for="userid">Identifiant : </label>
+                       
+                               <input type="text" name="userid" id="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
+                       
+               </li>
+               <li>
+                       <label for="password">Mot de passe :  </label>
+                       
+                               <input type="text" name="password" id="password" value="<!-- TMPL_VAR NAME="password" -->" />
+                       
+               </li>
+               <li>
+                       <label for="checked">Actif (recherché par défaut) </label>
+                       
+                               <input type="text" size="1" name="checked" id="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  </li>
+               <li>
+                       <label for="rank">Rang (ordre d'affichage) : </label>
+                       
+                               <input type="text" name="rank" id="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
+                       
+               </li>
+                               <li>
+                       <label for="syntax">Syntaxe (Z39-50 peut envoyer<br />
+                        notices dans divers formats. En choisir un) </label>
+                       
+                               <select name="syntax" id="syntax">
                                        <option value="USMARC">USMARC</option>
                                        <option value="UNIMARC">UNIMARC</option>
                                </select>
-                       </td>
-               </tr>
-        </table><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Valider modifications<!-- TMPL_ELSE -->Ajout serveur Z3950<!-- /TMPL_IF -->" onclick="Check(this.form)">  <input type="button" value="Annuler" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';">
+                       
+               </li></ol>
+        </fieldset><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Valider modifications<!-- TMPL_ELSE -->Ajout serveur Z3950<!-- /TMPL_IF -->" onclick="Check(this.form)"> 
         </form>
 <!-- /TMPL_IF -->
 
@@ -186,47 +186,47 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
        <!-- TMPL_VAR NAME="reqsel" --> <h3>Confirmer la suppression du serveur  <!-- TMPL_VAR NAME="searchfield" --></h3>      
-        <table>
-                <tr>
-                        <td>Site</td>
-                        <td>
+        <ul>
+                <li>
+                        <strong>Site : </strong>
+                        
                                 <!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-                <tr>
-                        <td>Nom du serveur hôte</td>
-                        <td><!-- TMPL_VAR NAME="host" --></td>
-                </tr>
-                <tr>
-                        <td>Port</td>
-                        <td><!-- TMPL_VAR NAME="port" --></td>
-                </tr>
-                <tr>
-                        <td>Base de données</td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                </tr>
-                <tr>
-                        <td>Identifiant utilisateur</td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                </tr>
-                <tr>
-                        <td>Mot de passe</td>
-                        <td><!-- TMPL_VAR NAME="password" --></td>
-                </tr>
-                <tr>
-                        <td>Contrôlé</td>
-                        <td><!-- TMPL_VAR NAME="checked" --></td>
-                </tr>
-                <tr>
-                        <td>Rang</td>
-                        <td><!-- TMPL_VAR NAME="rank" --></td>
-                </tr>
-                <tr>
-                        <td>                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        
+                </li>
+                <li>
+                        <strong>Nom du serveur hôte : </strong>
+                        <!-- TMPL_VAR NAME="host" -->
+                </li>
+                <li>
+                        <strong>Port : </strong>
+                        <!-- TMPL_VAR NAME="port" -->
+                </li>
+                <li>
+                        <strong>Base de données : </strong>
+                        <!-- TMPL_VAR NAME="db" -->
+                </li>
+                <li>
+                        <strong>Identifiant : </strong>
+                        <!-- TMPL_VAR NAME="userid" -->
+                </li>
+                <li>
+                        <strong>Mot de passe :  </strong>
+                        <!-- TMPL_VAR NAME="password" -->
+                </li>
+                <li>
+                        <strong>Actif : </strong>
+                        <!-- TMPL_VAR NAME="checked" -->
+                </li>
+                <li>
+                        <strong>Rang : </strong>
+                        <!-- TMPL_VAR NAME="rank" -->
+                </li>
+       </ul>
+                                        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                         <input type="hidden" name="op" value="delete_confirmed" />
-                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Supprimer ce serveur"></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Ne pas supprimer"></form></td>
-                </tr>
-       </table>
+                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Supprimer ce serveur"></form>  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Ne pas supprimer"></form>
+
+
 
 <!-- /TMPL_IF -->
 
@@ -265,8 +265,8 @@
                         <td><!-- TMPL_VAR NAME="checked" --></td>
                         <td><!-- TMPL_VAR NAME="rank" --></td>
                                                <td><!-- TMPL_VAR NAME="syntax" --></td>
-                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" value="Modifier"></form></td>
-                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" value="Supprimer"></form></td>                
+                        <td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Modifier</a></td>
+                        <td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Supprimer</a></td>                
                        </tr>
                 <!-- /TMPL_LOOP -->
        </table>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/auth.tmpl
index dd0ac9c..4c5bda0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/auth.tmpl
@@ -42,7 +42,7 @@
 <p><label>Mot de passe : <br />
 <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" /></label>
 </p>
-<p><label for="branch">Bibliothèque :<br />
+<p><label for="branch">Site :<br />
 <select name="branch" id="branch" class="input">
 <!-- TMPL_LOOP NAME="branchloop" -->
 <option value="<!-- TMPL_VAR NAME='branchcode' -->"><!-- TMPL_VAR NAME='branchname' --></option>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities-home.tmpl
index b642473..ae13429 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities-home.tmpl
@@ -1,10 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Autorités</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-
 <script language="JavaScript" type="text/javascript">
 function Help() {
     newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
@@ -20,12 +16,20 @@ function searchauthority() {
     window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
 }
 </script>
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="authorities-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; Autorités</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-g">
+       
+       <!-- TMPL_INCLUDE NAME="authorities-toolbar.inc" -->
 
 <fieldset id="authorities_authorities_home_search">
   <legend>Recherche autorité</legend>
@@ -81,7 +85,7 @@ function searchauthority() {
     <div id="action">
           <p><label>Trié par :</label><select name="orderby">
          <option value="">Aucun</option>
-           <option value="HeadingAsc">Vedette croissant</option>
+           <option value="HeadingAsc" selected="SELECTED">Vedette croissant</option>
            <option value="HeadingDsc">Vedette décroissant</option>
          </select>
       <input type="submit" value="Rechercher">
@@ -90,29 +94,9 @@ function searchauthority() {
   </form>
 </fieldset>
     
-<fieldset id="authorities_authorities_home_add">
-  <legend>Ajouter autorité</legend>
 
-  <form name="f2" method="post" action="authorities.pl">
-    <p><label for="add_authtypecode">Type d'autorité</label>
-        <select id="add_authtypecode" name="authtypecode">
-<!-- TMPL_LOOP name="authtypesloop" -->
-  <!-- TMPL_IF name="selected" -->
-        <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="authtypetext" --></option>
-  <!-- TMPL_ELSE -->
-        <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="authtypetext" --></option>
-  <!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-        </select>
-    </p>
-    <div id="action">
-      <input type="submit" value="Ajouter" class="button">
-    </div>
-  </form>
-</fieldset>
 
 </div>
 </div>
-</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities.tmpl
index c9a0a76..b81a934 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/authorities.tmpl
@@ -1,172 +1,352 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<Title>Koha -- Détails autorité</title>
+<title>Koha -- Détails autorité</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <script type="text/javascript">
-function active(numlayer)
-{
-       for (i=0; i < 10 ; i++ ) {
-               ong = i+"XX";
-               link = "link"+i;
-               if (numlayer==i) {
-                       document.getElementById(ong).style.visibility="visible";
-               } else {
-                       document.getElementById(ong).style.visibility="hidden";
-               }
-       }
+//<![CDATA[
+
+        $(document).ready(function() {
+               $('#authoritytabs').tabs();
+        });
+
+/**
+ * check if mandatory subfields are writed
+ */
+function AreMandatoriesNotOk(){
+    var mandatories = new Array();
+    var tab = new Array();
+    var label = new Array();
+    var flag=0;
+    <!-- TMPL_LOOP NAME='BIG_LOOP' --><!-- TMPL_LOOP NAME='innerloop' --><!-- TMPL_LOOP NAME='subfield_loop'--><!-- TMPL_IF NAME='mandatory'-->mandatories.push("<!-- TMPL_VAR NAME='id' -->");
+                        tab.push("<!-- TMPL_VAR NAME='number' -->");
+                        label.push("<!-- TMPL_VAR NAME='marc_lib' ESCAPE=JS-->");<!-- /TMPL_IF --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP -->
+    var StrAlert = _("Impossible d'enregistrer la notice, les champs suivants sont vides : \\n\\n");
+    for(var i=0,len=mandatories.length; i<len ; i++){
+        //alert (  mandatories[i]);
+        if( ! document.getElementById(mandatories[i]).value){
+            flag = 1;
+            document.getElementById(mandatories[i]).setAttribute('class','subfield_not_filled');
+            document.getElementById(mandatories[i]).focus();
+            StrAlert += "\t* "+label[i]+_(" dans l'onglet")+tab[i]+"\n";
+        }
+    }
+    if(flag){
+      return StrAlert;
+  } else {
+    return flag;
+  }
 }
-function Check(f) {
-       // Scan for nonempty fields
-       var field_is_nonempty_p = new Array();
-       for (i=0 ; i<f.field_value.length ; i++) {
-           field_is_nonempty_p[f.tag[i].value] = 0;
-       }
-       for (i=0 ; i<f.field_value.length ; i++) {
-           if (f.field_value[i].value.length != 0) {
-               field_is_nonempty_p[f.tag[i].value] += 1;
-           }
-       }
 
-       // Scan for missing mandatory subfields
-       var total_missing_mandatory_subfields = 0;
-       for (i=0 ; i<f.field_value.length-2 ; i++) {
-               if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
-                   // We should not flag an error unless the tag is also
-                   // mandatory, or if something else in the tag is entered
+/**
+ * 
+ * 
+ */
+function Check(){
+    var StrAlert = AreMandatoriesNotOk();
+    if( ! StrAlert ){
+        document.f.submit();
+        return true;
+    } else {
+        alert(StrAlert);
+        return false;
+    }
+}
 
-                   if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
-                       document.getElementById("error"+i).style.backgroundColor="#FF0000";
-                       total_missing_mandatory_subfields++;
-                   }
-               } else {
-                       document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
-               }
-       }
 
-       // Scan for missing mandatory tags
-       var total_missing_mandatory_tags = 0;
-       var seen_mandatory_tag_p = new Array();
-       for (i=0 ; i<f.field_value.length ; i++) {
-           var j = f.tag[i].value;
-           if (!field_is_nonempty_p[j] && f.tag_mandatory[i].value == 1) {
-               if (seen_mandatory_tag_p[j] != 1) {
-                   seen_mandatory_tag_p[j] = 1;
-                   total_missing_mandatory_tags++;
-               }
-               document.getElementById("error"+i).style.backgroundColor="#ffff00";
-           }
-       }
 
-       var total_errors = total_missing_mandatory_tags + total_missing_mandatory_subfields;
-       var alertString2;
-       if (total_errors!=0) {
-               alertString2  = _("Formulaire non soumis à cause du (des) problème(s) suivant(s)");
-               alertString2 += "\n------------------------------------------------------------------------------------\n";
-               alertString2 += "\n- "+ total_missing_mandatory_tags +_("Champ(s) obligatoire(s) non renseigné(s)");
-               alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires vides (voir les sous-champs en gras)");
-               alert(alertString2);
-       } else {
-               document.forms['f'].submit();
-       }
+
+function AddField(field,cntrepeatfield) {
+    document.forms['f'].op.value = "addfield";
+    document.forms['f'].addfield_field.value=field;
+    document.forms['f'].repeat_field.value=cntrepeatfield;
+    document.f.submit();
 }
+
 function Dopop(link,i) {
-       defaultvalue=document.forms['f'].field_value[i].value;
-       newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+    defaultvalue = document.getElementById(i).value;
+    window.open(link+"&result="+defaultvalue,"value builder",'width=700,height=550,toolbar=false,scrollbars=yes');
 }
 
-function PopupZ3950() {
-    var strQuery="";
-       for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
-               if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += "&isbn="+document.forms['f'].field_value[i].value;
-               }
-               if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += "&title="+document.forms['f'].field_value[i].value;
-               }
-               if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += "&author="+document.forms['f'].field_value[i].value;
-               }
-               if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += "&issn="+document.forms['f'].field_value[i].value;
-               }
-       }
-       newin=window.open("../z3950/search.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
+function ExpandField(index) {
+    var original = document.getElementById(index); //original <div>
+    var divs = original.getElementsByTagName('div');
+    for(var i=0,divslen = divs.length ; i<divslen ; i++){      // foreach div
+        if(divs[i].getAttribute("name") == 'line'){  // if it s a subfield
+            if (divs[i].style.display == 'block') {
+                divs[i].style.display = 'none';
+            } else {
+                divs[i].style.display = 'block';
+            }
+        }
+    }
 }
 
-function AddField(field,cntrepeatfield) {
-       document.forms['f'].op.value = "addfield";
-       document.forms['f'].addfield_field.value=field;
-       document.forms['f'].repeat_field.value=cntrepeatfield;
-       document.f.submit();
+/**
+ * To clone a field or a subfield by clickink on '+' button
+ */ 
+function CloneField(index) {
+    var original = document.getElementById(index); //original <div>
+    var clone = original.cloneNode(true);
+    var new_key = CreateKey();
+    var new_id  = original.getAttribute('id')+new_key;
+    
+    clone.setAttribute('id',new_id); // setting a new id for the parent div
+    
+    var divs = clone.getElementsByTagName('div');
+    
+    <!-- TMPL_UNLESS NAME='hide_marc'--> // No indicator if hide_marc
+        // setting a new name for the new indicator
+        var indicator = clone.getElementsByTagName('input')[0];
+        indicator.setAttribute('name',indicator.getAttribute('name')+new_key);
+    <!-- /TMPL_UNLESS -->
+        
+    // settings all subfields
+    for(var i=0,divslen = divs.length ; i<divslen ; i++){      // foreach div
+        if(divs[i].getAttribute("name") == 'line'){  // if it s a subfield
+            
+            // set the attribute for the new 'div' subfields
+            divs[i].setAttribute('id',divs[i].getAttribute('id')+new_key);
+            
+            var inputs   = divs[i].getElementsByTagName('input');
+            var id_input = "";
+            
+            inputs[0].setAttribute('id',inputs[0].getAttribute('id')+new_key);
+            inputs[0].setAttribute('name',inputs[0].getAttribute('name')+new_key);
+            var id_input;
+            try {
+              id_input = inputs[1].getAttribute('id')+new_key;
+                inputs[1].setAttribute('id',id_input);
+                inputs[1].setAttribute('name',inputs[1].getAttribute('name')+new_key);
+            } catch(e) {
+              try{ // it s a select if it is not an input
+                    var selects = divs[i].getElementsByTagName('select');
+                    id_input = selects[0].getAttribute('id')+new_key;
+                    selects[0].setAttribute('id',id_input);
+                    selects[0].setAttribute('name',selects[0].getAttribute('name')+new_key);
+                }catch(e2){ // it is a textarea if it s not a select or an input
+                  var textaeras = divs[i].getElementsByTagName('textarea');
+                  id_input = textaeras[0].getAttribute('id')+new_key;
+                  textaeras[0].setAttribute('id',id_input);
+                    textaeras[0].setAttribute('name',textaeras[0].getAttribute('name')+new_key);
+                }
+            }
+            
+            <!-- TMPL_UNLESS NAME='advancedMARCEditor'-->
+            // when cloning a subfield, re set its label too.
+            var labels = divs[i].getElementsByTagName('label');
+            labels[0].setAttribute('for',id_input);
+            <!-- /TMPL_UNLESS -->
+            
+            <!-- TMPL_UNLESS NAME='hide_marc'-->
+                // updating javascript parameters on button up
+                var imgs = divs[i].getElementsByTagName('img');
+                imgs[0].setAttribute('onclick',"upSubfield(\'"+divs[i].getAttribute('id')+"\');");
+            <!-- /TMPL_UNLESS -->
+            
+            // setting its '+' button
+            var CloneButtonPlus=0;
+            try {
+                CloneButtonPlus = divs[i].getElementsByTagName('span')[0];
+                if(CloneButtonPlus.getAttribute('class') == 'buttonPlus'){
+                    CloneButtonPlus.setAttribute('onclick',"CloneSubfield('" + divs[i].getAttribute('id') + "')");
+                } else {
+                    CloneButtonPlus = 0;
+                }
+            }
+            catch(e){
+                // do nothig if ButtonPlus & CloneButtonPlus don t exist.
+            }
+            
+            // button ...
+            var spans=0;
+            try {
+                spans = divs[i].getElementsByTagName('span');
+            } catch(e) {
+                // no spans
+            }
+            if(spans){
+                var buttonDot;
+                if(!CloneButtonPlus){ // it s impossible to have  + ... (buttonDot AND buttonPlus)
+                    buttonDot = spans[0];
+                    if(buttonDot){
+                        // 2 possibilities :
+                        try{
+                            var buttonDotOnClick = buttonDot.getAttribute('onclick');
+                            if(buttonDotOnClick.match('Clictag')){   // -1- It s a plugin
+                                var re = /\('.*'\)/i;
+                                buttonDotOnClick = buttonDotOnClick.replace(re,"('"+inputs[1].getAttribute('id')+"')");
+                                if(buttonDotOnClick){
+                                    buttonDot.setAttribute('onclick',buttonDotOnClick);
+                                }
+                            } else {
+                                if(buttonDotOnClick.match('Dopop')) {  // -2- It's a auth value
+                                    
+                                    var re1 = /&index=.*',/;
+                                    var re2 = /,.*\)/;
+
+                                    buttonDotOnClick = buttonDotOnClick.replace(re1,"&index="+inputs[1].getAttribute('id')+"',");
+                                    buttonDotOnClick = buttonDotOnClick.replace(re2,",'"+inputs[1].getAttribute('id')+"')");
+                                    
+                                    if(buttonDotOnClick){
+                                            buttonDot.setAttribute('onclick',buttonDotOnClick);
+                                    }
+                                }
+                            }
+                            try {
+                              // do not copy the script section.
+                              var script = spans[0].getElementsByTagName('script')[0];
+                              spans[0].removeChild(script);
+                            } catch(e) {
+                              // do nothing if there is no script
+                            }
+                      }catch(e){}
+                  }
+                }
+            }
+            <!-- TMPL_UNLESS NAME='hide_marc'-->
+                var buttonUp = divs[i].getElementsByTagName('img')[0];
+                buttonUp.setAttribute('onclick',"upSubfield('" + divs[i].getAttribute('id') + "')");
+            <!-- /TMPL_UNLESS -->
+            
+        } else { // it's a indicator div
+            if(divs[i].getAttribute('name') == 'div_indicator'){
+                var inputs = divs[i].getElementsByTagName('input');
+                inputs[0].setAttribute('id',inputs[0].getAttribute('id')+new_key);
+                
+                var CloneButtonPlus;
+                try {
+                    CloneButtonPlus = divs[i].getElementsByTagName('span')[1]; // 0 is the title
+                    CloneButtonPlus.setAttribute('onclick',"CloneField('" + divs[i].parentNode.getAttribute('id') + "')");
+                }
+                catch(e){
+                    // do nothig CloneButtonPlus doesn't exist.
+                }
+                
+                // setting its 'Expand' property
+                var ExpandFieldA=0;
+                try {
+                    ExpandFieldA = divs[i].getElementsByTagName('a')[0];
+                    ExpandFieldA.setAttribute('onclick',"ExpandField('" + divs[i].parentNode.getAttribute('id') + "')");
+                }
+                catch(e){
+                    // do nothig if ButtonPlus & CloneButtonPlus don t exist.
+                }
+                
+            }
+        }
+    }
+    
+    // insert this line on the page
+    original.parentNode.insertBefore(clone,original.nextSibling);
 }
 
-function cloneSubfield(index) {
+function CloneSubfield(index){
     var original = document.getElementById(index); //original <div>
     var clone = original.cloneNode(true);
-
+    var new_key = CreateKey();
+    var new_id  = original.getAttribute('id')+new_key;
+    
     // set the attribute for the new 'div' subfields
-    clone.setAttribute('id',index + index);//set another id.
-    var NumTabIndex;
-    NumTabIndex = parseInt(original.getAttribute('tabindex'));
-    if(isNaN(NumTabIndex)) NumTabIndex = 0;
-    clone.setAttribute('tabindex',NumTabIndex+1);
+    var inputs     = clone.getElementsByTagName('input');
+    var selects    = clone.getElementsByTagName('select');
+    var textareas  = clone.getElementsByTagName('textarea');
+        
+    // input
+    var id_input = "";
+    for(var i=0,len=inputs.length; i<len ; i++ ){
+        id_input = inputs[i].getAttribute('id')+new_key;
+        inputs[i].setAttribute('id',id_input);
+        inputs[i].setAttribute('name',inputs[i].getAttribute('name')+new_key);
+    }
+    
+    // select 
+    for(var i=0,len=selects.length; i<len ; i++ ){
+        id_input = selects[i].getAttribute('id')+new_key;
+        selects[i].setAttribute('id',selects[i].getAttribute('id')+new_key);
+        selects[i].setAttribute('name',selects[i].getAttribute('name')+new_key);
+    }
+    
+    // textarea
+    for(var i=0,len=textareas.length; i<len ; i++ ){
+        id_input = textareas[i].getAttribute('id')+new_key;
+        textareas[i].setAttribute('id',textareas[i].getAttribute('id')+new_key);
+        textareas[i].setAttribute('name',textareas[i].getAttribute('name')+new_key);
+    }
+    
+    <!-- TMPL_UNLESS NAME='advancedMARCEditor' -->
+    // when cloning a subfield, reset its label too.
+    var label = clone.getElementsByTagName('label')[0];
+    label.setAttribute('for',id_input);
+    <!-- /TMPL_UNLESS -->
+    
+    // setting a new if for the parent div
+    clone.setAttribute('id',new_id);
     
     var CloneButtonPlus;
-    try{
-        CloneButtonPlus = clone.getElementsByTagName('a')[0];
-        CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + index + "')");
+    try {
+      var spans = clone.getElementsByTagName('span');
+      if(spans.length){
+          for(var i = 0 ,lenspans = spans.length ; i < lenspans ; i++){
+            if(spans[i].getAttribute('class') == 'buttonPlus'){
+                    CloneButtonPlus = spans[i];
+                    CloneButtonPlus.setAttribute('onclick',"CloneSubfield('" + new_id + "')");
+                    var buttonUp = clone.getElementsByTagName('img')[0];
+                    buttonUp.setAttribute('onclick',"upSubfield('" + new_id + "')");
+                }
+            }
+        }
     }
     catch(e){
-        // do nothing if ButtonPlus & CloneButtonPlus don't exist.
+        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
     }
-
     // insert this line on the page
     original.parentNode.insertBefore(clone,original.nextSibling);
 }
 
-function upSubfield(index) {
-       try{
-               var line = document.getElementById(index); // get the line where the user has clicked.
-       } catch(e) {
-               return;
-       }
-       var tag = line.parentNode; // get the dad of this line. (should be "<div tag=XXX>")
-       
-       // getting all subfields for this tag
-       var subfields = tag.getElementsByTagName('div');
-       var subfieldsLength = subfields.length;
-       if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
-       // among all subfields 
-       for(var i=0;i<subfieldsLength;i++){ 
-               if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
-                       if(i==0){ // if the clicked subfield is on the top
-                               tag.appendChild(subfields[0]);
-                               return;
-                       }else{
-                               var lineAbove = subfields[i-1];
-                               tag.insertBefore(line,lineAbove);
-                               return;
-                       }
-               }
-       }
+/**
+ * This function create a random number
+ */
+function CreateKey(){
+    return parseInt(Math.random() * 100000);
 }
 
-function unHideSubfield(index,labelindex) {
-       subfield = document.getElementById(index);
-       subfield.style.display = 'block';
-       label = document.getElementById(labelindex);
-       label.style.display='none';     
+/**
+ * This function allows to move a subfield up by clickink on the 'up' button .
+ */
+function upSubfield(index) {
+    try{
+        var line = document.getElementById(index); // get the line where the user has clicked.
+    } catch(e) {
+        return; // this line doesn't exist...
+    }
+    var tag = line.parentNode; // get the dad of this line. (should be "<div id='tag_...'>")
+    
+    // getting all subfields for this tag
+    var subfields = tag.getElementsByTagName('div');
+    var subfieldsLength = subfields.length;
+    
+    if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
+    
+    // among all subfields 
+    for(var i=0;i<subfieldsLength;i++){ 
+        if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
+            if(i==1){ // if the clicked subfield is on the top
+                tag.appendChild(subfields[1]);
+                return;
+            } else {
+                var lineAbove = subfields[i-1];
+                tag.insertBefore(line,lineAbove);
+                return;
+            }
+        }
+    }
 }
 
-</script>
-
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-
-
-<script language="JavaScript" type="text/javascript">
-function Help() {
-    newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
+    subfield = document.getElementById(index);
+    subfield.style.display = 'block';
+    label = document.getElementById(labelindex);
+    label.style.display='none'; 
 }
 
 function addauthority() {
@@ -178,20 +358,32 @@ function searchauthority() {
     Y = document.forms[0].value.value;
     window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
 }
+//]]>
 </script>
+<style type="text/css">
+       #authoritytabs {
+               margin-top : 1em;
+               margin-bottom : 1em;
+       }
+</style>
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo;<a href="/cgi-bin/koha/authorities/authorities-home.pl">Autorités</a> &rsaquo; <!-- TMPL_IF name="authid" -->Modifier autorité N°<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- TMPL_ELSE -->Ajout autorité (<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF -->  </div>
+
+<div id="doc" class="yui-t7">
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+<div id="bd">
+        <div id="yui-main">
+        <div class="yui-g">
 
 <!-- TMPL_IF name="authid" -->
-  <h1>Modifier autorité N°<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
+<h1>Modifier autorité N°<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- TMPL_ELSE -->
-  <h1>Ajout autorité (<!-- TMPL_VAR name="authtypetext" -->)</h1>
+<h1>Ajout autorité (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- /TMPL_IF -->  
-  <form method="post" name="f">
+<form method="post" name="f" action="/cgi-bin/koha/authorities/authorities.pl">
     <input type="hidden" name="op" value="add" />
     <input type="hidden" name="addfield_field" value="" />
     <input type="hidden" name="repeat_field" value="" />
@@ -200,111 +392,170 @@ function searchauthority() {
 
     <div id="action">
 <!-- TMPL_IF name="authid" -->
-      <input type="button" value="Valider" onclick="Check(this.form)" accesskey="w">
+    <input type="button" value="Valider" onclick="Check(this.form)" accesskey="w">
 <!-- TMPL_ELSE -->
-      <input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w">
+    <input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w">
 <!-- /TMPL_IF -->
     </div>
 
 <!-- TMPL_IF name="duplicateauthid" -->
-       <div class="problem">
-               <p>Doublon suspecté avec <a href="javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1", "Duplicate Authority");" class="button"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
-               <p>Vous devez soit : </p>
-               <ul>
-                       <p><input type="checkbox" value="1" name="confirm_not_duplicate" />Confirmer que ce n'est pas un doublon (et cliquer sur <input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w" class="button"> encore)</p>
-                       <p>Aller à <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >l'autorité originale</a></p>
-               </ul>
-       </div>
+        <div class="problem">
+                <p>Doublon suspecté avec <a href="javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1", "Duplicate Authority");" class="button"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+                <p>Vous devez soit : </p>
+                <ul>
+                        <p><input type="checkbox" value="1" name="confirm_not_duplicate" />Confirmer que ce n'est pas un doublon (et cliquer sur <input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w" class="button"> encore)</p>
+                        <p>Aller à <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >l'autorité originale</a></p>
+                </ul>
+        </div>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_LOOP NAME="0XX" -->
-    <!-- TMPL_IF name="tag" -->
-        <p class="tag">
-            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->" />
-            <!-- TMPL_UNLESS name="hide_marc" -->
-                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a> <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat" /> -
+<div id="authoritytabs" class="toptabs numbered">
+       <ul> <!-- TMPL_LOOP name="BIG_LOOP" -->
+            <li><!-- TMPL_IF name="number" -->
+                <a href="/cgi-bin/authorities/authorties.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
             <!-- TMPL_ELSE -->
-                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->" />
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" -->
-                <a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden" value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" />
-            <!-- /TMPL_IF -->
-        </p>
-    <!-- /TMPL_IF -->
+                <a href="/cgi-bin/authorities/authorties.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
+            <!-- /TMPL_IF --></li>
+        <!--  /TMPL_LOOP --></ul>
 
-    <!-- TMPL_LOOP NAME="subfield_loop" -->
-        <p class="subfield">
-        <!-- TMPL_IF NAME="visibility" -->
-            <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-                <!-- TMPL_VAR NAME="subfield" -->
-            </a>
-        <!-- /TMPL_IF -->
-        <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
-            <p>
-            <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> 
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/../img/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')" />
-                    <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" disabled="disabled" readonly="readonly" tabindex="-1" />
+<!-- TMPL_LOOP name="BIG_LOOP" -->
+    <!-- hide every tab except the 1st -->
+            <!-- TMPL_IF name="number" -->
+                <div id="tab<!-- TMPL_VAR name="number" -->XX">
+            <!-- TMPL_ELSE -->
+                <div id="tab<!-- TMPL_VAR name="number" -->XX">
+            <!-- /TMPL_IF -->
+        
+        <!-- TMPL_LOOP NAME="innerloop" -->
+            <!-- TMPL_IF NAME="tag" -->
+                <div class="tag" id="tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->">
+                <div class="tag_title" name="div_indicator">
+                <!-- TMPL_UNLESS name="hide_marc" -->
+                    <span title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></span>
+                    <!-- TMPL_IF NAME="fixedfield" -->
+                    <input tabindex="1"
+                                class="indicator flat"
+                                type="text"
+                                style="display:none;"
+                                name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
+                                size="2"
+                                maxlength="2"
+                                value="<!-- TMPL_VAR NAME="indicator" -->" />
+                    <!-- TMPL_ELSE -->
+                    <input tabindex="1"
+                                class="indicator flat"
+                                type="text"
+                                name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
+                                size="2"
+                                maxlength="2"
+                                value="<!-- TMPL_VAR NAME="indicator" -->" />
+                    <!-- /TMPL_IF --> -
                 <!-- TMPL_ELSE -->
-                    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
+                    <!-- TMPL_IF NAME="fixedfield" -->
+                        <input tabindex="1"
+                            type="hidden"
+                            name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
+                            value="<!-- TMPL_VAR NAME="indicator" --><!-- TMPL_VAR name="random" -->" />
+                    <!-- TMPL_ELSE -->
+                        <input tabindex="1"
+                            type="hidden"
+                            name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
+                            value="<!-- TMPL_VAR NAME="indicator" --><!-- TMPL_VAR name="random" -->" />
+                    <!-- /TMPL_IF -->
                 <!-- /TMPL_UNLESS -->
+    
                 <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-                    <!-- TMPL_VAR NAME="marc_lib" -->
-                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-                    </label>
+                    <a onclick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')"><!-- TMPL_VAR NAME="tag_lib" --></a>
                 <!-- /TMPL_UNLESS -->
+                <!-- TMPL_IF name="repeatable" -->
+                    <span class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')">+</span>
+                <!-- /TMPL_IF -->
+                
+            </div>
+    
+            <!-- TMPL_LOOP NAME="subfield_loop" -->
+                <!--  One line on the marc editor -->
+                <div name="line" class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->">
+                
+                    <!--TMPL_UNLESS NAME="advancedMARCEditor" -->
+                    <label for="tag_<!-- TMPL_VAR NAME='tag'-->_subfield_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
+                            <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield" >
+                    <!-- /TMPL_UNLESS --> 
+                    
+                    <!-- TMPL_UNLESS name="hide_marc" -->
+                        <img class="buttonUp" style="display:none;" =<!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/../img/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')" alt="Remonter" title="Remonter">
+                            <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->"
+                                style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text"
+                                name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
+                                value="<!-- TMPL_VAR NAME="subfield" -->"
+                                size="1"
+                                maxlength="1"
+                                class="flat"
+                                tabindex="-1" />
+                    <!-- TMPL_ELSE -->
+                        <input type="hidden"
+                            name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
+                            value="<!-- TMPL_VAR NAME="subfield" -->"/>
+                    <!-- /TMPL_UNLESS -->
+                
+                    <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+                        <!-- TMPL_IF name="mandatory" --><span class="subfield_mandatory"><!-- /TMPL_IF -->
+                            <!-- TMPL_VAR NAME="marc_lib" -->
+                        <!-- TMPL_IF name="mandatory" --></span><!-- /TMPL_IF -->
+                        </label>
+                    <!-- /TMPL_UNLESS -->
+                    
                     <!-- TMPL_VAR NAME="marc_value" -->
+                    
                     <!-- TMPL_IF NAME="repeatable" -->
-                        <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
+                        <span class="buttonPlus" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')">+</span>
                     <!-- /TMPL_IF -->
-                    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
-                    <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1" />
-                    <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
-                    <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
-                    <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
-                </p>
+                    
+                </div>
+                <!-- End of the line -->
+                
+            <!-- /TMPL_LOOP -->
+            </div>
+            <!-- /TMPL_IF --><!-- tag -->
+        <!-- /TMPL_LOOP -->
+        </div>
+<!-- /TMPL_LOOP -->
+
+<!-- TMPL_UNLESS Name="singletab" -->
+    </div>     
+<!--/TMPL_UNLESS-->
 </div>
-    <!-- /TMPL_LOOP -->
 
+<div name="hidden" id="hidden" class="tab">
+<!-- TMPL_LOOP NAME="hidden_loop" -->
+    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
+    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
+    <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
+    <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
+    <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
 <!-- /TMPL_LOOP -->
-
-               <div name="hidden" id="hidden" class="tab">
-               <!-- TMPL_LOOP NAME="hidden_loop" -->
-                               <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
-                               <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
-                               <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
-                               <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
-                               <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
-               <!-- /TMPL_LOOP -->
-               </div>
-               <!-- TMPL_IF name="oldauthnumtagfield" -->
-                       <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthnumtagfield" -->" />
-                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->" />
-                       <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authid" -->" />
-                       <input type="hidden" name="mandatory" value="0" />
-                       <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
-                       <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
-                       <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthtypetagfield" -->" />
-                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->" />
-                       <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-               <!-- /TMPL_IF -->
-    <div id="action">
-<!-- TMPL_IF name="authid" -->
-      <input type="button" value="Valider" onclick="Check(this.form)" accesskey="w">
-<!-- TMPL_ELSE -->
-      <input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w">
+</div>
+<!-- TMPL_IF name="oldauthnumtagfield" -->
+    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthnumtagfield" -->" />
+    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->" />
+    <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authid" -->" />
+    <input type="hidden" name="mandatory" value="0" />
+    <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
+    <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
+    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthtypetagfield" -->" />
+    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->" />
+    <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
 <!-- /TMPL_IF -->
-    </div>
-       </form>
-</fieldset>
-
+<div id="action">
+    <!-- TMPL_IF name="authid" -->
+        <input type="button" value="Valider" onclick="Check(this.form)" accesskey="w">
+    <!-- TMPL_ELSE -->
+        <input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w">
+    <!-- /TMPL_IF -->
 </div>
+</form>
+</fieldset>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/blinddetail-biblio-search.tmpl
index 5f128ab..bdae45f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/blinddetail-biblio-search.tmpl
@@ -20,6 +20,9 @@
             if(subfields[i].getAttribute('name').match(re)){ // it s a subfield
                 var code     = subfields[i];   // code is the first input 
                 var subfield = subfields[i+1]; // subfield the second
+            <!-- TMPL_IF NAME="clear" -->
+                if (subfield){subfield.value="" ;}
+            <!--TMPL_ELSE-->      
                 if(code.value=='9'){
                         subfield.value = "<!-- TMPL_VAR NAME="authid" -->";
                 }
@@ -30,11 +33,12 @@
                     }
                 <!-- /TMPL_LOOP -->
             <!-- /TMPL_LOOP -->
+            <!--/TMPL_IF-->
             }
         }
-        
        opener.close();
                window.close();
+            
                return false;
     }
 </script>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/detail.tmpl
index f4770c3..2e6c073 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/authorities/detail.tmpl
@@ -3,6 +3,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 
+//<![CDATA[
+
+        $(document).ready(function() {
+               $('#authoritiestabs').tabs();
+        });
+
 function confirm_deletion() {
        var is_confirmed = confirm('Are you sure you want to delete this authority?');
        if (is_confirmed) {
@@ -98,46 +104,56 @@ function searchauthority() {
 <h1>Autorité  #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 
 <div id="action">
-<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Modifier</a>
-
-<!-- TMPL_UNLESS name="count" -->
-<a href="javascript:confirm_deletion()">Supprimer</a>
-<!-- /TMPL_UNLESS -->
-
-<a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button"><!-- TMPL_VAR name="count" --> notice(s)</a>
+    <a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Modifier</a>
+    
+    <!-- TMPL_UNLESS name="count" -->
+    <a href="javascript:confirm_deletion()">Supprimer</a>
+    <!-- /TMPL_UNLESS -->
+    
+    <a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button"><!-- TMPL_VAR name="count" --> notice(s)</a>
 </div>
 
-<div id="authorities_detail_details">
-<!-- TMPL_LOOP NAME="0XX" -->
-                <!-- TMPL_IF name="tag" -->
-                    <p class="tag">
-                        <!-- TMPL_VAR NAME="tag" -->
-                    </p>
-                <!-- TMPL_ELSE -->
-                    <br />
-                <!-- /TMPL_IF -->
-            <!-- TMPL_LOOP NAME="subfield" -->
-                <p>
-                    <label>&nbsp;
-                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
-                    <!-- TMPL_VAR NAME="marc_value" -->
-                    <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
-                        </a>
-                    <!-- /TMPL_IF -->
-                    <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Autor.</a>
-                    <!-- /TMPL_IF -->
-                </p>
-             <!-- /TMPL_LOOP -->
+<div id="authoritiestabs" class="toptabs numbered">
+    <ul>
+        <!-- TMPL_LOOP name="BIG_LOOP" -->
+            <li>
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
+            </li>
+        <!-- /TMPL_LOOP -->
+    </ul>
 
-<!-- /TMPL_LOOP --> <!-- tag -->
+<!-- TMPL_LOOP name="BIG_LOOP" -->
+    <div id="tab<!-- TMPL_VAR name="number" -->XX">
+    <!-- TMPL_LOOP NAME="innerloop" -->
+        <!-- TMPL_IF name="tag" -->
+            <div class="tag">
+            <div class="tag_title">
+                <!-- TMPL_VAR NAME="tag" -->
+            </div>
+        <!-- TMPL_ELSE -->
+            <div class="tag">
+        <!-- /TMPL_IF -->
+        <!-- TMPL_LOOP NAME="subfield" -->
+            <p>
+                <label class="labelsubfield">&nbsp;
+                <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
+                <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                <!-- TMPL_VAR NAME="marc_value" -->
+                <!-- TMPL_IF name="link" -->
+                    <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                        <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
+                    </a>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="authority" -->
+                    <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Autor.</a>
+                <!-- /TMPL_IF -->
+            </p>
+        <!-- /TMPL_LOOP -->
+        </div>
+    <!-- /TMPL_LOOP -->
+    </div>
+<!-- /TMPL_LOOP -->
 </div>
-       
-
-
 </div>
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/MARCdetail.tmpl
index ddc4931..688138f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/MARCdetail.tmpl
@@ -1,26 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue &rsaquo; Détails du catalogue MARC pour <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script language="JavaScript" type="text/javascript">
-function active(numlayer){
-    for (i=0; i <= 10 ; i++ ) {
-        var tab = document.getElementById(i+'XX');
-        if (numlayer==i) {
-            tab.setAttribute("class","content_visible");
-            var tabactive=document.getElementById('link'+i);
-            tabactive.removeAttribute("class");
-            tabactive.setAttribute("class","tab_active");
-        } else {
-            tab.setAttribute("class","content_hidden");
-            try {
-                var tabactive=document.getElementById('link'+i);
-                tabactive.removeAttribute("class");
-                tabactive.setAttribute("class","tab_inactive");
-            }
-            catch(e){};
-        }
-    }
-}
+<script type="text/javascript">
+
+//<![CDATA[
+
+        $(document).ready(function() {
+               $('#bibliotabs').tabs();
+        });
 
 function confirm_deletion(count) {
 
@@ -48,11 +35,7 @@ function Changefwk(FwkList) {
        window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
 }
 
-function Addbiblio(op) {
-       var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
-       window.location = "../cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
-}
-
+//]]>
 </script>
 </head>
 <body>
@@ -77,54 +60,56 @@ function Addbiblio(op) {
 
     <p><b>Avec la grille : <!--TMPL_VAR Name="framework" --></b></p>
     
-    <div id="tabs">
-        <!-- TMPL_IF NAME="0XX" -->
-            <a href="javascript:active(0)" class="tab_active" id="link0">0</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="1XX" -->
-            <a href="javascript:active(1)" class="tab_inactive" id="link1">1</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="2XX" -->
-            <a href="javascript:active(2)" class="tab_inactive" id="link2">2</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="3XX" -->
-            <a href="javascript:active(3)" class="tab_inactive" id="link3">3</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="4XX" -->
-            <a href="javascript:active(4)" class="tab_inactive" id="link4">4</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="5XX" -->
-            <a href="javascript:active(5)" class="tab_inactive" id="link5">5</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="6XX" -->
-            <a href="javascript:active(6)" class="tab_inactive" id="link6">6</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="7XX" -->
-            <a href="javascript:active(7)" class="tab_inactive" id="link7">7</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="8XX" -->
-            <a href="javascript:active(8)" class="tab_inactive" id="link8">8</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="9XX" -->
-            <a href="javascript:active(9)" class="tab_inactive" id="link9">9</a>
-        <!-- /TMPL_IF -->
-            <a href="javascript:active(10)" class="tab_inactive" id="link10">Exemplaires</a>
-    </div>
-
-    <div name="0XX" id="0XX" class="content_visible">
+<div id="bibliotabs" class="toptabs numbered">
+       <ul>
+            <!-- TMPL_IF name="0XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab0XX">0</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="1XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab1XX">1</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="2XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab2XX">2</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="3XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab3XX">3</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="4XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab4XX">4</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="5XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab5XX">5</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="6XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab6XX">6</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="7XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab7XX">7</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="8XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab8XX">8</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="9XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab9XX">9</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="10XX" -->
+                <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab10XX">Exemplaires(s)</a></li>
+            <!-- /TMPL_IF -->
+        </ul>
+    <div id="tab0XX">
         <!-- TMPL_LOOP NAME="0XX" -->
-                <!-- TMPL_IF name="tag" -->
-                       <div class="tag">
-                    <div class="tag_title">
-                        <!-- TMPL_VAR NAME="tag" -->
-                    </div>
-                <!-- TMPL_ELSE -->
-                    <div class="tag">
-                <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="tag" -->
+                <div class="tag">
+                <div class="tag_title">
+                    <!-- TMPL_VAR NAME="tag" -->
+                </div>
+            <!-- TMPL_ELSE -->
+                <div class="tag">
+            <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p class="subfield_line">
-                    <label class="labelsubfield">&nbsp;
-                    <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
@@ -137,12 +122,11 @@ function Addbiblio(op) {
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
-            </div>
             </div> <!-- class='tag' -->
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="1XX" class="content_hidden">
+    <div id="tab1XX">
         <!-- TMPL_LOOP NAME="1XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -154,7 +138,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -169,11 +153,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="2XX" class="content_hidden">
+    <div id="tab2XX">
         <!-- TMPL_LOOP NAME="2XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -185,7 +168,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -200,11 +183,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="3XX" class="content_hidden">
+    <div id="tab3XX">
         <!-- TMPL_LOOP NAME="3XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -216,7 +198,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -231,11 +213,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="4XX" class="content_hidden">
+    <div id="tab4XX">
         <!-- TMPL_LOOP NAME="4XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -247,7 +228,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -262,11 +243,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div  id="5XX" class="content_hidden">
+    <div  id="tab5XX">
         <!-- TMPL_LOOP NAME="5XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -278,7 +258,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -293,11 +273,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="6XX" class="content_hidden">
+    <div id="tab6XX">
         <!-- TMPL_LOOP NAME="6XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -309,7 +288,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -324,11 +303,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div  id="7XX" class="content_hidden">
+    <div  id="tab7XX">
         <!-- TMPL_LOOP NAME="7XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -340,7 +318,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -355,11 +333,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="8XX" class="content_hidden">
+    <div id="tab8XX">
         <!-- TMPL_LOOP NAME="8XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -371,7 +348,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -386,11 +363,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="9XX" class="content_hidden">
+    <div id="tab9XX">
         <!-- TMPL_LOOP NAME="9XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
@@ -402,7 +378,7 @@ function Addbiblio(op) {
                 <!-- /TMPL_IF -->
             <!-- TMPL_LOOP NAME="subfield" -->
                 <p>
-                    <label class="labelsubfield">&nbsp;
+                    <label>&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
@@ -417,11 +393,10 @@ function Addbiblio(op) {
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
-            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
-    <div id="10XX" class="content_hidden">
+    <div id="tab10XX">
         <table>
                 <tr>
                     <!-- TMPL_LOOP NAME="item_header_loop" -->
@@ -440,6 +415,7 @@ function Addbiblio(op) {
 
 </div>
 </div>
+</div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-menu.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/advsearch.tmpl
index 6ed71b5..184913e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/advsearch.tmpl
@@ -431,14 +431,15 @@
 <!-- AVAILABILITY LIMITS -->
     <fieldset><legend>Localisation et disponibilité :  </legend>
         <p>
-        <label>Bibliothèque</label><select name="limit" id="branchloop">
+        <label>Site</label><select name="limit" id="branchloop">
+        <option value="">Tous sites</option>
         <!-- TMPL_LOOP NAME="branchloop" -->
         <option value="<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
         <!-- /TMPL_LOOP -->
         </select>
         </p>
         <p>
-        <label for="available-items">Tous les documents actuellement disponibles</label><input type="checkbox" id="available-items" name="limit" value="Date de retour : 0000-00-00"></p>
+        <label for="available-items">Seulement les documents actuellement disponibles</label><input type="checkbox" id="available-items" name="limit" value="Date de retour : 0000-00-00"></p>
     </fieldset>
 <!-- /AVAILABILITY LIMITS -->
 
@@ -534,4 +535,4 @@
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/detail.tmpl
index 4fb1e77..0f8b6e8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/detail.tmpl
@@ -2,9 +2,9 @@
 <title>Koha &rsaquo; Catalogue &rsaquo; Détails pour <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- Core + Skin CSS -->
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/button/assets/skins/sam/button.css">
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/button/assets/skins/sam/button.css"/>
 <!-- OPTIONAL: Menu Stylesheet (required for creating buttons of type "menu" and "split") -->
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/menu/assets/skins/sam/menu.css">
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/menu/assets/skins/sam/menu.css"/>
 
 <!-- Dependencies -->
 <script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event.js"></script>
@@ -24,10 +24,10 @@ function Dopop(link) {
 function confirm_deletion(count) {
         var is_confirmed;
        if (count>0){
-                   is_confirmed= alert(_('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio'));
+                   is_confirmed= alert(_('There are [ '+ count +' ] item(s) attached to this record \n You must delete all items before deleting this record.'));
                    }
         else{
-                   is_confirmed= confirm(_('Êtes vous sûr de vouloir supprimer cette nogice?'));
+                   is_confirmed= confirm(_('Êtes vous sûr de vouloir supprimer cet exemplaire ?'));
        }
 
     
@@ -41,60 +41,51 @@ function confirm_deletion(count) {
                
     }
 }
-      // "contentready" event handler for the "toolbar" <div>
-        YAHOO.example.init = function () {
-      YAHOO.util.Event.onContentReady("toolbar", function () {
-                       var oAddbiblio = new YAHOO.widget.Button("addbiblio");
-            var oDeletebiblio = new YAHOO.widget.Button("deletebiblio");
-                       var oAddtoshelf = new YAHOO.widget.Button("addtoshelf");
-                       var oPrintbiblio = new YAHOO.widget.Button("printbiblio");
-                       var oPlacehold = new YAHOO.widget.Button("placehold");
-                       var oEditButton = new YAHOO.widget.Button("editbutton", { type: "menu", menu: "editbuttonselect" });
-                        });
-    } ();
-       
-//]]>
-</script>
-<style type="text/css">
-#toolbar {
-}
 
-#addbiblio a {
-       padding-left : 2.1em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -155px;
-       background-repeat : no-repeat;
-}
+// prepare DOM for YUI Toolbar
 
-#deletebiblio a {
-       padding-left : 2.1em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -188px;
-       background-repeat : no-repeat;
-}
+ $(document).ready(function() {
+       $("#edititems").parent().remove();
+       $("#duplicatebiblio").parent().remove();
+       $("#editmenucontainer").empty();
+       yuiToolbar();
+ });
 
-#printbiblio a {
-       padding-left : 2.1em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -243px;
-       background-repeat : no-repeat;
-}
+// YUI Toolbar Functions
 
-#addtoshelf a {
-       padding-left : 2.2em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -124px;
-       background-repeat : no-repeat;
-}
+       var editmenu = [
+            { text: "Edit Record", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=" },
+            { text: "Edit Items", url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
+            { text: "Edit as New (Duplicate)", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate" }
+        ];
+        
+        var oEditMenu = new YAHOO.widget.Button({
+                               type: "menu",
+                               label: "Edit",
+                               name: "editmenubutton",
+                               menu: editmenu,
+                               container: "editmenucontainer"
+                });   
 
-#placehold a {
-       padding-left : 2.2em;
-       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
-       background-position : 0 -215px;
-       background-repeat : no-repeat;
+function yuiToolbar(){
+        YAHOO.toolbar.init = function () {
+                    var oAddbiblio = new YAHOO.widget.Button("addbiblio");
+                    var oEditbiblio = new YAHOO.widget.Button("editbiblio");
+                    var oEdititems = new YAHOO.widget.Button("edititems");
+                    var oDuplicatebiblio = new YAHOO.widget.Button("duplicatebiblio");
+                    var oDeletebiblio = new YAHOO.widget.Button("deletebiblio");
+                    var oAddtoshelf = new YAHOO.widget.Button("addtoshelf");
+                    var oPrintbiblio = new YAHOO.widget.Button("printbiblio");
+                    <!-- TMPL_UNLESS name="bi_notforloan" -->
+                        var oPlacehold = new YAHOO.widget.Button("placehold");          
+                    <!-- /TMPL_UNLESS -->
+    } ();
 }
-</style>
+       
+//]]>
+</script>
 </head>
+
 <body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -131,7 +122,7 @@ function confirm_deletion(count) {
                
                <ul>
         <!-- TMPL_IF name="MARCAUTHORS" -->
-            <li><strong>Auteurs : </strong><ul>
+            <li><strong>Autres auteurs :</strong><ul>
                 <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
                 <li><a href="/cgi-bin/koha/catalogue/search.pl?q=Koha-Auth-Number:<!-- TMPL_VAR NAME="link" -->">
                     <!-- TMPL_VAR NAME="value" -->
@@ -160,9 +151,11 @@ function confirm_deletion(count) {
                </ul>
                </div>
                
-               <div class="yui-u">
-<!-- TMPL_IF NAME="AmazonContent" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Image de couverture"></a><!-- /TMPL_IF -->
-</div>
+<div class="yui-u"><!-- TMPL_IF NAME="AmazonContent" -->
+               <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Image de couverture"></a>
+<!-- TMPL_ELSE -->
+       <img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" border="0"/>
+<!-- /TMPL_IF --></div>
                
                <div class="yui-u">
                <ul>
@@ -245,16 +238,21 @@ function confirm_deletion(count) {
                     <td><!-- TMPL_IF name="datedue" -->
                             Prêté à : <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
                         <!-- TMPL_ELSE -->
-                            <!-- TMPL_IF name="notforloan" -->
-                                <!-- TMPL_VAR name="notforloan" -->
+                            <!-- TMPL_IF name="bi_notforloan" -->
+                                Type de document exclu du prêt
                             <!-- TMPL_ELSE -->
-                                <!-- TMPL_IF name="itemlost"-->
-                                    Exemplaire(s) perdu(s)
+                                <!-- TMPL_IF name="notforloan" -->
+                                    <!-- TMPL_VAR name="notforloan" -->
                                 <!-- TMPL_ELSE -->
-                                <!-- TMPL_IF NAME="wthdrawn" -->Exemplaire annulé<!-- TMPL_ELSE -->Disponible<!-- /TMPL_IF -->
+                                    <!-- TMPL_IF name="itemlost"-->
+                                        Exemplaire(s) perdu(s)
+                                    <!-- TMPL_ELSE -->
+                                    <!-- TMPL_IF NAME="wthdrawn" -->Exemplaire annulé<!-- TMPL_ELSE -->Disponible<!-- /TMPL_IF -->
+                                    <!-- /TMPL_IF -->
                                 <!-- /TMPL_IF -->
                             <!-- /TMPL_IF -->
-                        <!-- /TMPL_IF --></td>
+                        <!-- /TMPL_IF -->
+                        </td>
                     <td><!-- TMPL_VAR NAME="datedue" --></td>
                     <td><!-- TMPL_VAR NAME="datelastseen" --></td>
                     <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/issuehistory.tmpl
index 7896792..8157a27 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/issuehistory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/issuehistory.tmpl
@@ -26,14 +26,16 @@
             <tr><th>Date</th>
             <th>Nom de famille</th>
             <th>Prénom</th>
+            <th>Code à barres</th>
+            <th>Code site</th>
             <th>Site de prêt</th>
             <th>Renouvellement</th>
             <th>Date de retour</th>
             <th>Date de retour</th></tr>
         <!-- TMPL_LOOP NAME="issues" -->
             <tr>
-                <td><!-- TMPL_IF NAME="timestamp" -->
-                        <!-- TMPL_VAR NAME="timestamp" -->
+                <td><!-- TMPL_IF NAME="issuedate" -->
+                        <!-- TMPL_VAR NAME="issuedate" -->
                     <!-- TMPL_ELSE -->
                         &nbsp;
                     <!-- /TMPL_IF --></td>
@@ -49,6 +51,16 @@
                     <!-- TMPL_ELSE -->
                         &nbsp;
                     <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="barcode" -->
+                        <!-- TMPL_VAR NAME="barcode" -->
+                    <!-- TMPL_ELSE -->
+                        &nbsp;
+                    <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="branchcode" -->
+                        <!-- TMPL_VAR NAME="branchcode" -->
+                    <!-- TMPL_ELSE -->
+                        &nbsp;
+                    <!-- /TMPL_IF --></td>
                 <td><!-- TMPL_IF NAME="issuingbranch" -->
                         <!-- TMPL_VAR NAME="issuingbranch" -->
                     <!-- TMPL_ELSE -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/moredetail.tmpl
index f61a269..c7ecc31 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/moredetail.tmpl
@@ -17,63 +17,117 @@
 <!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
 
 <div id="catalogue_detail_biblio">
+
        <!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
-               <h2>
-                       <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra">
-                               <!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF -->
-                       </a>
-               </h2>
-               <p>
-               <p><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUPE - <!-- TMPL_VAR NAME="description" --> </p>
-               <p><b>Numéro de notice : </b> <!-- TMPL_VAR NAME="biblionumber" --></p>
-               <p><b>Type de document : </b> <!-- TMPL_VAR NAME="itemtype" --></p>
-               <p><b>URL : </b> <!-- TMPL_VAR NAME="url" --></p>
-               <p><b>Durée du prêt : </b> <!-- TMPL_VAR NAME="loanlength" --></p>
-               <p><b>Frais de location : </b> <!-- TMPL_VAR NAME="rentalcharge" --></p>
-               <p><b>Indexation : </b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --></p>
-               <p><b>ISBN : </b> <!-- TMPL_VAR NAME="isbn" --></p>
-               <p><b>Editeur : </b> <!-- TMPL_VAR NAME="publishercode" --> </p>
-               <p><b>Emplacement : </b> <!-- TMPL_VAR NAME="place" --></p>
-               <p><b>Date : </b> <!-- TMPL_VAR NAME="publicationyear" --></p>
-               <p><b>Epaisseur : </b> <!-- TMPL_VAR NAME="volumeddesc" --></p>
-               <p><b>Pages : </b> <!-- TMPL_VAR NAME="pages" --></p>
-               <p><b>Illus. : </b> <!-- TMPL_VAR NAME="illus" --></p>
-               <p><b>Format : </b> <!-- TMPL_VAR NAME="size" --></p>
-               <p><b>Remarques : </b> <!-- TMPL_VAR NAME="bnotes" --></p>
-               <p><b>N° d'exemplaires : </b> <!-- TMPL_VAR NAME="count" --></p>
-               <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modifier</a> |
-               <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Supprimer</a> |
-               <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Réservations</a>
-         <br />      
+               <h2><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->, par <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h2>
+       <ol class="bibliodetails">
+               <li><span class="label">Collection : </span><!-- TMPL_VAR NAME="description" --> </li>
+               <li><span class="label">Numéro de notice :</span> <!-- TMPL_VAR NAME="biblionumber" --></li>
+               <li><span class="label">Type de document : </span> <!-- TMPL_VAR NAME="itemtype" --></li>
+               <li><span class="label">URL : </span> <!-- TMPL_IF NAME="url" --><!-- TMPL_VAR NAME="url" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Durée du prêt :</span> <!-- TMPL_IF NAME="loanlength" --><!-- TMPL_VAR NAME="loanlength" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Coût du prêt :</span> <!-- TMPL_IF NAME="rentalcharge" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Classification :</span> <!-- TMPL_IF NAME="classification" --><!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">ISBN : </span> <!-- TMPL_IF NAME="isbn" --><!-- TMPL_VAR NAME="isbn" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Editeur : </span> <!-- TMPL_IF NAME="publishercode" --><!-- TMPL_VAR NAME="publishercode" --> </li><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+               <li><span class="label">Emplacement : </span> <!-- TMPL_IF NAME="place" --><!-- TMPL_VAR NAME="place" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Date : </span><!-- TMPL_IF NAME="publicationyear" --> <!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Volume : </span> <!-- TMPL_IF NAME="volumeddesc" --><!-- TMPL_VAR NAME="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Pages : </span> <!-- TMPL_IF NAME="pages" --><!-- TMPL_VAR NAME="pages" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Illustrateur :</span> <!-- TMPL_IF NAME="illus" --><!-- TMPL_VAR NAME="illus" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Taille : </span> <!-- TMPL_IF NAME="size" --><!-- TMPL_VAR NAME="size" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">Notes : </span> <!-- TMPL_IF NAME="bnotes" --><!-- TMPL_VAR NAME="bnotes" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+               <li><span class="label">N° d'exemplaires :</span> <!-- TMPL_VAR NAME="count" --></li></ol>
        <!-- /TMPL_LOOP -->
+       <br clear="all" />
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
-<h2>CODE A BARRES <!-- TMPL_VAR NAME="barcode" --></h2>
-       <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR
+<div class="yui-g">
+<h2>Code à barres <!-- TMPL_VAR NAME="barcode" --></h2>
+        <!-- TMPL_IF NAME="CAN_user_editcatalogue" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR
 NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modifier</a> |
-        <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Supprimer</a>
-       <br />
-       <b>Site d'origine : </b> <!-- TMPL_VAR NAME="homebranch" --><br />
-       <b>Site actuel : </b> <!-- TMPL_VAR NAME="holdingbranch" --><br />
-       <b>Vu pour la dernière fois le :  </b> <!-- TMPL_VAR NAME="datelastseen" --><br />
-       <b>Emprunté pour la dernière fois le : </b> <!-- TMPL_VAR NAME="datelastborrowed" --><br />
-       <b>Etat de l'exemplaire : </b> <!-- TMPL_IF NAME="issue" -->Prêté à : <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Disponible <!-- /TMPL_IF --><br />
-       <!-- TMPL_IF NAME="issue" --><b>Date de retour : </b> <!-- TMPL_VAR NAME="date_due" --><br /><!-- /TMPL_IF -->
-       <b>Dernier emprunteur 1 : </b> <!-- TMPL_VAR NAME="card0" --><br />
-       <b>Dernier emprunteur 2 : </b> <!-- TMPL_VAR NAME="card1" --><br />
-       <b>Prix de remplacement : </b> <!-- TMPL_VAR NAME="replacementprice" --><br />
-       <b>Exemplaire perdu : </b> <!-- TMPL_IF NAME="itemlost" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --><br />
-       <b>Réglé : </b> <!-- TMPL_VAR NAME="paidfor" --><br />
-       <b>Remarques : </b> <!-- TMPL_VAR NAME="itemnotes" --><br />
-       <b>Renouvellements : </b> <!-- TMPL_VAR NAME="renewals" --><br />
-       <b><a href="/cgi-bin/koha/acqui/orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">Date d'acquisition : </a></b> <!-- TMPL_VAR NAME="dateaccessioned" --><br />
-       <b>Annulé : </b> <!-- TMPL_IF NAME="wthdrawn" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --><br />
-       <b><a
-       href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Total des prêts : </a></b> <!-- TMPL_VAR NAME="issues" --><br />
-       <b>Numéro de groupe :</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br />
-       <b>Numéro de notice : </b> <!-- TMPL_VAR NAME="biblionumber" --> <br />
+        <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Supprimer</a><!-- /TMPL_IF -->
+       
+       
+               <ol class="bibliodetails">
+                       <li><span class="label">Bibliothèque</span> <!-- TMPL_VAR NAME="homebranch" --></li>
+                       <li><span class="label">Site actuel : </span> <!-- TMPL_VAR NAME="holdingbranch" --></li>
+                       <li><span class="label">Vu pour la dernière fois :</span> <!-- TMPL_VAR NAME="datelastseen" --></li>
+                       <li><span class="label">Emprunté pour la dernière fois le : </span> <!-- TMPL_IF NAME="datelastborrowed" --><!-- TMPL_VAR NAME="datelastborrowed" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+                       <li><span class="label">Etat de l'exemplaire : </span> <!-- TMPL_IF NAME="issue" -->Prêté à : <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Disponible <!-- /TMPL_IF --></li>
+                       <!-- TMPL_IF NAME="issue" --><li><span class="label">Date de retour :</span> <!-- TMPL_VAR NAME="date_due" --></li><!-- /TMPL_IF -->
+                       <li><span class="label">Dernier emprunteur 1 :</span> <!-- TMPL_IF NAME="card0" --><!-- TMPL_VAR NAME="card0" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+                       <li><span class="label">Dernier emprunteur 2 :</span> <!-- TMPL_IF NAME="card1" --><!-- TMPL_VAR NAME="card1" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+                       <li><span class="label">Prix de remplacement : </span> <!-- TMPL_IF NAME="replacementprice" --><!-- TMPL_VAR NAME="replacementprice" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+                       <li><span class="label">Etat de l'exemplaire</span><!-- TMPL_IF name="notforloantext" --><!-- TMPL_VAR name="notforloantext" --> <!-- /TMPL_IF --><!-- TMPL_IF name="itemlost"-->Exemplaire perdu<!-- /TMPL_IF --> <!-- TMPL_IF NAME="damaged" -->Document endommagé<!-- /TMPL_IF --> <!-- TMPL_IF NAME="wthdrawn" -->Exemplaire retiré<!-- /TMPL_IF --> &nbsp; </li>
+
+<li><span class="label">Statut document :</span>
+
+<form action="updateitem.pl" method="post">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
+<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" />
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
+<select name="damaged" >
+<!-- TMPL_LOOP NAME="itemdamagedloop" -->
+<!-- TMPL_IF NAME="selected" -->
+<option value="<!-- TMPL_VAR NAME="authorised_value" -->" selected="selected"><!-- TMPL_VAR NAME="lib" --></option>
+<!-- TMPL_ELSE -->
+<option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
+<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+</select>
+<input type="hidden" name="wthdrawn" value="<!-- TMPL_VAR NAME="wthdrawn" -->" />
+<input type="hidden" name="itemlost" value="<!-- TMPL_VAR NAME="itemlost" -->" />
+<input type="submit" name="submit" class="submit" value="Positionner statut"></form>
+</li>
+
+<li><span class="label">Etat de l'exemplaire :</span>
+
+<form action="updateitem.pl" method="post">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
+<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" />
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
+<select name="itemlost" >
+<!-- TMPL_LOOP NAME="itemlostloop" -->
+<!-- TMPL_IF NAME="selected" -->
+<option value="<!-- TMPL_VAR NAME="authorised_value" -->" selected="selected"><!-- TMPL_VAR NAME="lib" --></option>
+<!-- TMPL_ELSE -->
+<option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
+<!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
+</select>
+<input type="hidden" name="wthdrawn" value="<!-- TMPL_VAR NAME="wthdrawn" -->" />
+<input type="hidden" name="damaged" value="<!-- TMPL_VAR NAME="damaged" -->" />
+<input type="submit" name="submit" class="submit" value="Positionner statut"></form>
+</li>
+       <li><span class="label">Payé pour :</span> <!-- TMPL_IF NAME="" --><!-- TMPL_VAR NAME="paidfor" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+       <li><span class="label">Notes : </span> <!-- TMPL_IF NAME="" --><!-- TMPL_VAR NAME="itemnotes" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+       <li><span class="label">Renouvellements :</span> <!-- TMPL_IF NAME="" --><!-- TMPL_VAR NAME="renewals" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></li>
+       <li><span class="label"><a href="/cgi-bin/koha/acqui/orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&amp;catview=yes">Accédé le</a></span> <!-- TMPL_VAR NAME="dateaccessioned" --></li>
 
 
+<li><span class="label">Exemplaire retiré :</span><!-- TMPL_IF NAME="wthdrawn" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --> <form action="updateitem.pl" method="post">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
+<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" />
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
+<input type="hidden" name="itemlost" value="<!-- TMPL_VAR NAME="itemlost" -->" />
+<input type="hidden" name="damaged" value="<!-- TMPL_VAR NAME="damaged" -->" />
+
+<!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="wthdrawn" value="0" /><!-- TMPL_ELSE --><input type="hidden" name="wthdrawn" value="1" /><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="wthdrawn" -->
+    <input type="submit" name="submit" class="submit" value="Restorer">
+<!-- TMPL_ELSE -->
+    <input type="submit" name="submit" class="submit" value="Retirer exemplaire">
+<!-- /TMPL_IF -->
+</form></li>
+
+
+<li><span class="label">Nombre de prêts :</span><!-- TMPL_IF NAME="" --><!-- TMPL_VAR NAME="issues" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF -->  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Historique de circulation</a>)</li>
+       <li><span class="label">Numéro de groupe :</span> <!-- TMPL_VAR NAME="biblioitemnumber" --> </li>
+       <li><span class="label">Numéro de notice : </span> <!-- TMPL_VAR NAME="biblionumber" --> </li>
+</ol>
+</div>
+<!-- /TMPL_LOOP -->
+
 </div>
 
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/results.tmpl
index 72933c1..285e9d1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/catalogue/results.tmpl
@@ -260,6 +260,7 @@
                     <tr>
                         <th>&nbsp;</th>
                         <th>Titre</th>
+                        <th>Nombre de documents</th>
                         <th>Localisation</th>
                         <th>&nbsp;</th>
                     </tr>
@@ -322,29 +323,39 @@
                                 <!-- /TMPL_IF -->
                                 </td>
                                 <td>
+                                                    <!-- TMPL_IF NAME="items_count" -->
+                                                    <!-- TMPL_VAR NAME="items_count" -->
+                                                    <!-- /TMPL_IF -->
+                                                      
+                                </td>
+                                <td>
                                     <!-- TMPL_IF NAME="items_loop" -->
-                                        <span class="available">
+                                        
                                         <!-- TMPL_LOOP NAME="items_loop" -->
+                                        <!--TMPL_IF Name="unavailable"-->
+                                        <span class="unavailable">
+                                        <!--TMPL_ELSE-->
+                                        <span class="available">
+                                        <!--/TMPL_IF -->
+                                        
                                             <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchcode" -->
                                             <i>
                                         <!-- TMPL_IF name="location" --><!-- TMPL_VAR name="location" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR name="itemcallnumber" --><!-- /TMPL_IF -->
-                                         <!-- TMPL_IF name="classification" -->
-                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
-                                                <!-- TMPL_VAR NAME="classification" -->
+                                         <!-- TMPL_IF name="cn_class" -->
+                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="cn_class" ESCAPE="URL" -->">
+                                                <!-- TMPL_VAR NAME="cn_class" -->
                                             </a>
                                         <!-- /TMPL_IF -->
                                         </i>
+                                        <!-- TMPL_IF NAME="onloancount" -->En prêt jusqu'au <!-- TMPL_VAR NAME="due_date" --><!-- /TMPL_IF -->
+                                        <!-- TMPL_IF NAME="wthdrawncount" -->, Exemplaire retiré<!-- /TMPL_IF -->
+                                        <!-- TMPL_IF NAME="itemlostcount" -->, Perdu<!-- /TMPL_IF -->
+                                        <!-- TMPL_IF NAME="orderedcount" -->, En commande (<!-- TMPL_VAR NAME="orderedcount" -->)<!-- /TMPL_IF -->
                                          <br />
-                                        <!-- /TMPL_LOOP -->
                                         </span>
+                                        <!-- /TMPL_LOOP -->
                                     <!-- /TMPL_IF -->
-                                    <span class="unavailable">
-                                        <!-- TMPL_IF NAME="onloancount" --> En prêt (<!-- TMPL_VAR NAME="onloancount" -->)<br /> <!-- /TMPL_IF -->
-                                        <!-- TMPL_IF NAME="wthdrawncount" --> Exemplaire retiré (<!-- TMPL_VAR NAME="wthdrawncount" -->),<br /> <!-- /TMPL_IF -->
-                                        <!-- TMPL_IF NAME="itemlostcount" --> Perdu (<!-- TMPL_VAR NAME="itemlostcount" -->)<br /><!-- /TMPL_IF -->
-                                        <!-- TMPL_IF NAME="orderedcount" --> En commande (<!-- TMPL_VAR NAME="orderedcount" -->)<!-- /TMPL_IF -->
-                                    </span>
                                 </td>
                                 <td>
                                     <!-- TMPL_IF NAME="norequests" -->
@@ -387,4 +398,4 @@
 <!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbiblio.tmpl
index af89f2e..ff5aadf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbiblio.tmpl
@@ -3,42 +3,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
-function _(s) { return s } // dummy function for gettext
+
+        $(document).ready(function() {
+               $('#addbibliotabs').tabs();
+        });
 
 function confirmnotdup(){
-       document.getElementById("confirm_not_duplicate").value = 1;
-       alert(_("Vous avez confirmé que ce n'était pas un doublon. Cliquer sur "Ajouter notice" à nouveau pour enregistrer la saisie"));
-       var checkform = document.getElementById("f");
+       $("#confirm_not_duplicate").attr("value","1");
+       // alert(_("Not a duplicate confirmed. Please click on Add biblio to save the record"));
+       var checkform = $("#f");
        Check(checkform);
 }
 
-function active(numlayer){
-    for (i=0; i <= 10 ; i++ ) {
-       var tab;
-       try{
-               tab = document.getElementById(i+'XX');
-               tab.getAttribute('id'); // do not remove this line. It throws an execption.
-       }
-       catch(e){
-               continue;
-       }
-        if (numlayer==i) {
-            tab.setAttribute("class","content_visible");
-            var tabactive=document.getElementById('link'+i);
-            tabactive.removeAttribute("class");
-            tabactive.setAttribute("class","tab_active");
-        } else {
-            tab.setAttribute("class","content_hidden");
-            try {
-                var tabactive=document.getElementById('link'+i);
-                tabactive.removeAttribute("class");
-                tabactive.setAttribute("class","tab_inactive");
-            }
-            catch(e){};
-        }
-    }
-}
-
 /**
  * 
  * 
@@ -46,7 +22,7 @@ function active(numlayer){
 function Check(){
     var StrAlert = AreMandatoriesNotOk();
     if( ! StrAlert ){
-        document.f.submit;
+        document.f.submit();
         return true;
     } else {
         alert(StrAlert);
@@ -80,19 +56,37 @@ function AreMandatoriesNotOk(){
     var tab = new Array();
     var label = new Array();
     var flag=0;
+    var tabflag= new Array();  
     <!-- TMPL_LOOP NAME='BIG_LOOP' --><!-- TMPL_LOOP NAME='innerloop' --><!-- TMPL_LOOP NAME='subfield_loop'--><!-- TMPL_IF NAME='mandatory'-->mandatories.push("<!-- TMPL_VAR NAME='id' -->");
                        tab.push("<!-- TMPL_VAR NAME='number' -->");
                        label.push("<!-- TMPL_VAR NAME='marc_lib' -->");
                 <!-- /TMPL_IF --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP -->
     var StrAlert = _("Impossible d'enregistrer la notice, les champs suivants sont vides : \\n\\n");
     for(var i=0,len=mandatories.length; i<len ; i++){
+        var tag=mandatories[i].substr(4,3);
+        var subfield=mandatories[i].substr(17,1);
+        var tagnumber=mandatories[i].substr(19,mandatories[i].lastIndexOf("_")-19);
+        tabflag[tag+subfield+tagnumber]=new Array();
+        tabflag[tag+subfield+tagnumber][0]=0;
         if( ! document.getElementById(mandatories[i]).value){
-            flag = 1;
+            tabflag[tag+subfield+tagnumber][0] = 0 + tabflag[tag+subfield+tagnumber] ;
             document.getElementById(mandatories[i]).setAttribute('class','subfield_not_filled');
             document.getElementById(mandatories[i]).focus();
-            StrAlert += "\t* "+label[i]+_(" dans l'onglet")+tab[i]+"\n";
-        }
+            tabflag[tag+subfield+tagnumber][1]=label[i];
+            tabflag[tag+subfield+tagnumber][2]=tab[i];
+        } else {
+            tabflag[tag+subfield+tagnumber][0] = 1;
+        }    
     }
+    for (var tagsubfieldid in tabflag){
+      if (tabflag[tagsubfieldid][0]==0){
+        var tag=tagsubfieldid.substr(0,3);
+        var subfield=tagsubfieldid.substr(3,1);    
+        StrAlert += "\t* "+_("Champ")+tag+_("sous-champs")+subfield+" "+tabflag[tagsubfieldid][1]+_(" dans l'onglet")+tabflag[tagsubfieldid][2]+"\n";
+        //StrAlert += "\t* "+label[i]+_(" in tab ")+tab[i]+"\n"; 
+        flag=1;    
+      }   
+    }   
     if(flag){
            return StrAlert;
        } else {
@@ -146,11 +140,7 @@ function ExpandField(index) {
     var divs = original.getElementsByTagName('div');
     for(var i=0,divslen = divs.length ; i<divslen ; i++){      // foreach div
         if(divs[i].getAttribute("name") == 'line'){  // if it s a subfield
-            if (divs[i].style.display == 'block') {
-                divs[i].style.display = 'none';
-            } else {
-                divs[i].style.display = 'block';
-            }
+            $(divs[i]).toggle();
         }
     }
 }
@@ -423,13 +413,46 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 }
 //]]>
 </script>
+<style type="text/css">
+       #addbibliotabs { margin-top : 1em; }
+       a.buttonPlus {
+               font-weight : bold;
+               text-decoration : none;
+       }
+       a.expandfield {
+               color : #000;
+               text-decoration : none;
+       }
+</style>
 </head>
 <body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3">
-   <div id="bd">
+<div id="doc" class="yui-t7">
+
+<div id="bd">
+        <div id="yui-main">
+        <div class="yui-g">
+
+<h1><!-- TMPL_IF NAME="biblionumtagfield" -->Modifier la notice MARC numéro <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Ajout notice MARC<!-- /TMPL_IF --></h1>
+
+<!-- TMPL_UNLESS name="number" -->
+    <!-- show duplicate warning on tab 0 only -->
+        <!-- TMPL_IF name="duplicatebiblionumber" -->
+                    <div class="error">
+                        <h4>Dupliquer notice ?</h4>
+                        <p>Est-ce un doublon de <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&amp;popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
+                        <form action="/cgi-bin/koha/cataloguing/additem.pl" method="get">
+                            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="duplicatebiblionumber" -->" />
+                            <input type="submit" value="Oui, éditer exemplaire(s)">
+                        </form>
+                        <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get">
+                            <input type="submit" onclick="confirmnotdup(); return false;" value="Non : Enregistrer comme une nouvelle notice">
+                        </form>
+                    </div>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_UNLESS -->
 
 <!--TMPL_IF Name="done"-->
     <script type="text/javascript">
@@ -439,10 +462,9 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
     </script>
 <!--TMPL_ELSE-->
     <form method="post" name="f" id="f" action="/cgi-bin/koha/cataloguing/addbiblio.pl" onsubmit="return Check();">
+       <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
 <!-- /TMPL_IF -->
-
-<h1><!-- TMPL_IF NAME="biblionumtagfield" -->Modifier la notice MARC numéro <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Ajout notice MARC<!-- /TMPL_IF --></h1>
-
+       
 <div id="action">
     <!-- TMPL_IF name="biblionumber" -->
         <input type="submit" value="Ajouter notice bibliographique">
@@ -450,11 +472,9 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
         <input type="submit" value="Ajouter notice bibliographique">
     <!-- /TMPL_IF -->
     <input type="button" value="Recherche Z39.50" onclick="PopupZ3950(); return false;">
+       <label for="Frameworks">Changer la grille : </label><!--TMPL_VAR Name="framework" -->
+       <input type="hidden" name="op" value="addbiblio" />
 </div>
-<br />
- Avec la grille : <!--TMPL_VAR Name="framework" -->
-
-        <input type="hidden" name="op" value="addbiblio" />
 
 <!--TMPL_IF Name="popup"-->
         <input type="hidden" name="mode" value="popup" />
@@ -463,36 +483,23 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
         <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
         <input type="hidden" name="breedingid" value="<!-- TMPL_VAR NAME="breedingid" -->" />
 
-       <div id="tabs">
-        <!-- TMPL_LOOP name="BIG_LOOP" -->
-            <!-- TMPL_IF name="number" -->
-                <a href="javascript:active(<!-- TMPL_VAR name="number"-->)" class="tab_inactive" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+<div id="addbibliotabs" class="toptabs numbered">
+       <ul><!-- TMPL_LOOP name="BIG_LOOP" -->
+          <li>  <!-- TMPL_IF name="number" -->
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
             <!-- TMPL_ELSE -->
-                <a href="javascript:active(<!-- TMPL_VAR name="number"-->)" class="tab_active" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
-            <!-- /TMPL_IF -->
-        <!--  /TMPL_LOOP -->
-       </div>
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
+            <!-- /TMPL_IF --></li>
+        <!--  /TMPL_LOOP --></ul>
 
 <!-- TMPL_LOOP name="BIG_LOOP" -->
 <!-- hide every tab except the 1st -->
 <!-- TMPL_IF name="number" -->
-    <div id="<!-- TMPL_VAR name="number" -->XX" class="content_hidden">
+    <div id="tab<!-- TMPL_VAR name="number" -->XX">
 <!-- TMPL_ELSE -->
-    <div id="0XX" class="content_visible">
+    <div id="tab<!-- TMPL_VAR name="number" -->XX">
 <!-- /TMPL_IF -->
-<!-- TMPL_UNLESS name="number" -->
-    <!-- show duplicate warning on tab 0 only -->
-        <!-- TMPL_IF name="duplicatebiblionumber" -->
-                    <div class="error">
-                        <p class="problem">Est-ce un doublon de <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&amp;popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
-                        <p>Vous devez soit : </p>
-                        <ul>
-                            <li>Si c'est un doublon, <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->">Modifier les exemplaires</a>de la notice existante.</li>
-                            <li>Sinon, cliquez sur <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirmer que ce n'est pas un doublon</a></li>
-                        </ul>
-                    </div>
-        <!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
+
     
     <!-- TMPL_LOOP NAME="innerloop" -->
         <!-- TMPL_IF NAME="tag" -->
@@ -514,10 +521,10 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
             <!-- /TMPL_UNLESS -->
 
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                   <a onclick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')"><!-- TMPL_VAR NAME="tag_lib" --></a>
+                   <a href="#" class="expandfield" onclick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->'); return false;" title="Cliquer pour détailler ce champ"><!-- TMPL_VAR NAME="tag_lib" --></a>
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="repeatable" -->
-                <span class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')">+</span>
+                <a href="#" class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->'); return false;" title="Répéter ce champ">+</a>
             <!-- /TMPL_IF -->
             
         </div>
@@ -527,11 +534,11 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
             <div name="line" class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
             
                 <!--TMPL_UNLESS NAME="advancedMARCEditor" -->
-                <label for="tag_<!-- TMPL_VAR NAME='tag'-->_subfield_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield" >
+                    <label for="tag_<!-- TMPL_VAR NAME='tag'-->_subfield_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
                 <!-- /TMPL_UNLESS --> 
                 
                 <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->')" alt="" />
+                    <img class="buttonUp" style="display:none;" =<!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/../img/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->')" alt="Remonter" title="Remonter">
                         <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" tabindex="-1" />
                 <!-- TMPL_ELSE -->
                     <input type="hidden" name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" value="<!-- TMPL_VAR NAME="subfield" -->" />
@@ -563,5 +570,6 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 </form>
 
 </div>
+</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbooks.tmpl
index 0bc0226..d82d137 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/addbooks.tmpl
@@ -13,12 +13,10 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; Catalogage</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b">
-
        <!-- TMPL_IF name="noitemsfound" -->
                Pas d'exemplaire(s) trouvé(s)
        <!-- /TMPL_IF -->
@@ -159,8 +157,6 @@
     <!-- /TMPL_IF -->
 </div>
 <!-- /TMPL_IF -->
-
-</div>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem-nomarc.tmpl
index c799b3c..180d65d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem-nomarc.tmpl
@@ -55,7 +55,7 @@ Désolé, ce code à barres est déjà utilisé<!-- /TMPL_IF -->
 <caption>Ajouter un nouvel exemplaire</caption>
 <tr><th scope="row"><label for="barcode">Code à barres de l'exemplaire : </label></th><td><input type="text" id="barcode" name="barcode" size="40" /></td>
 </tr>
-<tr><th scope="row"><label for="homebranch">Bibliothèque :</label></th><td><select name="homebranch" id="branch">
+<tr><th scope="row"><label for="homebranch">Site :</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 -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem.tmpl
index a8deb42..a5ab32d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/additem.tmpl
@@ -3,7 +3,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
-function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
     for (i=10; i < 11 ; i++ ) {
@@ -52,6 +51,78 @@ function confirm_deletion(biblionumber,itemnumber) {
     window.location = "additem.pl?op=delitem&biblionumber="+biblionumber+"&itemnumber="+itemnumber;
     }
 }
+
+function CloneSubfield(index){
+    var original = document.getElementById(index); //original <div>
+    var clone = original.cloneNode(true);
+    var new_key = CreateKey();
+    var new_id  = original.getAttribute('id')+new_key;
+    
+    // set the attribute for the new 'div' subfields
+    var inputs     = clone.getElementsByTagName('input');
+    var selects    = clone.getElementsByTagName('select');
+    var textareas  = clone.getElementsByTagName('textarea');
+        
+    // input
+    var id_input = "";
+    for(var i=0,len=inputs.length; i<len ; i++ ){
+        id_input = inputs[i].getAttribute('id')+new_key;
+        inputs[i].setAttribute('id',id_input);
+        inputs[i].setAttribute('name',inputs[i].getAttribute('name')+new_key);
+    }
+    
+    // select 
+    for(var i=0,len=selects.length; i<len ; i++ ){
+        id_input = selects[i].getAttribute('id')+new_key;
+        selects[i].setAttribute('id',selects[i].getAttribute('id')+new_key);
+        selects[i].setAttribute('name',selects[i].getAttribute('name')+new_key);
+    }
+    
+    // textarea
+    for(var i=0,len=textareas.length; i<len ; i++ ){
+        id_input = textareas[i].getAttribute('id')+new_key;
+        textareas[i].setAttribute('id',textareas[i].getAttribute('id')+new_key);
+        textareas[i].setAttribute('name',textareas[i].getAttribute('name')+new_key);
+    }
+    
+    <!-- TMPL_UNLESS NAME='advancedMARCEditor' -->
+    // when cloning a subfield, reset its label too.
+    var label = clone.getElementsByTagName('label')[0];
+    label.setAttribute('for',id_input);
+    <!-- /TMPL_UNLESS -->
+    
+    // setting a new if for the parent div
+    clone.setAttribute('id',new_id);
+    
+    var CloneButtonPlus;
+    try {
+      var spans = clone.getElementsByTagName('span');
+      if(spans.length){
+          for(var i = 0 ,lenspans = spans.length ; i < lenspans ; i++){
+            if(spans[i].getAttribute('class') == 'buttonPlus'){
+                    CloneButtonPlus = spans[i];
+                    CloneButtonPlus.setAttribute('onclick',"CloneSubfield('" + new_id + "')");
+                    var buttonUp = clone.getElementsByTagName('img')[0];
+                    buttonUp.setAttribute('onclick',"upSubfield('" + new_id + "')");
+                }
+            }
+        }
+    }
+    catch(e){
+        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
+    }
+    // insert this line on the page
+    original.parentNode.insertBefore(clone,original.nextSibling);
+}
+
+/**
+ * This function create a random number
+ */
+function CreateKey(){
+    return parseInt(Math.random() * 100000);
+}
+
+
 //]]>
 </script>
 </head>
@@ -100,13 +171,18 @@ function confirm_deletion(biblionumber,itemnumber) {
         <h2>Modifier exemplaire</h2>
     <!-- /TMPL_IF -->  
         <!-- TMPL_LOOP NAME="item" -->
-            <p>
+               <div name="line" class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
+   
                 <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
                 <!-- TMPL_VAR NAME="marc_value" -->
                 <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
                 <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
-            </p>
+                <!-- TMPL_IF NAME="repeatable" -->
+                    <span class="buttonPlus" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->')">+</span>
+                <!-- /TMPL_IF -->
+   
+            </div>   
         <!-- /tmpl_loop -->
     <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
     <!-- TMPL_IF name="barcode_not_unique" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_006.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_006.tmpl
index e13c3e9..57e0179 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_006.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_006.tmpl
@@ -7,7 +7,7 @@
 <input type="hidden" name="plugin_name" value="marc21_field_006.pl">
 <table>
        <tr>
-               <td>0 Form of material</td>
+               <td>0 Forme document</td>
                 <td>
                         <select name="f0" size="1">
                         <!-- TMPL_IF name="f0a" -->
@@ -98,7 +98,7 @@
         <tr>
         <tr>
                 <!-- 06 Form of an item -->
-                <td>06- Form of an item</td>
+                <td>06- Forme document</td>
                 <td>
                 <select name="f6" size="1">
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_007.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_007.tmpl
index 48fea93..cf25f5d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_007.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_007.tmpl
@@ -19,7 +19,7 @@
                </td>
        </tr>
        <tr>
-                <td>01 Specific material designation</td>
+                <td>01 Désignation spécifique</td>
                 <td>
                         <select name="f1" size="1">
                         <!-- TMPL_IF name="f1a" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008.tmpl
index 5b55e50..d2fea37 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008.tmpl
@@ -13,7 +13,7 @@
        </tr>
        <tr>
                <!-- 06 Type of date / Publication status -->
-               <td>06- Type of date / Publication Status</td>
+               <td>06- Type de date / statut de publication</td>
                <td>
                        <!-- NO DATE; B.C. DATE -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
index 3e998f5..5e7b83f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
@@ -12,7 +12,7 @@
        </tr>
        <tr>
                <!-- 06 Type of date / Publication status -->
-               <td>06- Type of date / Publication Status</td>
+               <td>06- Type de date / statut de publication</td>
                <td>
                        <!-- NO DATE; B.C. DATE -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/bookcount.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/bookcount.tmpl
index fd8c8b9..db3ce3c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/bookcount.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Statistiques de prêt pour <!-- TMPL_VAR Name="title" --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Statistiques de prêt pour <!-- TMPL_VAR Name="title" --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -27,7 +27,7 @@
 </table>
 <table>
                        <tr>
-                               <th>Bibliothèque</th>
+                               <th>Site</th>
                                <th>Nombre de prêts</th>
                                <th>Vu pour la dernière fois </th>
                        </tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchoverdues.tmpl
index 3c6c8b5..03daac0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchoverdues.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Prêts en retard à <!-- TMPL_VAR NAME="LoginBranchname" --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Prêts en retard à <!-- TMPL_VAR NAME="LoginBranchname" --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -48,7 +48,7 @@
             <th>Date de retour</th>
             <th>Titre</th>
             <th>Adhérent</th>
-            <th>Bibliothèque</th>
+            <th>Site</th>
             <th>Statut en retard</th>
             <th>Notifier par</th>
         </tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchtransfers.tmpl
index a71bc8b..7689fd6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/branchtransfers.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Transferts</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transferts</div>
 
 <div id="doc3" class="yui-t2">
    

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/circulation-home.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/circulation-home.tmpl
new file mode 100644 (file)
index 0000000..848a8ae
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/circulation-home.tmpl
@@ -0,0 +1,47 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Circulation</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsquo; Circulation</div>
+
+<div id="doc" class="yui-t7">
+   
+   <div id="bd">
+       <div class="yui-g"> 
+
+<h1>Circulation</h1>
+
+<div class="yui-u first">      
+       <ul>
+               <li><a href="/cgi-bin/koha/circ/circulation.pl">Prêt</a></li>
+               <li><a href="/cgi-bin/koha/circ/returns.pl">Retours</a></li>
+               <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfert</a></li>
+       <!-- TMPL_UNLESS NAME="AutoLocation" -->
+           <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Définir un site</a></li>
+       <!-- /TMPL_UNLESS -->
+       </ul>
+       </div>
+
+       <div class="yui-u">
+       
+<h5>Statistiques de circulation</h5>
+<ul>
+       <li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="Réservations à mettre de coté">Réservations à traiter</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="Réservations mis de coté pour : %s">Réservations mises de coté</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/transferstodo.pl" title="Transferts à faire depuis votre site">Transferts à effectuer</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="Transferts en cours vers votre site">Transfert à recevoir</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/overdue.pl">Retards</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Amendes</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Etat de caisse quotidien</a></li>
+</ul>
+       
+       </div>
+
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/circulation.tmpl
index 313a2ea..8ba7e63 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/circulation.tmpl
@@ -18,7 +18,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo;<!-- TMPL_IF NAME="borrowernumber" --> <a href="/cgi-bin/koha/circ/circulation.pl">Prêts</a> &rsaquo; <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- TMPL_ELSE --> <strong>En prêt</strong><!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;<!-- TMPL_IF NAME="borrowernumber" --> <a href="/cgi-bin/koha/circ/circulation.pl">Prêts</a> &rsaquo; <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- TMPL_ELSE --> <strong>En prêt</strong><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -599,7 +599,7 @@ Pas d'adhérent trouvétéléphone enregistré. <span class="ex"><!-- TMPL_VAR n
 </fieldset>
 </form>
 
-<div id="patronlists">
+<div id="patronlists" class="toptabs">
 
 <ul>   
 <li>    <!--TMPL_IF NAME="issuecount"-->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/overdue.tmpl
index a79c565..c6c8096 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/overdue.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Statistiques &rsaquo; Retards au <!-- TMPL_VAR NAME="todaysdate" --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Statistiques &rsaquo; Retards au <!-- TMPL_VAR NAME="todaysdate" --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -15,6 +15,46 @@
        <div class="yui-b">
 
 <h2>Document(s) en retard au <!-- TMPL_VAR NAME="todaysdate" --></h2>
+  
+  <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
+  <div id="filters">Filtrer sur :<br />
+    Nom ou numéro de carte adhérent : <input type="text" name="borname" value="<!--TMPL_VAR Name="borname"-->"> Catégorie d'adhérent :<select name="borcat" id="borcat"><option value="">Tous</option>
+      <!-- TMPL_LOOP name="borcatloop" -->
+        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="catname" --></option>
+      <!-- /TMPL_LOOP -->
+      </select>
+      
+      
+    Indicateurs adhérents : <!--TMPL_VAR Name="CGIflags" --><br/>
+      Type de document :<select name="itemtype" id="itemtype"><option value="">Tous</option>
+      <!-- TMPL_LOOP name="itemtypeloop" -->
+        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemtypename" --></option>
+      <!-- /TMPL_LOOP -->
+      </select>
+    
+    
+    Site :<select name="branch" id="branch">
+        <option value="">Tous</option>
+      <!-- TMPL_LOOP name="branchloop" -->
+        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+      <!-- /TMPL_LOOP -->
+      </select><br/>
+    Vois tous les documents en prêt :<input type="checkbox" name="showall" value="afficher" checked="checked">
+    
+    
+    Trié par<select name="order" tabindex="0" size="1" id="order">
+<option <!--TMPL_UNLESS Name"order"-->selected<!-- /TMPL_UNLESS--> value="">Date de retour</option>
+<option  value="borrower">Adhérent</option>
+<option  value="title">Titre</option>
+<option  value="barcode">Code à barres</option>
+<option  value="date_due desc">Date de retour desc</option>
+<option  value="borrower desc">Adhérent desc</option>
+<option  value="title desc">Titre desc</option>
+<option  value="barcode desc">Code à barres</option>
+</select>
+      <input type="submit" value="Filtrer" class="button reports">
+   </div>   
+  </form>
 
 <div class="searchresults">
 <table>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/pendingreserves.tmpl
index b077db9..d2f8466 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/pendingreserves.tmpl
@@ -14,7 +14,7 @@
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Réservations à traiter</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Réservations à traiter</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -113,7 +113,7 @@ Calendar.setup(
         <th >Titre <a href="/cgi-bin/koha/circ/reserve.pl?order=biblio">trier</a>
         </th>
         <th>
-            Bibliothèque
+            Site
         </th>
     </tr>
     

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/returns.tmpl
index 80bf1d7..9e6069f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/returns.tmpl
@@ -7,7 +7,7 @@
 
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Prêts</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Prêts</div>
 
 <div id="doc3" class="yui-t2">
    

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/selectbranchprinter.tmpl
index f287605..70c37f3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/selectbranchprinter.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Sélectionner site</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Sélectionner site</div>
 
 <div id="doc3" class="yui-t2">
    

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/stats.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/stats.tmpl
index 697cb41..4bed649 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/stats.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Statistiques</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Statistiques</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -28,7 +28,7 @@
                        <th>Type</th>
                        <th>Date/heure</th>
                        <th>Montant</th>
-                       <th>Bibliothèque</th>
+                       <th>Site</th>
                <tr>
                <!-- TMPL_LOOP name="loop1" -->
                <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstodo.tmpl
index 5e8f844..81354c4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstodo.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Transferts à faire</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transferts à faire</div>
 
 <div id="doc3" class="yui-t2">
    

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstoreceive.tmpl
index eab6f71..757fc3b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/transferstoreceive.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Transferts vers votre site</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transferts vers votre site</div>
 
 <div id="doc3" class="yui-t2">
    

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/waitingreserves.tmpl
index da7388d..bcab7e0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/circ/waitingreserves.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> &rsaquo; Réservations mises de coté</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Accueil</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Réservations mises de coté</div>
 
 <div id="doc3" class="yui-t2">
    

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/labels/label-templates.tmpl
index 537a3f1..b2a9a88 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/labels/label-templates.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/labels/label-templates.tmpl
@@ -38,11 +38,11 @@
                                <a href="/cgi-bin/koha/labels/label-edit-template.pl?tmpl_id=<!-- TMPL_VAR NAME="tmpl_id" -->">Modifier</a>
         </td>
                <td>
-                               <a href="/cgi-bin/koha/labels/label-templates.pl?op=delete&tmpl_id=<!-- TMPL_VAR NAME="tmpl_id" -->">Supprimer</a>
+                               <a href="/cgi-bin/koha/labels/label-templates.pl?op=delete&amp;tmpl_id=<!-- TMPL_VAR NAME="tmpl_id" -->">Supprimer</a>
         </td>
                  <td>
 <!-- TMPL_IF NAME="active" -->
-    <input type="radio" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->" checked />
+    <input type="radio" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->" checked="checked" />
 <!-- TMPL_ELSE -->
     <input type="radio" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->" />
 <!-- /TMPL_IF -->
@@ -52,7 +52,7 @@
 <!-- /TMPL_LOOP -->
  <tr><td colspan="5" align="right">
  <input class="button" type="submit" value="Définir le modèle actif">
-        <input type="hidden" name=op value="set_active_template">
+        <input type="hidden" name="op" value="set_active_template" />
 </td></tr>
 </table>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/guarantor_search.tmpl
index e261803..bca2630 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/guarantor_search.tmpl
@@ -31,7 +31,7 @@
                <!-- TMPL_LOOP NAME="resultsloop" -->
                        <tr>
                                <td><!-- TMPL_VAR NAME="cardnumber" --></td>
-                               <td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.guarantorinfo.value='<!-- TMPL_VAR NAME="guarantorinfo" -->';self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
+                               <td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.contactname.value='<!-- TMPL_VAR NAME="surname" ESCAPE=JS -->';window.opener.document.form.contactfirstname.value='<!-- TMPL_VAR NAME="firstname" ESCAPE=JS -->';window.opener.document.form.address.value='<!-- TMPL_VAR NAME="address" ESCAPE=JS -->';window.opener.document.form.city.value='<!-- TMPL_VAR NAME="city" ESCAPE=JS -->';window.opener.document.form.zipcode.value='<!-- TMPL_VAR NAME="zipcode" ESCAPE=JS -->';self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
                                <td><b><!-- TMPL_VAR NAME="firstname" --></b></td> 
                                <td><!-- TMPL_VAR NAME="dateofbirth" --></td>
                                <td><p><!-- TMPL_VAR NAME="address" --> <!-- TMPL_VAR NAME="city" --></p></td>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/member.tmpl
index a3dd904..74966b1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/member.tmpl
@@ -31,10 +31,10 @@
 <div class="searchresults">
     <table>
     <tr>
-    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&orderby=cardnumber">Carte</a></th>
-    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&orderby=surname">Nom</a></th>
-    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&orderby=borrowers.categorycode">Catégorie</a></th>
-    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&orderby=branchcode">Site</a></th>
+    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=cardnumber">Carte</a></th>
+    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=surname">Nom</a></th>
+    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=borrowers.categorycode">Catégorie</a></th>
+    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=branchcode">Site</a></th>
     <th>Retards/Prêts</th>
     <th>Amendes</th>
     <th>Notes</th>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/memberentrygen.tmpl
index 25ab7cf..0d35bd8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/memberentrygen.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Adhérents Catalogue &rsaquo; <!-- TMPL_IF NAME="opadd" -->
-               Ajouter<!--TMPL_IF Name="I"--> Collectivités <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
-adhérent <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- TMPL_ELSE -->Modifier<!--TMPL_IF Name="I"--> Collectivités <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
+<title>Koha &rsaquo; Adhérents Catalogue &rsaquo; 
+<!-- TMPL_IF NAME="opadd" -->  Ajouter<!--TMPL_IF Name="I"--> Collectivité <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
+adhérent <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- TMPL_ELSE -->Modifier<!--TMPL_IF Name="I"--> Collectivité <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
 adhérent <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
@@ -11,9 +11,12 @@ adhérent <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/members/members-home.pl">Adhérents</a> &rsaquo; <!-- TMPL_IF NAME="opadd" -->
-               Ajouter<!--TMPL_IF Name="I"--> Collectivités <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
-adhérent <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- TMPL_ELSE --> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" --></a> &rsaquo; Modifier<!--TMPL_IF Name="I"--> Collectivités <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/members/members-home.pl">Adhérents</a> &rsaquo; 
+<!-- TMPL_IF NAME="opadd" -->
+               Ajouter<!--TMPL_IF Name="I"--> Collectivité <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
+adhérent <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
+<!-- TMPL_ELSE --> 
+<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" --></a> &rsaquo; Modifier<!--TMPL_IF Name="I"--> Collectivité <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adulte <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Enfant <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professionnel <!--/TMPL_IF -->
 adhérent <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
@@ -34,6 +37,7 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
 adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" --> 
        </h1>
        <!-- /TMPL_IF -->
+  
        <!-- TMPL_IF NAME="check_member" -->
                <p>
                <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post">
@@ -61,18 +65,17 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
       <!-- TMPL_IF NAME="ERROR_age_limitations" -->
               <div id="ERROR_age_limitations">Adhérent trop jeune ou trop vieux pour cette catégorie</div>
       <!-- /TMPL_IF -->
+   <!-- TMPL_IF NAME="ERROR_branch" -->
+              <div id="ERROR_branch">Le site choisi n'est pas autorisé</div>
+      <!-- /TMPL_IF -->   
                </div>
        <!-- /TMPL_IF -->
        
-  <!--TMPL_IF Name="allsteps"-->
-
-  <!--/TMPL_IF-->
   
 <form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 <!--    field always hidden in different form (1,2,3) -->
 <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
 <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
-<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
 <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
 <input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->" />
 <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
@@ -80,14 +83,12 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
 <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
+<!--TMPL_IF Name="step"--><input type="hidden" name="step"  value="<!-- TMPL_VAR NAME="step" -->" /><!--/TMPL_IF-->
 <!-- TMPL_IF NAME="opadd" --><input type="hidden" name="op" value="insert" /><!-- TMPL_ELSE --><input type="hidden" name="op" value="save" /><!-- /TMPL_IF -->
 
 <!--TMPL_IF Name="step_1"-->
-  <div id="step1" class="content_visible">
-  <!--TMPL_IF Name="I"-->
-  <input type="hidden" name="FormFieldList" value="surname|contactname|contactfirstname" /> <!--TMPL_ELSE--> <input type="hidden" name="FormFieldList" value="title|surname|firstname|dateofbirth|initials|othernames" />  <!--/TMPL_IF-->
        <fieldset class="rows" id="memberentry_identity">
-               <legend><!--TMPL_IF Name="I"-->Collectivités <!--TMPL_ELSE-->Adhérent <!--/TMPL_IF-->Identité personnelle</legend>
+               <legend><!--TMPL_IF Name="I"-->Collectivité <!--TMPL_ELSE-->Adhérent <!--/TMPL_IF-->Identité personnelle</legend>
                <ol>
                <li>
                <!-- TMPL_IF NAME="mandatorytitle" -->
@@ -158,7 +159,10 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                        Autres noms : </label>
                        <input type="text" id="othernames" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" />
                </li>
-               <li class="radio">
+    <!--TMPL_IF Name="I"-->
+        <input type="hidden" name="sex" value="N" />
+    <!--TMPL_ELSE-->
+               <li class="radio">  
                <!-- TMPL_IF NAME="female" -->
                                <label for="sex-female">Féminin </label><input type="radio" name="sex" id="sex-female" value="F" checked="checked" />
                                <label for="sex-male">Masculin </label><input type="radio" name="sex" id="sex-male" value="M" />
@@ -168,7 +172,8 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                <!-- /TMPL_IF -->
                </li>
                </ol>
-<!--TMPL_IF Name="C"-->  <p>
+    <!--/TMPL_IF-->
+<!--TMPL_IF EXPR="showguarantor"-->  <p>
   <input name="guarantordelete" type="button" value="Supprimer le garant" onclick="document.form.guarantorid.value='';document.form.guarantorinfo.value='',document.form.guarantorsearch.value='Find guarantor';">
   <!-- TMPL_IF NAME="guarantorid"-->  
     
@@ -176,7 +181,8 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
   <!-- TMPL_ELSE -->
     <input name="guarantorsearch" type="button" value="Rechercher un garant" onclick="Dopopguarantor('guarantor_search.pl');">
   <!-- /TMPL_IF -->
-  <input name="guarantorinfo" type="text"  size="20" value="<!-- TMPL_VAR NAME="guarantorinfo" -->" disabled="disabled" readonly="readonly" />
+  <input name="contactname" type="text"  size="20" value="<!-- TMPL_VAR NAME="contactname" -->" readonly="readonly" />
+  <input name="contactfirstname" type="text"  size="20" value="<!-- TMPL_VAR NAME="contactfirstname" -->"  readonly="readonly" />
   </p>       
 <!--/TMPL_IF-->       
        </fieldset>
@@ -328,16 +334,11 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
     </li>
        </ol>
   </fieldset>
-</div>
+
 
 <!-- ************************ STEP_1 *********************** -->
 <!--/TMPL_IF -->
 <!--TMPL_IF Name="step_2"-->
-<!--TMPL_IF Name="step_1"-->
-<div id="step2" class="content_hidden">
-<!--TMPL_ELSE-->
-<div id="step2" class="content_visible">
-<!--/TMPL_IF-->       
 
                <fieldset class="rows" id="memberentry_address">
                <legend>Autre adresse</legend><ol>
@@ -387,15 +388,9 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
        </fieldset>
        <!-- /TMPL_IF -->
   <!-- /TMPL_IF -->
-</div>
               
 <!-- /TMPL_IF -->
 <!--TMPL_IF Name="step_3"-->
-<!--TMPL_IF Name="step_1"-->
-<div id="step3" class="content_hidden">
-<!--TMPL_ELSE-->
-<div id="step3" class="content_visible">
-<!--/TMPL_IF-->       
 
   <fieldset class="rows" id="memberentry_library_management">
     <legend>Elements de gestion</legend><ol>
@@ -568,13 +563,12 @@ adhérent <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                        </ol>
                        </fieldset>
                <!-- /TMPL_UNLESS -->   
-</div>
 <!-- /TMPL_IF -->
     <fieldset class="action">
       <!-- TMPL_IF NAME="opadd" -->
-        <input type="button" name="step4" onclick="return check_form_borrowers(); unique();" value="Ajouter adhérent">
+        <input type="button" name="add" onclick="return check_form_borrowers(); unique();" value="Ajouter adhérent">
       <!-- TMPL_ELSE -->
-        <input type="button" name="step4" onclick="return check_form_borrowers();" value="Valider les modifications">
+        <input type="button" name="save" onclick="return check_form_borrowers();" value="Valider les modifications">
       <!--/TMPL_IF -->
     </fieldset>
 </form>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember-receipt.tmpl
index ec59f16..081abf7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember-receipt.tmpl
@@ -8,7 +8,7 @@
    
    <div id="bd">
 
-<h3>Bibliothèque</h3>
+<h3>Site</h3>
 <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br /><!-- /TMPL_IF -->
 Prêté à <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br />
 <!-- TMPL_VAR NAME="todaysdate" --><br />

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember.tmpl
index afd3d26..c3c710e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/members/moremember.tmpl
@@ -141,8 +141,8 @@ function confirm_reregistration() {
 
 </div>
  <div class="yui-u"> 
- <div id="patron-library-details" style="padding : .5em;"
- ><h3>Droit d'accès</h3>
+ <div id="patron-library-details" style="padding : .5em;">
+ <h3>Droit d'accès</h3>
  <ul>
     <li><strong>Numéro d'adhérent : </strong><!-- TMPL_VAR NAME="borrowernumber" --></li>
     <li><strong>Catégorie :  </strong><!-- TMPL_VAR NAME="description" --> (<!-- TMPL_VAR NAME="categorycode" -->)</li>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/reserve/request.tmpl
index 3275a0a..c723ec0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/reserve/request.tmpl
@@ -111,7 +111,7 @@ if (alreadyreserved > "0"){
                        <fieldset class="brief">
                        <label for="patron">Adhérent :  </label>
                                <div class="hint">(Entrer le n° de carte d'adhérent ou une partie du nom)</div>
-                <input type="text" size="20" id="patron" name="findborrower" /> 
+                <input type="text" size="20" id="patron" class="focus" name="findborrower" /> 
                 <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->" />
                 <input type="submit" value="Rechercher">
                        </fieldset>
@@ -234,7 +234,7 @@ if (alreadyreserved > "0"){
         <!-- /TMPL_IF -->
     
         <!-- TMPL_IF Name="transfertwhen" -->
-            Document en transfert de la bibliothèque de <!-- TMPL_VAR NAME="transfertfrom" -->, à : <!-- TMPL_VAR NAME="transfertto" -->, le : <!-- TMPL_VAR NAME="transfertwhen" -->
+            Document en transfert du site de <!-- TMPL_VAR NAME="transfertfrom" -->, à : <!-- TMPL_VAR NAME="transfertto" -->, le : <!-- TMPL_VAR NAME="transfertwhen" -->
         <!-- /TMPL_IF -->
             </td>
             <td>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/acqui-search-result.tmpl
index 1b0699a..241c305 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/acqui-search-result.tmpl
@@ -29,7 +29,7 @@ function GetIt(aqbooksellerid,name)
        <!-- TMPL_LOOP name="loop_suppliers" -->
                <tr>
                        <td><!-- TMPL_VAR name="name" --></td>
-                       <td><a href="#" onclick="GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Le choisir !</a></td>
+                       <td><a href="#" onclick="GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Choisir</a></td>
                </tr>
        <!-- /TMPL_LOOP -->
 </table>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/serials-home.tmpl
index 31373cc..868ab2f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/serials-home.tmpl
@@ -13,7 +13,8 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-
+       <!-- TMPL_INCLUDE NAME="serials-toolbar.inc" -->
+       
 <!--TMPL_IF Name="information"-->
 Abonnement(s) mis à jour :
 <table>
@@ -86,8 +87,7 @@ Abonnement(s) mis à jour :
                 <!-- TMPL_ELSE -->
                     <td>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_IF name="issn" -->
-                    <a href="/cgi-bin/koha/serials/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="Historique des n° parus"><!-- TMPL_VAR name="issn" --></a>
+                <!-- TMPL_IF name="issn" --><!-- TMPL_VAR name="issn" -->
                 <!-- /TMPL_IF -->
                 </td>
                 <!-- TMPL_IF name="toggle" -->
@@ -95,11 +95,11 @@ Abonnement(s) mis à jour :
                 <!-- TMPL_ELSE -->
                     <td>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_IF name="title" -->
-                    <!-- TMPL_VAR name="title" -->
-                <!-- TMPL_ELSE -->
-                    |
-                <!-- /TMPL_IF -->
+                
+                    <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button" title="Détail de l'abonnement"><!-- TMPL_IF name="title" --><!-- TMPL_VAR name="title" --><!-- TMPL_ELSE -->
+                    ---
+                <!-- /TMPL_IF --></a>
+                
                 </td>
                 <!-- TMPL_IF name="toggle" -->
                     <td class="hilighted">
@@ -115,6 +115,13 @@ Abonnement(s) mis à jour :
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="branchcode" --><!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF -->
                 </td>
+                  <!-- TMPL_IF name="toggle" -->
+                        <td class="hilighted">
+                    <!-- TMPL_ELSE -->
+                        <td>
+                    <!-- /TMPL_IF -->
+                                               <a href="/cgi-bin/koha/serials/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Etat de collection</a>
+                                       </td>
                 <!-- TMPL_IF NAME="routing" -->
                     <!-- TMPL_IF name="toggle" -->
                         <td class="hilighted">
@@ -129,13 +136,6 @@ Abonnement(s) mis à jour :
                 <!-- TMPL_ELSE -->
                     <td>
                 <!-- /TMPL_IF -->
-                    <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button" title="Détail de l'abonnement">Détail</a>
-                </td>
-                <!-- TMPL_IF name="toggle" -->
-                    <td class="hilighted">
-                <!-- TMPL_ELSE -->
-                    <td>
-                <!-- /TMPL_IF -->
                   <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Bulletinage</a>
                 </td>
             </tr>
@@ -143,14 +143,7 @@ Abonnement(s) mis à jour :
     </table>
     
         <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="routing" -->
-    <!-- TMPL_ELSE -->
-       <div id="action">
-            <a href="/cgi-bin/koha/serials/subscription-add.pl" class="button">
-                Ajouter un abonnement
-            </a>
-        </div>
-    <!-- /TMPL_IF -->
+
 </div>
 </div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-add.tmpl
index 720a292..1887c74 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-add.tmpl
@@ -5,7 +5,6 @@
 
 <script type="text/javascript">
 <!--
-function _(s) { return s } // dummy function for gettext
 
 // the english words used in display purposes
 var text = new Array(_('Numéro'),_('Volume'),_('Prêt'),_('Mois'),_('Semaine'),_('Commence par : '),_('Retour à : '),_('Choisir hémisphère : '),_('Nord'),_('Sud'),
@@ -314,15 +313,15 @@ document.getElementById("more_options").innerHTML = '';
 var textbox = '';
     // alert("X: "+x+"Y: "+y+"Z: "+z);
     if(x){
-        textbox +="<table>\n<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
+        textbox +="<table>\n<tr><th>&nbsp;<\/th><th>"+x+"<\/th>";
         if(y){
-            textbox +="<td>"+y+"<\/td>";
+            textbox +="<th>"+y+"<\/th>";
             if(z){
-                textbox +="<td>"+z+"<\/td>";
+                textbox +="<th>"+z+"<\/th>";
             }
         }
         textbox +="<\/tr>\n";
-        textbox +="<tr><td>"+text[5]+"<\/td><td><input type='text' name='lastvaluetemp1' size='4' onkeyup='moreoptionsupdate(\"lastvalue1\")' value=" + document.f.lastvalue1.value +" /><\/td>\n";
+        textbox +="<tr><th scope=\"row\">"+text[5]+"<\/td><td><input type='text' name='lastvaluetemp1' size='4' onkeyup='moreoptionsupdate(\"lastvalue1\")' value=" + document.f.lastvalue1.value +" /><\/td>\n";
         if(y){
             textbox +="<td><input type='text' name='lastvaluetemp2' size='4' onkeyup='moreoptionsupdate(\"lastvalue2\")' value=" + document.f.lastvalue2.value + " /><\/td>\n";
             if(z){
@@ -331,7 +330,7 @@ var textbox = '';
         }
         textbox +="<\/tr>\n";
         if(y){
-            textbox +="<tr><td>"+text[6]+"<\/td>";
+            textbox +="<tr><th scope=\"row\">"+text[6]+"<\/th>";
             textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irrégularité ? ')+"<\/a><\/td>\n";
             textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
             if(z){
@@ -380,7 +379,7 @@ var textbox = '';
     // alert("X: "+x+"Year: "+y);
     if(x){
         var hemi_select = parseInt('<!-- TMPL_VAR NAME="hemisphere" -->');
-        textbox +="<table>\n<tr><td>"+ text[7]  +"<\/td><td colspan='2'><select name='hemisphere' onchange='hemispheres(this.options[this.selectedIndex].value)'>";
+        textbox +="<li><label for=\"hemisphere\">"+ text[7]  +"<\/label><select name='hemisphere' id=\"hemisphere\" onchange='hemispheres(this.options[this.selectedIndex].value)'>";
         for(var i = 1; i <= 2; i++){
             textbox +="<option value='"+i+"'";
             if(i == hemi_select){
@@ -388,11 +387,11 @@ var textbox = '';
             }
             textbox +=">"+text[i+7]+"<\/option>";
         }
-        textbox +="<\/select><\/td><\/tr>\n";
-        textbox +="<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
-        textbox +="<td>"+text[16]+"<\/td>";
+        textbox +="<\/li>\n";
+        textbox +="<table><tr><th>&nbsp;<\/th><th>"+x+"<\/th>";
+        textbox +="<th>"+text[16]+"<\/th>";
         textbox +="<\/tr>\n";
-        textbox +="<tr><td>"+text[5]+"<\/td><td><select name='lastvaluetemp2' id='season1' onchange='moreoptionsupdate(\"lastvalue2\")'>";
+        textbox +="<tr><th scope=\"row\">"+text[5]+"<\/th><td><select name='lastvaluetemp2' id='season1' onchange='moreoptionsupdate(\"lastvalue2\")'>";
         for(var j = 1; j <= 4; j++){
             textbox +="<option value='"+j+"'>"+text[j+10]+"<\/option>";
         }
@@ -401,7 +400,7 @@ var textbox = '';
             textbox +="<option value='"+k+"'>"+k+"<\/option>";
         }
         textbox +="<\/select><\/td><\/tr>\n";
-        textbox +="<tr><td>"+text[6]+"<\/td>";
+        textbox +="<tr><th scope=\"row\">"+text[6]+"<\/th>";
         textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irrégularité ? ')+"<\/a><\/td>\n";
         textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
                 textbox +="<\/tr><\/table>\n";
@@ -736,9 +735,10 @@ function check_input(e){
     }
 }
 
-function Create_biblio(f)
-{
-   window.open('/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup','FindABibIndex','width=1024,height=768,toolbar=no,scrollbars=yes');
+function addbiblioPopup(biblionumber) {
+       var destination = "/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup";
+       if(biblionumber){ destination += "&biblionumber="+biblionumber; }
+ window.open(destination,'AddBiblioPopup','width=1024,height=768,toolbar=no,scrollbars=yes');
 }
 
 function Plugin(f)
@@ -792,13 +792,10 @@ window.onload = irregular_order();
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl"> Accueil </a> &rsaquo;<a href="/cgi-bin/koha/serials/subscription-add.pl">Périodiques</a> &rsaquo;  <!-- TMPL_IF name="mod" --> Modifier un abonnement<!-- TMPL_ELSE -->Ajouter un abonnement<!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc3" class="yui-t7">
    
    <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
-
-
+   <div class="yui-g">
 
 <!-- TMPL_IF name="mod" -->
     <h1>Modifier un abonnement</h1>
@@ -814,31 +811,33 @@ window.onload = irregular_order();
 <input type="hidden" name="irreg_check" value="0" />
 <input type="hidden" name="issuesexpected1" value="0" />
 
-    <h2>État de collection pour <!--TMPL_VAR name="subscriptionid"--></h2>
-    <table>
-        <tr>
-            <td>Bibliothécaire : </td>
-            <td><!-- TMPL_VAR name="loggedinusername" --></td>
-        </tr>
-        <tr>
-            <td><label>Fournisseur : </label></td>
-            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <a href="#" onclick="FindAcqui(f)">Rechercher fournisseur</a></td>
-        </tr>
-        <tr>
-            <td><label>Notice bibliographique</label></td>
-            <td>
-                <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <a href="#" onclick="Plugin(f)">Rechercher notice biblio</a> <!--TMPL_UNLESS Name="mod"--> |
-                <a href="#" onclick="Create_biblio(f)">Créer une notice</a><!--/TMPL_UNLESS-->
-            </td>
-        </tr>
-        <tr>
-            <td><label>Cote</label></td>
-            <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20" /></td>
-        </tr>
-        <tr>
-            <td>Site</td>
-            <td>
-                <select name="branchcode">
+       <div class="yui-u first">
+    <fieldset id="subscription_add_information" class="rows">
+       <legend>État de collection pour <!--TMPL_VAR name="subscriptionid"--></legend>
+       <ol>
+        <li>
+            <span class="label">Bibliothécaire :  </span>            <!-- TMPL_VAR name="loggedinusername" -->
+        </li>
+        <li>
+            <label for="aqbooksellerid">Fournisseur : </label>
+            <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <div class="inputnote"><a href="#" onclick="FindAcqui(f)">Rechercher fournisseur</a></div>
+        </li>
+        <li>
+            <label for="biblionumber">Notice bibliographique</label>
+            
+                <input type="text" name="biblionumber" id="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8" />  (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />)
+               <div class="inputnote"> <a href="#" onclick="Plugin(f)">Rechercher la notice</a> | <!--TMPL_IF Name="mod"--><a href="#" onclick="addbiblioPopup(<!-- TMPL_VAR NAME="biblionumber" -->); return false;">Editer notice</a><!-- TMPL_ELSE -->
+                <a href="#" onclick="addbiblioPopup(); return false;">Créer une notice</a><!--/TMPL_IF--></div>
+            
+        </li>
+        <li>
+            <label for="callnumber">Cote</label>
+            <input type="text" name="callnumber" id="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20" />
+        </li>
+        <li>
+            <label for="branchcode">Site</label>
+            
+                <select name="branchcode" id="branchcode">
                     <option value="">Tout site</option>
                     <!-- TMPL_LOOP name="branchloop" --><!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
                                <!-- TMPL_ELSE -->
@@ -846,20 +845,20 @@ window.onload = irregular_order();
                                <!-- /TMPL_IF -->
                     <!-- /TMPL_LOOP -->
                 </select> (Sélectionnez un site)
-            </td>
-        </tr>
-        <tr>
-            <td><label>Notes</label></td>
-            <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td>
-        </tr>
-        <tr>
-            <td><label>Notes internes</label></td>
-            <td><textarea name="internalnotes" cols="30" rows="2"><!-- TMPL_VAR name="internalnotes" --></textarea></td>
-        </tr>
-        <tr>
-            <td>Alerte adhérent  </td>
-            <td>
-                <select name="letter">
+            
+        </li>
+        <li>
+            <label for="notes">Notes</label>
+            <textarea name="notes" id="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea>
+        </li>
+        <li>
+            <label for="internalnotes">Notes internes</label>
+            <textarea name="internalnotes" id="internalnotes" cols="30" rows="2"><!-- TMPL_VAR name="internalnotes" --></textarea>
+        </li>
+        <li>
+            <label for="letter">Alerte adhérent  </label>
+            
+                <select name="letter" id="letter">
                     <option value="">pas activé</option>
                 <!-- TMPL_LOOP name="letterloop" -->
                                <!-- TMPL_IF name="selected" -->
@@ -868,27 +867,32 @@ window.onload = irregular_order();
                     <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="lettername" --></option>
 <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-                </select> (choisir un type de message afin que les adhérents inscrits soient prévenus  de chaque nouvelle parution par email)
-            </td>
-        </tr>
-        <tr>
-            <td><b>Attention : </b></td>
-            <td>
+                </select> <div class="inputnote">(choisir un type de message afin que les adhérents inscrits soient prévenus  de chaque nouvelle parution par email)</div>
+            
+        </li>
+       </ol>
+
+            <div class="warning"><b>Attention : </b>
+            
                 <ul>
                     <li>N'oubliez pas que vous <b>devez</b> avoir créé une notice biblio<b>avant</b> de créer un abonnement</li>
                     <li> Vous devez sélectionner un fournisseur si vous souhaitez réclamer les périodiques en retard</li>
-                </ul>
-            </td>
-        </tr>
-    </table>
+                </ul></div>
+            
+
+       </fieldset>
+       </div>
+       
+<div class="yui-u">
 <div id="subscription_form_planning">
-    <h2>Calendrier</h2>
-    <table>
-        <tr>
-            <td>Date d'arrivée prévue  du 1er n° :</td>
-            <td>
-                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button2" style="cursor: pointer;"  alt=""/>
-                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="firstacquidate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;" />
+       <fieldset class="rows">
+       <legend>Calendrier</legend>
+    <ol>
+        <li>
+           <label for="firstacquidate"> Date d'arrivée prévue  du 1er n° :</label>
+            
+                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button2" style="cursor: pointer;" alt="Voir calendrier" title="Voir calendrier">
+                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="firstacquidate" -->" size="13" maxlength="10" id="acqui_date" style="border-width: 0px;" />
                 <!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
                     Calendar.setup({
@@ -906,15 +910,12 @@ window.onload = irregular_order();
                         align          :   "Tl"
                     });
                 </script>
-            </td>
-            <td rowspan="5">
-                <div id="displayexample"></div>
-            </td>
-        </tr>
-        <tr>
-            <td>Périodicité (*) : </td>
-            <td>
-                <select name="periodicity" size="1" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1);num_pattern;">
+           
+        </li>
+        <li>
+            <label for="periodicity">Périodicité (*) : </label>
+            
+                <select name="periodicity" size="1" id="periodicity" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1);num_pattern;">
                 <option value="" selected="selected">-- Choisir --</option>
                 <!-- TMPL_IF name="periodicity16" -->
                 <option value="16" selected="selected">Sans périodicité</option>
@@ -999,13 +1000,11 @@ window.onload = irregular_order();
                 <!-- TMPL_ELSE -->
                     <option value="11">Bisannuel</option>
                 <!-- /TMPL_IF -->
-                </select>
-                Historique manuel : <input type="checkbox" name="manualhist" value="1" />
-            </td>
-        </tr>
-        <tr>
-            <td>Modèle de numérotation :</td>
-            <td>
+                </select></li>
+                               <li><label for="manuallist"> Historique manuel :</label> <input type="checkbox" name="manualhist" id="manuallist" value="1" /></li>
+        <li>
+           <label for="numberpattern"> Modèle de numérotation :</label>
+            
                 <select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
                     <option value="" selected="selected">-- Choisir --</option>
                     <!-- TMPL_IF name="numberpattern1" -->
@@ -1049,14 +1048,14 @@ window.onload = irregular_order();
                         <option value="7">Aucun de ci-dessus</option>
                     <!-- /TMPL_IF -->
                 </select>
-                <div id="more_options"></div>
-                <div id="irregularity"></div>
-            </td>
-        </tr>
-        <tr>
-            <td>Commence le : (*)</td>
-            <td>
-                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt=""  />
+        </li>
+                <li id="more_options"></li>
+                <li id="irregularity"></li>
+                  <li id="displayexample"></li>
+        <li>
+           <label for="startdate"> Commence le : (*)</label>
+            
+                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Voir calendrier" title="Voir calendrier">
                 <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" id="beginning_date" />
                 <!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
@@ -1075,12 +1074,12 @@ window.onload = irregular_order();
                         align        : "Tl"
                     });
                 </script>
-            </td>
-        </tr>
-        <tr>
-            <td>Durée d'abonnement</td>
-            <td>
-                <select name="subtype">
+            
+        </li>
+        <li>
+            <label for="subtype">Durée d'abonnement</label>
+            
+                <select name="subtype" id="subtype">
                     <!-- TMPL_LOOP NAME="subtype" -->
                         <!-- TMPL_IF NAME="selected" -->
                         <option value="<!-- TMPL_VAR NAME="name" -->" selected="selected">
@@ -1092,15 +1091,12 @@ window.onload = irregular_order();
                     <!-- /TMPL_LOOP -->
                 </select>
                 <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)" /> (*) (Entrer la quantité en nombre)
-            </td>
-        </tr>
-    <tr>
-        <td>Calcul de la numérotation</td>
-        <td>Formule de numérotation : <input type="text" name="numberingmethod" id="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->" /></td>
-    </tr>
-    <tr>
-    <td colspan="3">
-        <div id="basetable" style="display: none;">
+            
+        </li>
+    <li><label for="numberingmethod">Formule de numérotation : </label> <input type="text" name="numberingmethod" id="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->" />
+    </li>
+    <li>
+           <div id="basetable" style="display: none;">
             <table class="small">
                 <tr>
                     <th>&nbsp;</th>
@@ -1158,8 +1154,9 @@ window.onload = irregular_order();
                 </tr>
             </table>
         </div>
-        </td></tr>
-    </table>
+        </li>
+    </ol>
+       </fieldset>
 </div>
 <!--TMPL_IF Name="history"-->
 <div id="subscription_form_history">
@@ -1174,7 +1171,7 @@ window.onload = irregular_order();
           <td><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /> (si vide : l'abonnement est en cours)</td>
         </tr>
         <tr>
-            <td>Numéros reçus : </td>
+            <td>Numéros reçus</td>
             <td><textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></td>
         </tr>
         <tr>
@@ -1197,13 +1194,11 @@ window.onload = irregular_order();
 <!-- TMPL_ELSE -->
     <input type="button" value="Ajouter un abonnement" onclick="Check(this.form)" accesskey="w">
 <!-- /TMPL_IF -->
+</div>
+
 </form>
 
 </div>
 </div>
 
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
-</div>
-</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-bib-search.tmpl
index 85aa8f7..4334596 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-bib-search.tmpl
@@ -9,7 +9,9 @@
        
 
 <h1>Recherche catalogue</h1>
-
+<!-- TMPL_IF name="no_query" -->
+    <div class="warning">Vous devez saisir un terme de recherche sur </div>
+<!-- /TMPL_IF -->
 <form name="f" action="/cgi-bin/koha/serials/subscription-bib-search.pl" method="post">
     <input type="hidden" name="op" value="do_search" />
     <input type="hidden" name="type" value="intranet" />

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-detail.tmpl
index 01b5942..48146d2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/serials/subscription-detail.tmpl
@@ -3,7 +3,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" language="javascript">
 <!--
-function _(s) { return s } // dummy function for gettext
 
 // the english words used in display purposes
 var text = new Array(_('Numéro'),_('Volume'),_('Prêt'),_('Mois'),_('Semaine'),_('Commence par : '),_('Retour à : '),_('Choisir hémisphère : '),_('Nord'),_('Southern',

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/export.tmpl
index a246802..a94dba5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/export.tmpl
@@ -47,7 +47,7 @@
         </p>
         
         <p>
-            <label for="branch">Bibliothèque</label>
+            <label for="branch">Site</label>
             <select id="branch" name="branch">
             <option value="">-- Tout --</option>
                 <!-- TMPL_LOOP name="branchloop" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/holidays.tmpl
index 9d1bc04..3835ebc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/tools/holidays.tmpl
@@ -188,7 +188,7 @@
                        <input type="hidden" name="showWeekday" />
                </p>
                <p>
-                       <label for="showBranchName">Bibliothèque</label>
+                       <label for="showBranchName">Site</label>
                        <input type="text" size="20" id="showBranchName" name="showBranchName" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
                </p>
                <div style="display:inline">
@@ -224,7 +224,7 @@
                        <input type="hidden" name="newWeekday" />
                </p>
                <p>
-                       <label for="newBranchName">Bibliothèque</label>
+                       <label for="newBranchName">Site</label>
                        <input type="text" size="20" id="newBranchName" name="newBranchName" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
                </p>
                <div style="display:inline">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/modules/virtualshelves/addbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/modules/virtualshelves/addbybiblionumber.tmpl
index 910b2ff..3363c36 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/modules/virtualshelves/addbybiblionumber.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/modules/virtualshelves/addbybiblionumber.tmpl
@@ -22,10 +22,10 @@
     
     <b>Sélectionner une étagère existante</b>
     <p>
-        <label>Ajouter à l'étagère virtuelle</label><!-- TMPL_VAR NAME="CGIvirtualshelves" -->
+        <label>Ajouter à l'étagère</label><!-- TMPL_VAR NAME="CGIvirtualshelves" -->
     </p>
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    <input type="submit" value="Ajouter à l'étagère virtuelle" class="submit">
+    <input type="submit" value="Ajouter à l'étagère" class="submit">
 </form>
 <p>...ou...</p>
 <form name="f2" method="post" action="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl">
@@ -45,7 +45,7 @@
                                <option value="3">Libre</option>
             </select>
         </p>
-    <input type="submit" value="Ajouter à l'étagère virtuelle" class="submit"> 
+    <input type="submit" value="Ajouter à l'étagère" class="submit"> 
 </form>
 
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/xslt/MARC21slim2MODS3-1.xsl b/koha-tmpl/intranet-tmpl/prog/fr/xslt/MARC21slim2MODS3-1.xsl
new file mode 100644 (file)
index 0000000..e78a888
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/fr/xslt/MARC21slim2MODS3-1.xsl
@@ -0,0 +1,2521 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="xlink marc">
+       <xsl:include href="http://www.loc.gov/marcxml/xslt/MARC21slimUtils.xsl"/>
+       <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+       <!--
+
+Revision 1.11 - The attribute objectPart moved from <languageTerm> to <language>
+      2006/04/08  jrad
+
+Revision 1.10 MODS 3.1 revisions to language and classification elements  
+                               (plus ability to find marc:collection embedded in wrapper elements such as SRU zs: wrappers)
+                               2006/02/06  ggar
+
+Revision 1.9 subfield $y was added to field 242 2004/09/02 10:57 jrad
+
+Revision 1.8 Subject chopPunctuation expanded and attribute fixes 2004/08/12 jrad
+
+Revision 1.7 2004/03/25 08:29 jrad
+
+Revision 1.6 various validation fixes 2004/02/20 ntra
+
+Revision 1.5  2003/10/02 16:18:58  ntra
+MODS2 to MODS3 updates, language unstacking and 
+de-duping, chopPunctuation expanded
+
+Revision 1.3  2003/04/03 00:07:19  ntra
+Revision 1.3 Additional Changes not related to MODS Version 2.0 by ntra
+
+Revision 1.2  2003/03/24 19:37:42  ckeith
+Added Log Comment
+
+-->
+       <xsl:template match="/">
+               <xsl:choose>
+                       <xsl:when test="//marc:collection">
+                               <modsCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-1.xsd">
+                                       <xsl:for-each select="//marc:collection/marc:record">
+                                               <mods version="3.1">
+                                                       <xsl:call-template name="marcRecord"/>
+                                               </mods>
+                                       </xsl:for-each>
+                               </modsCollection>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <mods version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-1.xsd">
+                                       <xsl:for-each select="//marc:record">
+                                               <xsl:call-template name="marcRecord"/>
+                                       </xsl:for-each>
+                               </mods>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+       <xsl:template name="marcRecord">
+               <xsl:variable name="leader" select="marc:leader"/>
+               <xsl:variable name="leader6" select="substring($leader,7,1)"/>
+               <xsl:variable name="leader7" select="substring($leader,8,1)"/>
+               <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
+               <xsl:variable name="typeOf008">
+                       <xsl:choose>
+                               <xsl:when test="$leader6='a'">
+                                       <xsl:choose>
+                                               <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">BK</xsl:when>
+                                               <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">SE</xsl:when>
+                                       </xsl:choose>
+                               </xsl:when>
+                               <xsl:when test="$leader6='t'">BK</xsl:when>
+                               <xsl:when test="$leader6='p'">MM</xsl:when>
+                               <xsl:when test="$leader6='m'">CF</xsl:when>
+                               <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
+                               <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">VM</xsl:when>
+                               <xsl:when test="$leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'">MU</xsl:when>
+                       </xsl:choose>
+               </xsl:variable>
+               <xsl:for-each select="marc:datafield[@tag=245]">
+                       <titleInfo>
+                               <xsl:variable name="title">
+                                       <xsl:choose>
+                                               <xsl:when test="marc:subfield[@code='b']">
+                                                       <xsl:call-template name="specialSubfieldSelect">
+                                                               <xsl:with-param name="axis">b</xsl:with-param>
+                                                               <xsl:with-param name="beforeCodes">afgk</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:call-template name="subfieldSelect">
+                                                               <xsl:with-param name="codes">abfgk</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </xsl:variable>
+                               <xsl:variable name="titleChop">
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="$title"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </xsl:variable>
+                               <xsl:choose>
+                                       <xsl:when test="@ind2&gt;0">
+                                               <nonSort>
+                                                       <xsl:value-of select="substring($titleChop,1,@ind2)"/>
+                                               </nonSort>
+                                               <title>
+                                                       <xsl:value-of select="substring($titleChop,@ind2+1)"/>
+                                               </title>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <title>
+                                                       <xsl:value-of select="$titleChop"/>
+                                               </title>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                               <xsl:if test="marc:subfield[@code='b']">
+                                       <subTitle>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="axis">b</xsl:with-param>
+                                                                       <xsl:with-param name="anyCodes">b</xsl:with-param>
+                                                                       <xsl:with-param name="afterCodes">afgk</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </subTitle>
+                               </xsl:if>
+                               <xsl:call-template name="part"/>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=210]">
+                       <titleInfo type="abbreviated">
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:call-template name="subfieldSelect">
+                                                               <xsl:with-param name="codes">a</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <xsl:call-template name="subtitle"/>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=242]">
+                       <titleInfo type="translated">
+                               <!--09/01/04 Added subfield $y-->
+                               <xsl:for-each select="marc:subfield[@code='y']">
+                                       <xsl:attribute name="lang"><xsl:value-of select="text()"/></xsl:attribute>
+                               </xsl:for-each>
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:call-template name="subfieldSelect">
+                                                               <!-- 1/04 removed $h, b -->
+                                                               <xsl:with-param name="codes">a</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <!-- 1/04 fix -->
+                               <xsl:call-template name="subtitle"/>
+                               <xsl:call-template name="part"/>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=246]">
+                       <titleInfo type="alternative">
+                               <xsl:for-each select="marc:subfield[@code='i']">
+                                       <xsl:attribute name="displayLabel"><xsl:value-of select="text()"/></xsl:attribute>
+                               </xsl:for-each>
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:call-template name="subfieldSelect">
+                                                               <!-- 1/04 removed $h, $b -->
+                                                               <xsl:with-param name="codes">af</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <xsl:call-template name="subtitle"/>
+                               <xsl:call-template name="part"/>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
+                       <titleInfo type="uniform">
+                               <title>
+                                       <xsl:variable name="str">
+                                               <xsl:for-each select="marc:subfield">
+                                                       <xsl:if test="(contains('adfklmor',@code) and (not(../marc:subfield[@code='n' or @code='p']) or (following-sibling::marc:subfield[@code='n' or @code='p'])))">
+                                                               <xsl:value-of select="text()"/>
+                                                               <xsl:text> </xsl:text>
+                                                       </xsl:if>
+                                               </xsl:for-each>
+                                       </xsl:variable>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <xsl:call-template name="part"/>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=740][@ind2!=2]">
+                       <titleInfo type="alternative">
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:call-template name="subfieldSelect">
+                                                               <xsl:with-param name="codes">ah</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <xsl:call-template name="part"/>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=100]">
+                       <name type="personal">
+                               <xsl:call-template name="nameABCDQ"/>
+                               <xsl:call-template name="affiliation"/>
+                               <role>
+                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
+                               </role>
+                               <xsl:call-template name="role"/>
+                       </name>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=110]">
+                       <name type="corporate">
+                               <xsl:call-template name="nameABCDN"/>
+                               <role>
+                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
+                               </role>
+                               <xsl:call-template name="role"/>
+                       </name>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=111]">
+                       <name type="conference">
+                               <xsl:call-template name="nameACDEQ"/>
+                               <role>
+                                       <roleTerm authority="marcrelator" type="text">creator</roleTerm>
+                               </role>
+                               <xsl:call-template name="role"/>
+                       </name>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=700][not(marc:subfield[@code='t'])]">
+                       <name type="personal">
+                               <xsl:call-template name="nameABCDQ"/>
+                               <xsl:call-template name="affiliation"/>
+                               <xsl:call-template name="role"/>
+                       </name>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=710][not(marc:subfield[@code='t'])]">
+                       <name type="corporate">
+                               <xsl:call-template name="nameABCDN"/>
+                               <xsl:call-template name="role"/>
+                       </name>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=711][not(marc:subfield[@code='t'])]">
+                       <name type="conference">
+                               <xsl:call-template name="nameACDEQ"/>
+                               <xsl:call-template name="role"/>
+                       </name>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=720][not(marc:subfield[@code='t'])]">
+                       <name>
+                               <xsl:if test="@ind1=1">
+                                       <xsl:attribute name="type"><xsl:text>personal</xsl:text></xsl:attribute>
+                               </xsl:if>
+                               <namePart>
+                                       <xsl:value-of select="marc:subfield[@code='a']"/>
+                               </namePart>
+                               <xsl:call-template name="role"/>
+                       </name>
+               </xsl:for-each>
+               <typeOfResource>
+                       <xsl:if test="$leader7='c'">
+                               <xsl:attribute name="collection">yes</xsl:attribute>
+                       </xsl:if>
+                       <xsl:if test="$leader6='d' or $leader6='f' or $leader6='p' or $leader6='t'">
+                               <xsl:attribute name="manuscript">yes</xsl:attribute>
+                       </xsl:if>
+                       <xsl:choose>
+                               <xsl:when test="$leader6='a' or $leader6='t'">text</xsl:when>
+                               <xsl:when test="$leader6='e' or $leader6='f'">cartographic</xsl:when>
+                               <xsl:when test="$leader6='c' or $leader6='d'">notated music</xsl:when>
+                               <xsl:when test="$leader6='i'">sound recording-nonmusical</xsl:when>
+                               <xsl:when test="$leader6='j'">sound recording-musical</xsl:when>
+                               <xsl:when test="$leader6='k'">still image</xsl:when>
+                               <xsl:when test="$leader6='g'">moving image</xsl:when>
+                               <xsl:when test="$leader6='r'">three dimensional object</xsl:when>
+                               <xsl:when test="$leader6='m'">software, multimedia</xsl:when>
+                               <xsl:when test="$leader6='p'">mixed material</xsl:when>
+                       </xsl:choose>
+               </typeOfResource>
+               <xsl:if test="substring($controlField008,26,1)='d'">
+                       <genre authority="marc">globe</genre>
+               </xsl:if>
+               <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='r']">
+                       <genre authority="marc">remote sensing image</genre>
+               </xsl:if>
+               <xsl:if test="$typeOf008='MP'">
+                       <xsl:variable name="controlField008-25" select="substring($controlField008,26,1)"/>
+                       <xsl:choose>
+                               <xsl:when test="$controlField008-25='a' or $controlField008-25='b' or $controlField008-25='c' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='j']">
+                                       <genre authority="marc">map</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-25='e' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='d']">
+                                       <genre authority="marc">atlas</genre>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:if>
+               <xsl:if test="$typeOf008='SE'">
+                       <xsl:variable name="controlField008-21" select="substring($controlField008,22,1)"/>
+                       <xsl:choose>
+                               <xsl:when test="$controlField008-21='d'">
+                                       <genre authority="marc">database</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-21='l'">
+                                       <genre authority="marc">loose-leaf</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-21='m'">
+                                       <genre authority="marc">series</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-21='n'">
+                                       <genre authority="marc">newspaper</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-21='p'">
+                                       <genre authority="marc">periodical</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-21='w'">
+                                       <genre authority="marc">web site</genre>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:if>
+               <xsl:if test="$typeOf008='BK' or $typeOf008='SE'">
+                       <xsl:variable name="controlField008-24" select="substring($controlField008,25,4)"/>
+                       <xsl:choose>
+                               <xsl:when test="contains($controlField008-24,'a')">
+                                       <genre authority="marc">abstract or summary</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'b')">
+                                       <genre authority="marc">bibliography</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'c')">
+                                       <genre authority="marc">catalog</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'d')">
+                                       <genre authority="marc">dictionary</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'e')">
+                                       <genre authority="marc">encyclopedia</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'f')">
+                                       <genre authority="marc">handbook</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'g')">
+                                       <genre authority="marc">legal article</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'i')">
+                                       <genre authority="marc">index</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'k')">
+                                       <genre authority="marc">discography</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'l')">
+                                       <genre authority="marc">legislation</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'m')">
+                                       <genre authority="marc">theses</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'n')">
+                                       <genre authority="marc">survey of literature</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'o')">
+                                       <genre authority="marc">review</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'p')">
+                                       <genre authority="marc">programmed text</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'q')">
+                                       <genre authority="marc">filmography</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'r')">
+                                       <genre authority="marc">directory</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'s')">
+                                       <genre authority="marc">statistics</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'t')">
+                                       <genre authority="marc">technical report</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'v')">
+                                       <genre authority="marc">legal case and case notes</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'w')">
+                                       <genre authority="marc">law report or digest</genre>
+                               </xsl:when>
+                               <xsl:when test="contains($controlField008-24,'z')">
+                                       <genre authority="marc">treaty</genre>
+                               </xsl:when>
+                       </xsl:choose>
+                       <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
+                       <xsl:choose>
+                               <xsl:when test="$controlField008-29='1'">
+                                       <genre authority="marc">conference publication</genre>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:if>
+               <xsl:if test="$typeOf008='CF'">
+                       <xsl:variable name="controlField008-26" select="substring($controlField008,27,1)"/>
+                       <xsl:choose>
+                               <xsl:when test="$controlField008-26='a'">
+                                       <genre authority="marc">numeric data</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-26='e'">
+                                       <genre authority="marc">database</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-26='f'">
+                                       <genre authority="marc">font</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-26='g'">
+                                       <genre authority="marc">game</genre>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:if>
+               <xsl:if test="$typeOf008='BK'">
+                       <xsl:if test="substring($controlField008,25,1)='j'">
+                               <genre authority="marc">patent</genre>
+                       </xsl:if>
+                       <xsl:if test="substring($controlField008,31,1)='1'">
+                               <genre authority="marc">festschrift</genre>
+                       </xsl:if>
+                       <xsl:variable name="controlField008-34" select="substring($controlField008,35,1)"/>
+                       <xsl:if test="$controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d'">
+                               <genre authority="marc">biography</genre>
+                       </xsl:if>
+                       <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
+                       <xsl:choose>
+                               <xsl:when test="$controlField008-33='e'">
+                                       <genre authority="marc">essay</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='d'">
+                                       <genre authority="marc">drama</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='c'">
+                                       <genre authority="marc">comic strip</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='l'">
+                                       <genre authority="marc">fiction</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='h'">
+                                       <genre authority="marc">humor, satire</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='i'">
+                                       <genre authority="marc">letter</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='f'">
+                                       <genre authority="marc">novel</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='j'">
+                                       <genre authority="marc">short story</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='s'">
+                                       <genre authority="marc">speech</genre>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:if>
+               <xsl:if test="$typeOf008='MU'">
+                       <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/>
+                       <xsl:if test="contains($controlField008-30-31,'b')">
+                               <genre authority="marc">biography</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'c')">
+                               <genre authority="marc">conference publication</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'d')">
+                               <genre authority="marc">drama</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'e')">
+                               <genre authority="marc">essay</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'f')">
+                               <genre authority="marc">fiction</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'o')">
+                               <genre authority="marc">folktale</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'h')">
+                               <genre authority="marc">history</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'k')">
+                               <genre authority="marc">humor, satire</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'m')">
+                               <genre authority="marc">memoir</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'p')">
+                               <genre authority="marc">poetry</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'r')">
+                               <genre authority="marc">rehearsal</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'g')">
+                               <genre authority="marc">reporting</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'s')">
+                               <genre authority="marc">sound</genre>
+                       </xsl:if>
+                       <xsl:if test="contains($controlField008-30-31,'l')">
+                               <genre authority="marc">speech</genre>
+                       </xsl:if>
+               </xsl:if>
+               <xsl:if test="$typeOf008='VM'">
+                       <xsl:variable name="controlField008-33" select="substring($controlField008,34,1)"/>
+                       <xsl:choose>
+                               <xsl:when test="$controlField008-33='a'">
+                                       <genre authority="marc">art original</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='b'">
+                                       <genre authority="marc">kit</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='c'">
+                                       <genre authority="marc">art reproduction</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='d'">
+                                       <genre authority="marc">diorama</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='f'">
+                                       <genre authority="marc">filmstrip</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='g'">
+                                       <genre authority="marc">legal article</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='i'">
+                                       <genre authority="marc">picture</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='k'">
+                                       <genre authority="marc">graphic</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='l'">
+                                       <genre authority="marc">technical drawing</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='m'">
+                                       <genre authority="marc">motion picture</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='n'">
+                                       <genre authority="marc">chart</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='o'">
+                                       <genre authority="marc">flash card</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='p'">
+                                       <genre authority="marc">microscope slide</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='q' or marc:controlfield[@tag=007][substring(text(),1,1)='a'][substring(text(),2,1)='q']">
+                                       <genre authority="marc">model</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='r'">
+                                       <genre authority="marc">realia</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='s'">
+                                       <genre authority="marc">slide</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='t'">
+                                       <genre authority="marc">transparency</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='v'">
+                                       <genre authority="marc">videorecording</genre>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-33='w'">
+                                       <genre authority="marc">toy</genre>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:if>
+               <xsl:for-each select="marc:datafield[@tag=655]">
+                       <genre authority="marc">
+                               <xsl:attribute name="authority"><xsl:value-of select="marc:subfield[@code='2']"/></xsl:attribute>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">abvxyz</xsl:with-param>
+                                       <xsl:with-param name="delimeter">-</xsl:with-param>
+                               </xsl:call-template>
+                       </genre>
+               </xsl:for-each>
+               <originInfo>
+                       <xsl:variable name="MARCpublicationCode" select="normalize-space(substring($controlField008,16,3))"/>
+                       <xsl:if test="translate($MARCpublicationCode,'|','')">
+                               <place>
+                                       <placeTerm>
+                                               <xsl:attribute name="type">code</xsl:attribute>
+                                               <xsl:attribute name="authority">marccountry</xsl:attribute>
+                                               <xsl:value-of select="$MARCpublicationCode"/>
+                                       </placeTerm>
+                               </place>
+                       </xsl:if>
+                       <xsl:for-each select="marc:datafield[@tag=044]/marc:subfield[@code='c']">
+                               <place>
+                                       <placeTerm>
+                                               <xsl:attribute name="type">code</xsl:attribute>
+                                               <xsl:attribute name="authority">iso3166</xsl:attribute>
+                                               <xsl:value-of select="."/>
+                                       </placeTerm>
+                               </place>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=260]/marc:subfield[@code='a']">
+                               <place>
+                                       <placeTerm>
+                                               <xsl:attribute name="type">text</xsl:attribute>
+                                               <xsl:call-template name="chopPunctuationFront">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="chopPunctuation">
+                                                                       <xsl:with-param name="chopString" select="."/>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </placeTerm>
+                               </place>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='m']">
+                               <dateValid point="start">
+                                       <xsl:value-of select="."/>
+                               </dateValid>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='n']">
+                               <dateValid point="end">
+                                       <xsl:value-of select="."/>
+                               </dateValid>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=046]/marc:subfield[@code='j']">
+                               <dateModified>
+                                       <xsl:value-of select="."/>
+                               </dateModified>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=260]/marc:subfield[@code='b' or @code='c' or @code='g']">
+                               <xsl:choose>
+                                       <xsl:when test="@code='b'">
+                                               <publisher>
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString" select="."/>
+                                                               <xsl:with-param name="punctuation">
+                                                                       <xsl:text>:,;/ </xsl:text>
+                                                               </xsl:with-param>
+                                                       </xsl:call-template>
+                                               </publisher>
+                                       </xsl:when>
+                                       <xsl:when test="@code='c'">
+                                               <dateIssued>
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString" select="."/>
+                                                       </xsl:call-template>
+                                               </dateIssued>
+                                       </xsl:when>
+                                       <xsl:when test="@code='g'">
+                                               <dateCreated>
+                                                       <xsl:value-of select="."/>
+                                               </dateCreated>
+                                       </xsl:when>
+                               </xsl:choose>
+                       </xsl:for-each>
+                       <xsl:variable name="dataField260c">
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString" select="marc:datafield[@tag=260]/marc:subfield[@code='c']"/>
+                               </xsl:call-template>
+                       </xsl:variable>
+                       <xsl:variable name="controlField008-7-10" select="normalize-space(substring($controlField008, 8, 4))"/>
+                       <xsl:variable name="controlField008-11-14" select="normalize-space(substring($controlField008, 12, 4))"/>
+                       <xsl:variable name="controlField008-6" select="normalize-space(substring($controlField008, 7, 1))"/>
+                       <xsl:if test="$controlField008-6='e' or $controlField008-6='p' or $controlField008-6='r' or $controlField008-6='t' or $controlField008-6='s'">
+                               <xsl:if test="$controlField008-7-10 and ($controlField008-7-10 != $dataField260c)">
+                                       <dateIssued encoding="marc">
+                                               <xsl:value-of select="$controlField008-7-10"/>
+                                       </dateIssued>
+                               </xsl:if>
+                       </xsl:if>
+                       <xsl:if test="$controlField008-6='c' or $controlField008-6='d' or $controlField008-6='i' or $controlField008-6='k' or $controlField008-6='m' or $controlField008-6='q' or $controlField008-6='u'">
+                               <xsl:if test="$controlField008-7-10">
+                                       <dateIssued encoding="marc" point="start">
+                                               <xsl:value-of select="$controlField008-7-10"/>
+                                       </dateIssued>
+                               </xsl:if>
+                       </xsl:if>
+                       <xsl:if test="$controlField008-6='c' or $controlField008-6='d' or $controlField008-6='i' or $controlField008-6='k' or $controlField008-6='m' or $controlField008-6='q' or $controlField008-6='u'">
+                               <xsl:if test="$controlField008-11-14">
+                                       <dateIssued encoding="marc" point="end">
+                                               <xsl:value-of select="$controlField008-11-14"/>
+                                       </dateIssued>
+                               </xsl:if>
+                       </xsl:if>
+                       <xsl:if test="$controlField008-6='q'">
+                               <xsl:if test="$controlField008-7-10">
+                                       <dateIssued encoding="marc" point="start" qualifier="questionable">
+                                               <xsl:value-of select="$controlField008-7-10"/>
+                                       </dateIssued>
+                               </xsl:if>
+                       </xsl:if>
+                       <xsl:if test="$controlField008-6='q'">
+                               <xsl:if test="$controlField008-11-14">
+                                       <dateIssued encoding="marc" point="end" qualifier="questionable">
+                                               <xsl:value-of select="$controlField008-11-14"/>
+                                       </dateIssued>
+                               </xsl:if>
+                       </xsl:if>
+                       <xsl:if test="$controlField008-6='t'">
+                               <xsl:if test="$controlField008-11-14">
+                                       <copyrightDate encoding="marc">
+                                               <xsl:value-of select="$controlField008-11-14"/>
+                                       </copyrightDate>
+                               </xsl:if>
+                       </xsl:if>
+                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=0 or @ind1=1]/marc:subfield[@code='a']">
+                               <dateCaptured encoding="iso8601">
+                                       <xsl:value-of select="."/>
+                               </dateCaptured>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=2]/marc:subfield[@code='a'][1]">
+                               <dateCaptured encoding="iso8601" point="start">
+                                       <xsl:value-of select="."/>
+                               </dateCaptured>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=033][@ind1=2]/marc:subfield[@code='a'][2]">
+                               <dateCaptured encoding="iso8601" point="end">
+                                       <xsl:value-of select="."/>
+                               </dateCaptured>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=250]/marc:subfield[@code='a']">
+                               <edition>
+                                       <xsl:value-of select="."/>
+                               </edition>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:leader">
+                               <issuance>
+                                       <xsl:choose>
+                                               <xsl:when test="$leader7='a' or $leader7='c' or $leader7='d' or $leader7='m'">monographic</xsl:when>
+                                               <xsl:when test="$leader7='b' or $leader7='i' or $leader7='s'">continuing</xsl:when>
+                                       </xsl:choose>
+                               </issuance>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=310]|marc:datafield[@tag=321]">
+                               <frequency>
+                                       <xsl:call-template name="subfieldSelect">
+                                               <xsl:with-param name="codes">ab</xsl:with-param>
+                                       </xsl:call-template>
+                               </frequency>
+                       </xsl:for-each>
+               </originInfo>
+               <xsl:variable name="controlField008-35-37" select="normalize-space(translate(substring($controlField008,36,3),'|#',''))"/>
+               <xsl:if test="$controlField008-35-37">
+                       <language>
+                               <languageTerm authority="iso639-2b" type="code">
+                                       <xsl:value-of select="substring($controlField008,36,3)"/>
+                               </languageTerm>
+                       </language>
+               </xsl:if>
+               <xsl:for-each select="marc:datafield[@tag=041]">
+                       <xsl:for-each select="marc:subfield[@code='a' or @code='b' or @code='d' or @code='e' or @code='f' or @code='g' or @code='h']">
+                               <xsl:variable name="langCodes" select="."/>
+                               <xsl:choose>
+                                       <xsl:when test="../marc:subfield[@code='2']='rfc3066'">
+                                               <!-- not stacked but could be repeated -->
+                                               <xsl:call-template name="rfcLanguages">
+                                                       <xsl:with-param name="nodeNum">
+                                                               <xsl:value-of select="1"/>
+                                                       </xsl:with-param>
+                                                       <xsl:with-param name="usedLanguages">
+                                                               <xsl:text/>
+                                                       </xsl:with-param>
+                                                       <xsl:with-param name="controlField008-35-37">
+                                                               <xsl:value-of select="$controlField008-35-37"/>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <!-- iso -->
+                                               <xsl:variable name="allLanguages">
+                                                       <xsl:copy-of select="$langCodes"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="currentLanguage">
+                                                       <xsl:value-of select="substring($allLanguages,1,3)"/>
+                                               </xsl:variable>
+                                               <xsl:call-template name="isoLanguage">
+                                                       <xsl:with-param name="currentLanguage">
+                                                               <xsl:value-of select="substring($allLanguages,1,3)"/>
+                                                       </xsl:with-param>
+                                                       <xsl:with-param name="remainingLanguages">
+                                                               <xsl:value-of select="substring($allLanguages,4,string-length($allLanguages)-3)"/>
+                                                       </xsl:with-param>
+                                                       <xsl:with-param name="usedLanguages">
+                                                               <xsl:if test="$controlField008-35-37">
+                                                                       <xsl:value-of select="$controlField008-35-37"/>
+                                                               </xsl:if>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:for-each>
+               </xsl:for-each>
+               <xsl:variable name="physicalDescription">
+                       <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a' or substring(.,12,1)='b']">
+                               <digitalOrigin>reformatted digital</digitalOrigin>
+                       </xsl:if>
+                       <xsl:variable name="controlField008-23" select="substring($controlField008,24,1)"/>
+                       <xsl:variable name="controlField008-29" select="substring($controlField008,30,1)"/>
+                       <xsl:variable name="check008-23">
+                               <xsl:if test="$typeOf008='BK' or $typeOf008='MU' or $typeOf008='SE' or $typeOf008='MM'">
+                                       <xsl:value-of select="true()"/>
+                               </xsl:if>
+                       </xsl:variable>
+                       <xsl:variable name="check008-29">
+                               <xsl:if test="$typeOf008='MP' or $typeOf008='VM'">
+                                       <xsl:value-of select="true()"/>
+                               </xsl:if>
+                       </xsl:variable>
+                       <xsl:choose>
+                               <xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')">
+                                       <form authority="marcform">braille</form>
+                               </xsl:when>
+                               <xsl:when test="($controlField008-23=' ' and ($leader6='c' or $leader6='d')) or (($typeOf008='BK' or $typeOf008='SE') and ($controlField008-23=' ' or $controlField008='r'))">
+                                       <form authority="marcform">print</form>
+                               </xsl:when>
+                               <xsl:when test="$leader6 = 'm' or ($check008-23 and $controlField008-23='s') or ($check008-29 and $controlField008-29='s')">
+                                       <form authority="marcform">electronic</form>
+                               </xsl:when>
+                               <xsl:when test="($check008-23 and $controlField008-23='b') or ($check008-29 and $controlField008-29='b')">
+                                       <form authority="marcform">microfiche</form>
+                               </xsl:when>
+                               <xsl:when test="($check008-23 and $controlField008-23='a') or ($check008-29 and $controlField008-29='a')">
+                                       <form authority="marcform">microfilm</form>
+                               </xsl:when>
+                       </xsl:choose>
+                       <!-- 1/04 fix -->
+                       <xsl:if test="marc:datafield[@tag=130]/marc:subfield[@code='h']">
+                               <form authority="gmd">
+                                       <xsl:call-template name="chopBrackets">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="marc:datafield[@tag=130]/marc:subfield[@code='h']"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </form>
+                       </xsl:if>
+                       <xsl:if test="marc:datafield[@tag=240]/marc:subfield[@code='h']">
+                               <form authority="gmd">
+                                       <xsl:call-template name="chopBrackets">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="marc:datafield[@tag=240]/marc:subfield[@code='h']"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </form>
+                       </xsl:if>
+                       <xsl:if test="marc:datafield[@tag=242]/marc:subfield[@code='h']">
+                               <form authority="gmd">
+                                       <xsl:call-template name="chopBrackets">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="marc:datafield[@tag=242]/marc:subfield[@code='h']"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </form>
+                       </xsl:if>
+                       <xsl:if test="marc:datafield[@tag=245]/marc:subfield[@code='h']">
+                               <form authority="gmd">
+                                       <xsl:call-template name="chopBrackets">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='h']"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </form>
+                       </xsl:if>
+                       <xsl:if test="marc:datafield[@tag=246]/marc:subfield[@code='h']">
+                               <form authority="gmd">
+                                       <xsl:call-template name="chopBrackets">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="marc:datafield[@tag=246]/marc:subfield[@code='h']"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </form>
+                       </xsl:if>
+                       <xsl:if test="marc:datafield[@tag=730]/marc:subfield[@code='h']">
+                               <form authority="gmd">
+                                       <xsl:call-template name="chopBrackets">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="marc:datafield[@tag=730]/marc:subfield[@code='h']"/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </form>
+                       </xsl:if>
+                       <xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
+                               <form>
+                                       <xsl:value-of select="."/>
+                               </form>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
+                               <xsl:choose>
+                                       <xsl:when test="substring(text(),14,1)='a'">
+                                               <reformattingQuality>access</reformattingQuality>
+                                       </xsl:when>
+                                       <xsl:when test="substring(text(),14,1)='p'">
+                                               <reformattingQuality>preservation</reformattingQuality>
+                                       </xsl:when>
+                                       <xsl:when test="substring(text(),14,1)='r'">
+                                               <reformattingQuality>replacement</reformattingQuality>
+                                       </xsl:when>
+                               </xsl:choose>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q'][string-length(.)&gt;1]">
+                               <internetMediaType>
+                                       <xsl:value-of select="."/>
+                               </internetMediaType>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=300]">
+                               <extent>
+                                       <xsl:call-template name="subfieldSelect">
+                                               <xsl:with-param name="codes">abce</xsl:with-param>
+                                       </xsl:call-template>
+                               </extent>
+                       </xsl:for-each>
+               </xsl:variable>
+               <xsl:if test="string-length(normalize-space($physicalDescription))">
+                       <physicalDescription>
+                               <xsl:copy-of select="$physicalDescription"/>
+                       </physicalDescription>
+               </xsl:if>
+               <xsl:for-each select="marc:datafield[@tag=520]">
+                       <abstract>
+                               <xsl:call-template name="uri"/>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">ab</xsl:with-param>
+                               </xsl:call-template>
+                       </abstract>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=505]">
+                       <tableOfContents>
+                               <xsl:call-template name="uri"/>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">agrt</xsl:with-param>
+                               </xsl:call-template>
+                       </tableOfContents>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=521]">
+                       <targetAudience>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">ab</xsl:with-param>
+                               </xsl:call-template>
+                       </targetAudience>
+               </xsl:for-each>
+               <xsl:if test="$typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM'">
+                       <xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
+                       <xsl:choose>
+                               <!-- 01/04 fix -->
+                               <xsl:when test="$controlField008-22='d'">
+                                       <targetAudience authority="marctarget">adolescent</targetAudience>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-22='e'">
+                                       <targetAudience authority="marctarget">adult</targetAudience>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-22='g'">
+                                       <targetAudience authority="marctarget">general</targetAudience>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-22='b' or $controlField008-22='c' or $controlField008-22='j'">
+                                       <targetAudience authority="marctarget">juvenile</targetAudience>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-22='a'">
+                                       <targetAudience authority="marctarget">preschool</targetAudience>
+                               </xsl:when>
+                               <xsl:when test="$controlField008-22='f'">
+                                       <targetAudience authority="marctarget">specialized</targetAudience>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:if>
+               <xsl:for-each select="marc:datafield[@tag=245]/marc:subfield[@code='c']">
+                       <note type="statement of responsibility">
+                               <xsl:value-of select="."/>
+                       </note>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=500]">
+                       <note>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                               <xsl:call-template name="uri"/>
+                       </note>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=511]">
+                       <note type="performers">
+                               <xsl:call-template name="uri"/>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </note>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=518]">
+                       <note type="venue">
+                               <xsl:call-template name="uri"/>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </note>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=501 or @tag=502 or @tag=504 or @tag=506 or @tag=507 or @tag=508 or  @tag=513 or @tag=514 or @tag=515 or @tag=516 or @tag=522 or @tag=524 or @tag=525 or @tag=526 or @tag=530 or @tag=533 or @tag=534 or @tag=535 or @tag=536 or @tag=538 or @tag=540 or @tag=541 or @tag=544 or @tag=545 or @tag=546 or @tag=547 or @tag=550 or @tag=552 or @tag=555 or @tag=556 or @tag=561 or @tag=562 or @tag=565 or @tag=567 or @tag=580 or @tag=581 or @tag=583 or @tag=584 or @tag=585 or @tag=586]">
+                       <note>
+                               <xsl:call-template name="uri"/>
+                               <xsl:variable name="str">
+                                       <xsl:for-each select="marc:subfield[@code!='6' or @code!='8']">
+                                               <xsl:value-of select="."/>
+                                               <xsl:text> </xsl:text>
+                                       </xsl:for-each>
+                               </xsl:variable>
+                               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
+                       </note>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=034][marc:subfield[@code='d' or @code='e' or @code='f' or @code='g']]">
+                       <subject>
+                               <cartographics>
+                                       <coordinates>
+                                               <xsl:call-template name="subfieldSelect">
+                                                       <xsl:with-param name="codes">defg</xsl:with-param>
+                                               </xsl:call-template>
+                                       </coordinates>
+                               </cartographics>
+                       </subject>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=043]">
+                       <subject>
+                               <xsl:for-each select="marc:subfield[@code='a' or @code='b' or @code='c']">
+                                       <geographicCode>
+                                               <xsl:attribute name="authority"><xsl:if test="@code='a'"><xsl:text>marcgac</xsl:text></xsl:if><xsl:if test="@code='b'"><xsl:value-of select="following-sibling::marc:subfield[@code=2]"/></xsl:if><xsl:if test="@code='c'"><xsl:text>iso3166</xsl:text></xsl:if></xsl:attribute>
+                                               <xsl:value-of select="self::marc:subfield"/>
+                                       </geographicCode>
+                               </xsl:for-each>
+                       </subject>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=255]">
+                       <subject>
+                               <cartographics>
+                                       <xsl:for-each select="marc:subfield[@code='c']">
+                                               <coordinates>
+                                                       <xsl:value-of select="."/>
+                                               </coordinates>
+                                       </xsl:for-each>
+                                       <xsl:for-each select="marc:subfield[@code='a']">
+                                               <scale>
+                                                       <xsl:value-of select="."/>
+                                               </scale>
+                                       </xsl:for-each>
+                                       <xsl:for-each select="marc:subfield[@code='b']">
+                                               <projection>
+                                                       <xsl:value-of select="."/>
+                                               </projection>
+                                       </xsl:for-each>
+                               </cartographics>
+                       </subject>
+               </xsl:for-each>
+               <xsl:apply-templates select="marc:datafield[653 &gt;= @tag and @tag &gt;= 600]"/>
+               <xsl:apply-templates select="marc:datafield[@tag=656]"/>
+               <xsl:for-each select="marc:datafield[@tag=752]">
+                       <subject>
+                               <hierarchicalGeographic>
+                                       <xsl:for-each select="marc:subfield[@code='a']">
+                                               <country>
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString" select="."/>
+                                                       </xsl:call-template>
+                                               </country>
+                                       </xsl:for-each>
+                                       <xsl:for-each select="marc:subfield[@code='b']">
+                                               <state>
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString" select="."/>
+                                                       </xsl:call-template>
+                                               </state>
+                                       </xsl:for-each>
+                                       <xsl:for-each select="marc:subfield[@code='c']">
+                                               <county>
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString" select="."/>
+                                                       </xsl:call-template>
+                                               </county>
+                                       </xsl:for-each>
+                                       <xsl:for-each select="marc:subfield[@code='d']">
+                                               <city>
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString" select="."/>
+                                                       </xsl:call-template>
+                                               </city>
+                                       </xsl:for-each>
+                               </hierarchicalGeographic>
+                       </subject>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=045][marc:subfield[@code='b']]">
+                       <subject>
+                               <xsl:choose>
+                                       <xsl:when test="@ind1=2">
+                                               <temporal encoding="iso8601" point="start">
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString">
+                                                                       <xsl:value-of select="marc:subfield[@code='b'][1]"/>
+                                                               </xsl:with-param>
+                                                       </xsl:call-template>
+                                               </temporal>
+                                               <temporal encoding="iso8601" point="end">
+                                                       <xsl:call-template name="chopPunctuation">
+                                                               <xsl:with-param name="chopString">
+                                                                       <xsl:value-of select="marc:subfield[@code='b'][2]"/>
+                                                               </xsl:with-param>
+                                                       </xsl:call-template>
+                                               </temporal>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:for-each select="marc:subfield[@code='b']">
+                                                       <temporal encoding="iso8601">
+                                                               <xsl:call-template name="chopPunctuation">
+                                                                       <xsl:with-param name="chopString" select="."/>
+                                                               </xsl:call-template>
+                                                       </temporal>
+                                               </xsl:for-each>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </subject>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=050]">
+                       <xsl:for-each select="marc:subfield[@code='b']">
+                               <classification authority="lcc">
+                                       <xsl:if test="../marc:subfield[@code='3']">
+                                               <xsl:attribute name="displayLabel"><xsl:value-of select="../marc:subfield[@code='3']"/></xsl:attribute>
+                                       </xsl:if>
+                                       <xsl:value-of select="preceding-sibling::marc:subfield[@code='a'][1]"/>
+                                       <xsl:text> </xsl:text>
+                                       <xsl:value-of select="text()"/>
+                               </classification>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:subfield[@code='a'][not(following-sibling::marc:subfield[@code='b'])]">
+                               <classification authority="lcc">
+                                       <xsl:if test="../marc:subfield[@code='3']">
+                                               <xsl:attribute name="displayLabel"><xsl:value-of select="../marc:subfield[@code='3']"/></xsl:attribute>
+                                       </xsl:if>
+                                       <xsl:value-of select="text()"/>
+                               </classification>
+                       </xsl:for-each>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=082]">
+                       <classification authority="ddc">
+                               <xsl:if test="marc:subfield[@code='2']">
+                                       <xsl:attribute name="edition"><xsl:value-of select="marc:subfield[@code='2']"/></xsl:attribute>
+                               </xsl:if>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">ab</xsl:with-param>
+                               </xsl:call-template>
+                       </classification>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=080]">
+                       <classification authority="udc">
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">abx</xsl:with-param>
+                               </xsl:call-template>
+                       </classification>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=060]">
+                       <classification authority="nlm">
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">ab</xsl:with-param>
+                               </xsl:call-template>
+                       </classification>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=086][@ind1=0]">
+                       <classification authority="sudocs">
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </classification>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=086][@ind1=1]">
+                       <classification authority="candoc">
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </classification>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=086]">
+                       <classification>
+                               <xsl:attribute name="authority"><xsl:value-of select="marc:subfield[@code='2']"/></xsl:attribute>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </classification>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=084]">
+                       <classification>
+                               <xsl:attribute name="authority"><xsl:value-of select="marc:subfield[@code='2']"/></xsl:attribute>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">ab</xsl:with-param>
+                               </xsl:call-template>
+                       </classification>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=440]">
+                       <relatedItem type="series">
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="subfieldSelect">
+                                                                       <xsl:with-param name="codes">av</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="part"/>
+                               </titleInfo>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=490][@ind1=0]">
+                       <relatedItem type="series">
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="subfieldSelect">
+                                                                       <xsl:with-param name="codes">av</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="part"/>
+                               </titleInfo>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=510]">
+                       <relatedItem type="isReferencedBy">
+                               <note>
+                                       <xsl:call-template name="subfieldSelect">
+                                               <xsl:with-param name="codes">abcx3</xsl:with-param>
+                                       </xsl:call-template>
+                               </note>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=534]">
+                       <relatedItem type="original">
+                               <xsl:call-template name="relatedTitle"/>
+                               <xsl:call-template name="relatedName"/>
+                               <xsl:if test="marc:subfield[@code='b' or @code='c']">
+                                       <originInfo>
+                                               <xsl:for-each select="marc:subfield[@code='c']">
+                                                       <publisher>
+                                                               <xsl:value-of select="."/>
+                                                       </publisher>
+                                               </xsl:for-each>
+                                               <xsl:for-each select="marc:subfield[@code='b']">
+                                                       <edition>
+                                                               <xsl:value-of select="."/>
+                                                       </edition>
+                                               </xsl:for-each>
+                                       </originInfo>
+                               </xsl:if>
+                               <xsl:call-template name="relatedIdentifierISSN"/>
+                               <xsl:for-each select="marc:subfield[@code='z']">
+                                       <identifier type="isbn">
+                                               <xsl:value-of select="."/>
+                                       </identifier>
+                               </xsl:for-each>
+                               <xsl:call-template name="relatedNote"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='t']]">
+                       <relatedItem>
+                               <xsl:call-template name="constituentOrRelatedType"/>
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
+                                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="part"/>
+                               </titleInfo>
+                               <name type="personal">
+                                       <namePart>
+                                               <xsl:call-template name="specialSubfieldSelect">
+                                                       <xsl:with-param name="anyCodes">aq</xsl:with-param>
+                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                       <xsl:with-param name="beforeCodes">g</xsl:with-param>
+                                               </xsl:call-template>
+                                       </namePart>
+                                       <xsl:call-template name="termsOfAddress"/>
+                                       <xsl:call-template name="nameDate"/>
+                                       <xsl:call-template name="role"/>
+                               </name>
+                               <xsl:call-template name="relatedForm"/>
+                               <xsl:call-template name="relatedIdentifierISSN"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=710][marc:subfield[@code='t']]">
+                       <relatedItem>
+                               <xsl:call-template name="constituentOrRelatedType"/>
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
+                                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                                       <xsl:with-param name="afterCodes">dg</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="relatedPartNumName"/>
+                               </titleInfo>
+                               <name type="corporate">
+                                       <xsl:for-each select="marc:subfield[@code='a']">
+                                               <namePart>
+                                                       <xsl:value-of select="."/>
+                                               </namePart>
+                                       </xsl:for-each>
+                                       <xsl:for-each select="marc:subfield[@code='b']">
+                                               <namePart>
+                                                       <xsl:value-of select="."/>
+                                               </namePart>
+                                       </xsl:for-each>
+                                       <xsl:variable name="tempNamePart">
+                                               <xsl:call-template name="specialSubfieldSelect">
+                                                       <xsl:with-param name="anyCodes">c</xsl:with-param>
+                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                       <xsl:with-param name="beforeCodes">dgn</xsl:with-param>
+                                               </xsl:call-template>
+                                       </xsl:variable>
+                                       <xsl:if test="normalize-space($tempNamePart)">
+                                               <namePart>
+                                                       <xsl:value-of select="$tempNamePart"/>
+                                               </namePart>
+                                       </xsl:if>
+                                       <xsl:call-template name="role"/>
+                               </name>
+                               <xsl:call-template name="relatedForm"/>
+                               <xsl:call-template name="relatedIdentifierISSN"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=711][marc:subfield[@code='t']]">
+                       <relatedItem>
+                               <xsl:call-template name="constituentOrRelatedType"/>
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="anyCodes">tfklsv</xsl:with-param>
+                                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="relatedPartNumName"/>
+                               </titleInfo>
+                               <name type="conference">
+                                       <namePart>
+                                               <xsl:call-template name="specialSubfieldSelect">
+                                                       <xsl:with-param name="anyCodes">aqdc</xsl:with-param>
+                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                       <xsl:with-param name="beforeCodes">gn</xsl:with-param>
+                                               </xsl:call-template>
+                                       </namePart>
+                               </name>
+                               <xsl:call-template name="relatedForm"/>
+                               <xsl:call-template name="relatedIdentifierISSN"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=730][@ind2=2]">
+                       <relatedItem>
+                               <xsl:call-template name="constituentOrRelatedType"/>
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="subfieldSelect">
+                                                                       <xsl:with-param name="codes">adfgklmorsv</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="part"/>
+                               </titleInfo>
+                               <xsl:call-template name="relatedForm"/>
+                               <xsl:call-template name="relatedIdentifierISSN"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=740][@ind2=2]">
+                       <relatedItem>
+                               <xsl:call-template name="constituentOrRelatedType"/>
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="part"/>
+                               </titleInfo>
+                               <xsl:call-template name="relatedForm"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=760]|marc:datafield[@tag=762]">
+                       <relatedItem type="series">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=765]|marc:datafield[@tag=767]|marc:datafield[@tag=777]|marc:datafield[@tag=787]">
+                       <relatedItem>
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=775]">
+                       <relatedItem type="otherVersion">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=770]|marc:datafield[@tag=774]">
+                       <relatedItem type="constituent">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=772]|marc:datafield[@tag=773]">
+                       <relatedItem type="host">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=776]">
+                       <relatedItem type="otherFormat">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=780]">
+                       <relatedItem type="preceding">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=785]">
+                       <relatedItem type="succeeding">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=786]">
+                       <relatedItem type="original">
+                               <xsl:call-template name="relatedItem76X-78X"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=800]">
+                       <relatedItem type="series">
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
+                                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="part"/>
+                               </titleInfo>
+                               <name type="personal">
+                                       <namePart>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="anyCodes">aq</xsl:with-param>
+                                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                                       <xsl:with-param name="beforeCodes">g</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </namePart>
+                                       <xsl:call-template name="termsOfAddress"/>
+                                       <xsl:call-template name="nameDate"/>
+                                       <xsl:call-template name="role"/>
+                               </name>
+                               <xsl:call-template name="relatedForm"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=810]">
+                       <relatedItem type="series">
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="anyCodes">tfklmorsv</xsl:with-param>
+                                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                                       <xsl:with-param name="afterCodes">dg</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="relatedPartNumName"/>
+                               </titleInfo>
+                               <name type="corporate">
+                                       <xsl:for-each select="marc:subfield[@code='a']">
+                                               <namePart>
+                                                       <xsl:value-of select="."/>
+                                               </namePart>
+                                       </xsl:for-each>
+                                       <xsl:for-each select="marc:subfield[@code='b']">
+                                               <namePart>
+                                                       <xsl:value-of select="."/>
+                                               </namePart>
+                                       </xsl:for-each>
+                                       <namePart>
+                                               <xsl:call-template name="specialSubfieldSelect">
+                                                       <xsl:with-param name="anyCodes">c</xsl:with-param>
+                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                       <xsl:with-param name="beforeCodes">dgn</xsl:with-param>
+                                               </xsl:call-template>
+                                       </namePart>
+                                       <xsl:call-template name="role"/>
+                               </name>
+                               <xsl:call-template name="relatedForm"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=811]">
+                       <relatedItem type="series">
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="specialSubfieldSelect">
+                                                                       <xsl:with-param name="anyCodes">tfklsv</xsl:with-param>
+                                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                                       <xsl:with-param name="afterCodes">g</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="relatedPartNumName"/>
+                               </titleInfo>
+                               <name type="conference">
+                                       <namePart>
+                                               <xsl:call-template name="specialSubfieldSelect">
+                                                       <xsl:with-param name="anyCodes">aqdc</xsl:with-param>
+                                                       <xsl:with-param name="axis">t</xsl:with-param>
+                                                       <xsl:with-param name="beforeCodes">gn</xsl:with-param>
+                                               </xsl:call-template>
+                                       </namePart>
+                                       <xsl:call-template name="role"/>
+                               </name>
+                               <xsl:call-template name="relatedForm"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=830]">
+                       <relatedItem type="series">
+                               <titleInfo>
+                                       <title>
+                                               <xsl:call-template name="chopPunctuation">
+                                                       <xsl:with-param name="chopString">
+                                                               <xsl:call-template name="subfieldSelect">
+                                                                       <xsl:with-param name="codes">adfgklmorsv</xsl:with-param>
+                                                               </xsl:call-template>
+                                                       </xsl:with-param>
+                                               </xsl:call-template>
+                                       </title>
+                                       <xsl:call-template name="part"/>
+                               </titleInfo>
+                               <xsl:call-template name="relatedForm"/>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=856][@ind2=2]/marc:subfield[@code='q']">
+                       <relatedItem>
+                               <internetMediaType>
+                                       <xsl:value-of select="."/>
+                               </internetMediaType>
+                       </relatedItem>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=020]">
+                       <identifier type="isbn">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=024][@ind1=0]">
+                       <identifier type="isrc">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=024][@ind1=2]">
+                       <identifier type="ismn">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=022]">
+                       <identifier type="issn">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=010]">
+                       <identifier type="lccn">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:value-of select="normalize-space(marc:subfield[@code='a'])"/>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=028]">
+                       <identifier>
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:attribute name="type"><xsl:choose><xsl:when test="@ind1=0">issue number</xsl:when><xsl:when test="@ind1=1">matrix number</xsl:when><xsl:when test="@ind1=2">music plate</xsl:when><xsl:when test="@ind1=3">music publisher</xsl:when><xsl:when test="@ind1=4">videorecording identifier</xsl:when></xsl:choose></xsl:attribute>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">
+                                               <xsl:choose>
+                                                       <xsl:when test="@ind1=0">ba</xsl:when>
+                                                       <xsl:otherwise>ab</xsl:otherwise>
+                                               </xsl:choose>
+                                       </xsl:with-param>
+                               </xsl:call-template>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=024][@ind1='4']">
+                       <identifier type="sici">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">ab</xsl:with-param>
+                               </xsl:call-template>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=037]">
+                       <identifier type="stock number">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">ab</xsl:with-param>
+                               </xsl:call-template>
+                       </identifier>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=856][marc:subfield[@code='u']]">
+                       <identifier>
+                               <xsl:attribute name="type"><xsl:choose><xsl:when test="starts-with(marc:subfield[@code='u'],'urn:doi') or starts-with(marc:subfield[@code='u'],'doi')">doi</xsl:when><xsl:when test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl') or starts-with(marc:subfield[@code='u'],'http://hdl.loc.gov')">hdl</xsl:when><xsl:otherwise>uri</xsl:otherwise></xsl:choose></xsl:attribute>
+                               <xsl:choose>
+                                       <xsl:when test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl') or starts-with(marc:subfield[@code='u'],'http://hdl.loc.gov') ">
+                                               <xsl:value-of select="concat('hdl:',substring-after(marc:subfield[@code='u'],'http://hdl.loc.gov/'))"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:value-of select="marc:subfield[@code='u']"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </identifier>
+                       <xsl:if test="starts-with(marc:subfield[@code='u'],'urn:hdl') or starts-with(marc:subfield[@code='u'],'hdl')">
+                               <identifier type="hdl">
+                                       <xsl:if test="marc:subfield[@code='y' or @code='3' or @code='z']">
+                                               <xsl:attribute name="displayLabel"><xsl:call-template name="subfieldSelect"><xsl:with-param name="codes">y3z</xsl:with-param></xsl:call-template></xsl:attribute>
+                                       </xsl:if>
+                                       <xsl:value-of select="concat('hdl:',substring-after(marc:subfield[@code='u'],'http://hdl.loc.gov/'))"/>
+                               </identifier>
+                       </xsl:if>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=024][@ind1=1]">
+                       <identifier type="upc">
+                               <xsl:call-template name="isInvalid"/>
+                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                       </identifier>
+               </xsl:for-each>
+               <!-- 1/04 fix added $y -->
+               <xsl:for-each select="marc:datafield[@tag=856][marc:subfield[@code='u']]">
+                       <location>
+                               <url>
+                                       <xsl:if test="marc:subfield[@code='y' or @code='3']">
+                                               <xsl:attribute name="displayLabel"><xsl:call-template name="subfieldSelect"><xsl:with-param name="codes">y3</xsl:with-param></xsl:call-template></xsl:attribute>
+                                       </xsl:if>
+                                       <xsl:value-of select="marc:subfield[@code='u']"/>
+                               </url>
+                       </location>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=852]">
+                       <location>
+                               <physicalLocation>
+                                       <xsl:call-template name="displayLabel"/>
+                                       <xsl:call-template name="subfieldSelect">
+                                               <xsl:with-param name="codes">abje</xsl:with-param>
+                                       </xsl:call-template>
+                               </physicalLocation>
+                       </location>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=506]">
+                       <accessCondition type="restrictionOnAccess">
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">abcd35</xsl:with-param>
+                               </xsl:call-template>
+                       </accessCondition>
+               </xsl:for-each>
+               <xsl:for-each select="marc:datafield[@tag=540]">
+                       <accessCondition type="useAndReproduction">
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">abcde35</xsl:with-param>
+                               </xsl:call-template>
+                       </accessCondition>
+               </xsl:for-each>
+               <recordInfo>
+                       <xsl:for-each select="marc:datafield[@tag=040]">
+                               <recordContentSource authority="marcorg">
+                                       <xsl:value-of select="marc:subfield[@code='a']"/>
+                               </recordContentSource>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:controlfield[@tag=008]">
+                               <recordCreationDate encoding="marc">
+                                       <xsl:value-of select="substring(.,1,6)"/>
+                               </recordCreationDate>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:controlfield[@tag=005]">
+                               <recordChangeDate encoding="iso8601">
+                                       <xsl:value-of select="."/>
+                               </recordChangeDate>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:controlfield[@tag=001]">
+                               <recordIdentifier>
+                                       <xsl:if test="../marc:controlfield[@tag=003]">
+                                               <xsl:attribute name="source"><xsl:value-of select="../marc:controlfield[@tag=003]"/></xsl:attribute>
+                                       </xsl:if>
+                                       <xsl:value-of select="."/>
+                               </recordIdentifier>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:datafield[@tag=040]/marc:subfield[@code='b']">
+                               <languageOfCataloging>
+                                       <languageTerm authority="iso639-2b" type="code">
+                                               <xsl:value-of select="."/>
+                                       </languageTerm>
+                               </languageOfCataloging>
+                       </xsl:for-each>
+               </recordInfo>
+       </xsl:template>
+       <xsl:template name="displayForm">
+               <xsl:for-each select="marc:subfield[@code='c']">
+                       <displayForm>
+                               <xsl:value-of select="."/>
+                       </displayForm>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="affiliation">
+               <xsl:for-each select="marc:subfield[@code='u']">
+                       <affiliation>
+                               <xsl:value-of select="."/>
+                       </affiliation>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="uri">
+               <xsl:for-each select="marc:subfield[@code='u']">
+                       <xsl:attribute name="xlink:href"><xsl:value-of select="."/></xsl:attribute>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="role">
+               <xsl:for-each select="marc:subfield[@code='e']">
+                       <role>
+                               <roleTerm type="text">
+                                       <xsl:value-of select="."/>
+                               </roleTerm>
+                       </role>
+               </xsl:for-each>
+               <xsl:for-each select="marc:subfield[@code='4']">
+                       <role>
+                               <roleTerm authority="marcrelator" type="code">
+                                       <xsl:value-of select="."/>
+                               </roleTerm>
+                       </role>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="part">
+               <xsl:variable name="partNumber">
+                       <xsl:call-template name="specialSubfieldSelect">
+                               <xsl:with-param name="axis">n</xsl:with-param>
+                               <xsl:with-param name="anyCodes">n</xsl:with-param>
+                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
+                       </xsl:call-template>
+               </xsl:variable>
+               <xsl:variable name="partName">
+                       <xsl:call-template name="specialSubfieldSelect">
+                               <xsl:with-param name="axis">p</xsl:with-param>
+                               <xsl:with-param name="anyCodes">p</xsl:with-param>
+                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
+                       </xsl:call-template>
+               </xsl:variable>
+               <xsl:if test="string-length(normalize-space($partNumber))">
+                       <partNumber>
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString" select="$partNumber"/>
+                               </xsl:call-template>
+                       </partNumber>
+               </xsl:if>
+               <xsl:if test="string-length(normalize-space($partName))">
+                       <partName>
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString" select="$partName"/>
+                               </xsl:call-template>
+                       </partName>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="relatedPart">
+               <xsl:if test="@tag=773">
+                       <xsl:for-each select="marc:subfield[@code='g']">
+                               <part>
+                                       <text>
+                                               <xsl:value-of select="."/>
+                                       </text>
+                               </part>
+                       </xsl:for-each>
+                       <xsl:for-each select="marc:subfield[@code='q']">
+                               <part>
+                                       <xsl:call-template name="parsePart"/>
+                               </part>
+                       </xsl:for-each>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="relatedPartNumName">
+               <xsl:variable name="partNumber">
+                       <xsl:call-template name="specialSubfieldSelect">
+                               <xsl:with-param name="axis">g</xsl:with-param>
+                               <xsl:with-param name="anyCodes">g</xsl:with-param>
+                               <xsl:with-param name="afterCodes">pst</xsl:with-param>
+                       </xsl:call-template>
+               </xsl:variable>
+               <xsl:variable name="partName">
+                       <xsl:call-template name="specialSubfieldSelect">
+                               <xsl:with-param name="axis">p</xsl:with-param>
+                               <xsl:with-param name="anyCodes">p</xsl:with-param>
+                               <xsl:with-param name="afterCodes">fgkdlmor</xsl:with-param>
+                       </xsl:call-template>
+               </xsl:variable>
+               <xsl:if test="string-length(normalize-space($partNumber))">
+                       <partNumber>
+                               <xsl:value-of select="$partNumber"/>
+                       </partNumber>
+               </xsl:if>
+               <xsl:if test="string-length(normalize-space($partName))">
+                       <partName>
+                               <xsl:value-of select="$partName"/>
+                       </partName>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="relatedName">
+               <xsl:for-each select="marc:subfield[@code='a']">
+                       <name>
+                               <namePart>
+                                       <xsl:value-of select="."/>
+                               </namePart>
+                       </name>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedForm">
+               <xsl:for-each select="marc:subfield[@code='h']">
+                       <physicalDescription>
+                               <form>
+                                       <xsl:value-of select="."/>
+                               </form>
+                       </physicalDescription>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedExtent">
+               <xsl:for-each select="marc:subfield[@code='h']">
+                       <physicalDescription>
+                               <extent>
+                                       <xsl:value-of select="."/>
+                               </extent>
+                       </physicalDescription>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedNote">
+               <xsl:for-each select="marc:subfield[@code='n']">
+                       <note>
+                               <xsl:value-of select="."/>
+                       </note>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedSubject">
+               <xsl:for-each select="marc:subfield[@code='j']">
+                       <subject>
+                               <temporal encoding="iso8601">
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString" select="."/>
+                                       </xsl:call-template>
+                               </temporal>
+                       </subject>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedIdentifierISSN">
+               <xsl:for-each select="marc:subfield[@code='x']">
+                       <identifier type="issn">
+                               <xsl:value-of select="."/>
+                       </identifier>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedIdentifierLocal">
+               <xsl:for-each select="marc:subfield[@code='w']">
+                       <identifier type="local">
+                               <xsl:value-of select="."/>
+                       </identifier>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedIdentifier">
+               <xsl:for-each select="marc:subfield[@code='o']">
+                       <identifier>
+                               <xsl:value-of select="."/>
+                       </identifier>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedItem76X-78X">
+               <xsl:call-template name="displayLabel"/>
+               <xsl:call-template name="relatedTitle76X-78X"/>
+               <xsl:call-template name="relatedName"/>
+               <xsl:call-template name="relatedOriginInfo"/>
+               <xsl:call-template name="relatedLanguage"/>
+               <xsl:call-template name="relatedExtent"/>
+               <xsl:call-template name="relatedNote"/>
+               <xsl:call-template name="relatedSubject"/>
+               <xsl:call-template name="relatedIdentifier"/>
+               <xsl:call-template name="relatedIdentifierISSN"/>
+               <xsl:call-template name="relatedIdentifierLocal"/>
+               <xsl:call-template name="relatedPart"/>
+       </xsl:template>
+       <xsl:template name="subjectGeographicZ">
+               <geographic>
+                       <xsl:call-template name="chopPunctuation">
+                               <xsl:with-param name="chopString" select="."/>
+                       </xsl:call-template>
+               </geographic>
+       </xsl:template>
+       <xsl:template name="subjectTemporalY">
+               <temporal>
+                       <xsl:call-template name="chopPunctuation">
+                               <xsl:with-param name="chopString" select="."/>
+                       </xsl:call-template>
+               </temporal>
+       </xsl:template>
+       <xsl:template name="subjectTopic">
+               <topic>
+                       <xsl:call-template name="chopPunctuation">
+                               <xsl:with-param name="chopString" select="."/>
+                       </xsl:call-template>
+               </topic>
+       </xsl:template>
+       <xsl:template name="nameABCDN">
+               <xsl:for-each select="marc:subfield[@code='a']">
+                       <namePart>
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString" select="."/>
+                               </xsl:call-template>
+                       </namePart>
+               </xsl:for-each>
+               <xsl:for-each select="marc:subfield[@code='b']">
+                       <namePart>
+                               <xsl:value-of select="."/>
+                       </namePart>
+               </xsl:for-each>
+               <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
+                       <namePart>
+                               <xsl:call-template name="subfieldSelect">
+                                       <xsl:with-param name="codes">cdn</xsl:with-param>
+                               </xsl:call-template>
+                       </namePart>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="nameABCDQ">
+               <namePart>
+                       <xsl:call-template name="chopPunctuation">
+                               <xsl:with-param name="chopString">
+                                       <xsl:call-template name="subfieldSelect">
+                                               <xsl:with-param name="codes">aq</xsl:with-param>
+                                       </xsl:call-template>
+                               </xsl:with-param>
+                               <xsl:with-param name="punctuation">
+                                       <xsl:text>:,;/ </xsl:text>
+                               </xsl:with-param>
+                       </xsl:call-template>
+               </namePart>
+               <xsl:call-template name="termsOfAddress"/>
+               <xsl:call-template name="nameDate"/>
+       </xsl:template>
+       <xsl:template name="nameACDEQ">
+               <namePart>
+                       <xsl:call-template name="subfieldSelect">
+                               <xsl:with-param name="codes">acdeq</xsl:with-param>
+                       </xsl:call-template>
+               </namePart>
+       </xsl:template>
+       <xsl:template name="constituentOrRelatedType">
+               <xsl:if test="@ind2=2">
+                       <xsl:attribute name="type">constituent</xsl:attribute>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="relatedTitle">
+               <xsl:for-each select="marc:subfield[@code='t']">
+                       <titleInfo>
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="."/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                       </titleInfo>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedTitle76X-78X">
+               <xsl:for-each select="marc:subfield[@code='t']">
+                       <titleInfo>
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="."/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
+                                       <xsl:call-template name="relatedPartNumName"/>
+                               </xsl:if>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:subfield[@code='p']">
+                       <titleInfo type="abbreviated">
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="."/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
+                                       <xsl:call-template name="relatedPartNumName"/>
+                               </xsl:if>
+                       </titleInfo>
+               </xsl:for-each>
+               <xsl:for-each select="marc:subfield[@code='s']">
+                       <titleInfo type="uniform">
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:value-of select="."/>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </title>
+                               <xsl:if test="marc:datafield[@tag!=773]and marc:subfield[@code='g']">
+                                       <xsl:call-template name="relatedPartNumName"/>
+                               </xsl:if>
+                       </titleInfo>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="relatedOriginInfo">
+               <xsl:if test="marc:subfield[@code='b' or @code='d'] or marc:subfield[@code='f']">
+                       <originInfo>
+                               <xsl:if test="@tag=775">
+                                       <xsl:for-each select="marc:subfield[@code='f']">
+                                               <place>
+                                                       <placeTerm>
+                                                               <xsl:attribute name="type">code</xsl:attribute>
+                                                               <xsl:attribute name="authority">marcgac</xsl:attribute>
+                                                               <xsl:value-of select="."/>
+                                                       </placeTerm>
+                                               </place>
+                                       </xsl:for-each>
+                               </xsl:if>
+                               <xsl:for-each select="marc:subfield[@code='d']">
+                                       <publisher>
+                                               <xsl:value-of select="."/>
+                                       </publisher>
+                               </xsl:for-each>
+                               <xsl:for-each select="marc:subfield[@code='b']">
+                                       <edition>
+                                               <xsl:value-of select="."/>
+                                       </edition>
+                               </xsl:for-each>
+                       </originInfo>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="relatedLanguage">
+               <xsl:for-each select="marc:subfield[@code='e']">
+                       <xsl:call-template name="getLanguage">
+                               <xsl:with-param name="langString">
+                                       <xsl:value-of select="."/>
+                               </xsl:with-param>
+                       </xsl:call-template>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="nameDate">
+               <xsl:for-each select="marc:subfield[@code='d']">
+                       <namePart type="date">
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString" select="."/>
+                               </xsl:call-template>
+                       </namePart>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="subjectAuthority">
+               <xsl:if test="@ind2!=4">
+                       <xsl:if test="@ind2!=' '">
+                               <xsl:if test="@ind2!=8">
+                                       <xsl:if test="@ind2!=9">
+                                               <xsl:attribute name="authority"><xsl:choose><xsl:when test="@ind2=0">lcsh</xsl:when><xsl:when test="@ind2=1">lcshac</xsl:when><xsl:when test="@ind2=2">mesh</xsl:when><!-- 1/04 fix --><xsl:when test="@ind2=3">nal</xsl:when><xsl:when test="@ind2=5">csh</xsl:when><xsl:when test="@ind2=6">rvm</xsl:when><xsl:when test="@ind2=7"><xsl:value-of select="marc:subfield[@code='2']"/></xsl:when></xsl:choose></xsl:attribute>
+                                       </xsl:if>
+                               </xsl:if>
+                       </xsl:if>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="subjectAnyOrder">
+               <xsl:for-each select="marc:subfield[@code='v' or @code='x' or @code='y' or @code='z']">
+                       <xsl:choose>
+                               <xsl:when test="@code='v'">
+                                       <xsl:call-template name="subjectTopic"/>
+                               </xsl:when>
+                               <xsl:when test="@code='x'">
+                                       <xsl:call-template name="subjectTopic"/>
+                               </xsl:when>
+                               <xsl:when test="@code='y'">
+                                       <xsl:call-template name="subjectTemporalY"/>
+                               </xsl:when>
+                               <xsl:when test="@code='z'">
+                                       <xsl:call-template name="subjectGeographicZ"/>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:for-each>
+       </xsl:template>
+       <xsl:template name="specialSubfieldSelect">
+               <xsl:param name="anyCodes"/>
+               <xsl:param name="axis"/>
+               <xsl:param name="beforeCodes"/>
+               <xsl:param name="afterCodes"/>
+               <xsl:variable name="str">
+                       <xsl:for-each select="marc:subfield">
+                               <xsl:if test="contains($anyCodes, @code)      or (contains($beforeCodes,@code) and following-sibling::marc:subfield[@code=$axis])      or (contains($afterCodes,@code) and preceding-sibling::marc:subfield[@code=$axis])">
+                                       <xsl:value-of select="text()"/>
+                                       <xsl:text> </xsl:text>
+                               </xsl:if>
+                       </xsl:for-each>
+               </xsl:variable>
+               <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=600]">
+               <subject>
+                       <xsl:call-template name="subjectAuthority"/>
+                       <name type="personal">
+                               <xsl:call-template name="termsOfAddress"/>
+                               <namePart>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:call-template name="subfieldSelect">
+                                                               <xsl:with-param name="codes">aq</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                               </namePart>
+                               <xsl:call-template name="nameDate"/>
+                               <xsl:call-template name="affiliation"/>
+                               <xsl:call-template name="role"/>
+                       </name>
+                       <xsl:call-template name="subjectAnyOrder"/>
+               </subject>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=610]">
+               <subject>
+                       <xsl:call-template name="subjectAuthority"/>
+                       <name type="corporate">
+                               <xsl:for-each select="marc:subfield[@code='a']">
+                                       <namePart>
+                                               <xsl:value-of select="."/>
+                                       </namePart>
+                               </xsl:for-each>
+                               <xsl:for-each select="marc:subfield[@code='b']">
+                                       <namePart>
+                                               <xsl:value-of select="."/>
+                                       </namePart>
+                               </xsl:for-each>
+                               <xsl:if test="marc:subfield[@code='c' or @code='d' or @code='n' or @code='p']">
+                                       <namePart>
+                                               <xsl:call-template name="subfieldSelect">
+                                                       <xsl:with-param name="codes">cdnp</xsl:with-param>
+                                               </xsl:call-template>
+                                       </namePart>
+                               </xsl:if>
+                               <xsl:call-template name="role"/>
+                       </name>
+                       <xsl:call-template name="subjectAnyOrder"/>
+               </subject>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=611]">
+               <subject>
+                       <xsl:call-template name="subjectAuthority"/>
+                       <name type="conference">
+                               <namePart>
+                                       <xsl:call-template name="subfieldSelect">
+                                               <xsl:with-param name="codes">abcdeqnp</xsl:with-param>
+                                       </xsl:call-template>
+                               </namePart>
+                               <xsl:for-each select="marc:subfield[@code='4']">
+                                       <role>
+                                               <roleTerm authority="marcrelator" type="code">
+                                                       <xsl:value-of select="."/>
+                                               </roleTerm>
+                                       </role>
+                               </xsl:for-each>
+                       </name>
+                       <xsl:call-template name="subjectAnyOrder"/>
+               </subject>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=630]">
+               <subject>
+                       <xsl:call-template name="subjectAuthority"/>
+                       <titleInfo>
+                               <title>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString">
+                                                       <xsl:call-template name="subfieldSelect">
+                                                               <xsl:with-param name="codes">adfhklor</xsl:with-param>
+                                                       </xsl:call-template>
+                                               </xsl:with-param>
+                                       </xsl:call-template>
+                                       <xsl:call-template name="part"/>
+                               </title>
+                       </titleInfo>
+                       <xsl:call-template name="subjectAnyOrder"/>
+               </subject>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=650]">
+               <subject>
+                       <xsl:call-template name="subjectAuthority"/>
+                       <topic>
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString">
+                                               <xsl:call-template name="subfieldSelect">
+                                                       <xsl:with-param name="codes">abcd</xsl:with-param>
+                                               </xsl:call-template>
+                                       </xsl:with-param>
+                               </xsl:call-template>
+                       </topic>
+                       <xsl:call-template name="subjectAnyOrder"/>
+               </subject>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=651]">
+               <subject>
+                       <xsl:call-template name="subjectAuthority"/>
+                       <xsl:for-each select="marc:subfield[@code='a']">
+                               <geographic>
+                                       <xsl:call-template name="chopPunctuation">
+                                               <xsl:with-param name="chopString" select="."/>
+                                       </xsl:call-template>
+                               </geographic>
+                       </xsl:for-each>
+                       <xsl:call-template name="subjectAnyOrder"/>
+               </subject>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=653]">
+               <subject>
+                       <xsl:for-each select="marc:subfield[@code='a']">
+                               <topic>
+                                       <xsl:value-of select="."/>
+                               </topic>
+                       </xsl:for-each>
+               </subject>
+       </xsl:template>
+       <xsl:template match="marc:datafield[@tag=656]">
+               <subject>
+                       <xsl:if test="marc:subfield[@code=2]">
+                               <xsl:attribute name="authority"><xsl:value-of select="marc:subfield[@code=2]"/></xsl:attribute>
+                       </xsl:if>
+                       <occupation>
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString">
+                                               <xsl:value-of select="marc:subfield[@code='a']"/>
+                                       </xsl:with-param>
+                               </xsl:call-template>
+                       </occupation>
+               </subject>
+       </xsl:template>
+       <xsl:template name="termsOfAddress">
+               <xsl:if test="marc:subfield[@code='b' or @code='c']">
+                       <namePart type="termsOfAddress">
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString">
+                                               <xsl:call-template name="subfieldSelect">
+                                                       <xsl:with-param name="codes">bc</xsl:with-param>
+                                               </xsl:call-template>
+                                       </xsl:with-param>
+                               </xsl:call-template>
+                       </namePart>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="displayLabel">
+               <xsl:if test="marc:subfield[@code='i']">
+                       <xsl:attribute name="displayLabel"><xsl:value-of select="marc:subfield[@code='i']"/></xsl:attribute>
+               </xsl:if>
+               <xsl:if test="marc:subfield[@code='3']">
+                       <xsl:attribute name="displayLabel"><xsl:value-of select="marc:subfield[@code='3']"/></xsl:attribute>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="isInvalid">
+               <xsl:if test="marc:subfield[@code='z']">
+                       <xsl:attribute name="invalid">yes</xsl:attribute>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="subtitle">
+               <xsl:if test="marc:subfield[@code='b']">
+                       <subTitle>
+                               <xsl:call-template name="chopPunctuation">
+                                       <xsl:with-param name="chopString">
+                                               <xsl:value-of select="marc:subfield[@code='b']"/>
+                                               <!--<xsl:call-template name="subfieldSelect">
+                                                       <xsl:with-param name="codes">b</xsl:with-param>                                                                 
+                                               </xsl:call-template>-->
+                                       </xsl:with-param>
+                               </xsl:call-template>
+                       </subTitle>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="script">
+               <xsl:param name="scriptCode"/>
+               <xsl:attribute name="script"><xsl:choose><xsl:when test="$scriptCode='(3'">Arabic</xsl:when><xsl:when test="$scriptCode='(B'">Latin</xsl:when><xsl:when test="$scriptCode='$1'">Chinese, Japanese, Korean</xsl:when><xsl:when test="$scriptCode='(N'">Cyrillic</xsl:when><xsl:when test="$scriptCode='(2'">Hebrew</xsl:when><xsl:when test="$scriptCode='(S'">Greek</xsl:when></xsl:choose></xsl:attribute>
+       </xsl:template>
+       <xsl:template name="parsePart">
+               <!-- assumes 773$q= 1:2:3<4
+                    with up to 3 levels and one optional start page
+               -->
+               <xsl:variable name="level1">
+                       <xsl:choose>
+                               <xsl:when test="contains(text(),':')">
+                                       <!-- 1:2 -->
+                                       <xsl:value-of select="substring-before(text(),':')"/>
+                               </xsl:when>
+                               <xsl:when test="not(contains(text(),':'))">
+                                       <!-- 1 or 1<3 -->
+                                       <xsl:if test="contains(text(),'&lt;')">
+                                               <!-- 1<3 -->
+                                               <xsl:value-of select="substring-before(text(),'&lt;')"/>
+                                       </xsl:if>
+                                       <xsl:if test="not(contains(text(),'&lt;'))">
+                                               <!-- 1 -->
+                                               <xsl:value-of select="text()"/>
+                                       </xsl:if>
+                               </xsl:when>
+                       </xsl:choose>
+               </xsl:variable>
+               <xsl:variable name="sici2">
+                       <xsl:choose>
+                               <xsl:when test="starts-with(substring-after(text(),$level1),':')">
+                                       <xsl:value-of select="substring(substring-after(text(),$level1),2)"/>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <xsl:value-of select="substring-after(text(),$level1)"/>
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </xsl:variable>
+               <xsl:variable name="level2">
+                       <xsl:choose>
+                               <xsl:when test="contains($sici2,':')">
+                                       <!--  2:3<4  -->
+                                       <xsl:value-of select="substring-before($sici2,':')"/>
+                               </xsl:when>
+                               <xsl:when test="contains($sici2,'&lt;')">
+                                       <!-- 1: 2<4 -->
+                                       <xsl:value-of select="substring-before($sici2,'&lt;')"/>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <xsl:value-of select="$sici2"/>
+                                       <!-- 1:2 -->
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </xsl:variable>
+               <xsl:variable name="sici3">
+                       <xsl:choose>
+                               <xsl:when test="starts-with(substring-after($sici2,$level2),':')">
+                                       <xsl:value-of select="substring(substring-after($sici2,$level2),2)"/>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <xsl:value-of select="substring-after($sici2,$level2)"/>
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </xsl:variable>
+               <xsl:variable name="level3">
+                       <xsl:choose>
+                               <xsl:when test="contains($sici3,'&lt;')">
+                                       <!-- 2<4 -->
+                                       <xsl:value-of select="substring-before($sici3,'&lt;')"/>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <xsl:value-of select="$sici3"/>
+                                       <!-- 3 -->
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </xsl:variable>
+               <xsl:variable name="page">
+                       <xsl:if test="contains(text(),'&lt;')">
+                               <xsl:value-of select="substring-after(text(),'&lt;')"/>
+                       </xsl:if>
+               </xsl:variable>
+               <xsl:if test="$level1">
+                       <detail level="1">
+                               <number>
+                                       <xsl:value-of select="$level1"/>
+                               </number>
+                       </detail>
+               </xsl:if>
+               <xsl:if test="$level2">
+                       <detail level="2">
+                               <number>
+                                       <xsl:value-of select="$level2"/>
+                               </number>
+                       </detail>
+               </xsl:if>
+               <xsl:if test="$level3">
+                       <detail level="3">
+                               <number>
+                                       <xsl:value-of select="$level3"/>
+                               </number>
+                       </detail>
+               </xsl:if>
+               <xsl:if test="$page">
+                       <extent unit="page">
+                               <start>
+                                       <xsl:value-of select="$page"/>
+                               </start>
+                       </extent>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="getLanguage">
+               <xsl:param name="langString"/>
+               <xsl:param name="controlField008-35-37"/>
+               <xsl:variable name="length" select="string-length($langString)"/>
+               <xsl:choose>
+                       <xsl:when test="$length=0"/>
+                       <xsl:when test="$controlField008-35-37=substring($langString,1,3)">
+                               <xsl:call-template name="getLanguage">
+                                       <xsl:with-param name="langString" select="substring($langString,4,$length)"/>
+                                       <xsl:with-param name="controlField008-35-37" select="$controlField008-35-37"/>
+                               </xsl:call-template>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <language>
+                                       <languageTerm authority="iso639-2b" type="code">
+                                               <xsl:value-of select="substring($langString,1,3)"/>
+                                       </languageTerm>
+                               </language>
+                               <xsl:call-template name="getLanguage">
+                                       <xsl:with-param name="langString" select="substring($langString,4,$length)"/>
+                                       <xsl:with-param name="controlField008-35-37" select="$controlField008-35-37"/>
+                               </xsl:call-template>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+       <xsl:template name="isoLanguage">
+               <xsl:param name="currentLanguage"/>
+               <xsl:param name="usedLanguages"/>
+               <xsl:param name="remainingLanguages"/>
+               <xsl:choose>
+                       <xsl:when test="string-length($currentLanguage)=0"/>
+                       <xsl:when test="not(contains($usedLanguages, $currentLanguage))">
+                               <language>
+    <xsl:if test="@code!='a'">
+                                                       <xsl:attribute name="objectPart"><xsl:choose><xsl:when test="@code='b'">summary or subtitle</xsl:when><xsl:when test="@code='d'">sung or spoken text</xsl:when><xsl:when test="@code='e'">libretto</xsl:when><xsl:when test="@code='f'">table of contents</xsl:when><xsl:when test="@code='g'">accompanying material</xsl:when><xsl:when test="@code='h'">translation</xsl:when></xsl:choose></xsl:attribute>
+                               </xsl:if>
+    <languageTerm authority="iso639-2b" type="code">
+                                               <xsl:value-of select="$currentLanguage"/>
+                               </languageTerm>
+    </language>
+                               <xsl:call-template name="isoLanguage">
+                                       <xsl:with-param name="currentLanguage">
+                                               <xsl:value-of select="substring($remainingLanguages,1,3)"/>
+                                       </xsl:with-param>
+                                       <xsl:with-param name="usedLanguages">
+                                               <xsl:value-of select="concat($usedLanguages,$currentLanguage)"/>
+                                       </xsl:with-param>
+                                       <xsl:with-param name="remainingLanguages">
+                                               <xsl:value-of select="substring($remainingLanguages,4,string-length($remainingLanguages))"/>
+                                       </xsl:with-param>
+                               </xsl:call-template>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:call-template name="isoLanguage">
+                                       <xsl:with-param name="currentLanguage">
+                                               <xsl:value-of select="substring($remainingLanguages,1,3)"/>
+                                       </xsl:with-param>
+                                       <xsl:with-param name="usedLanguages">
+                                               <xsl:value-of select="concat($usedLanguages,$currentLanguage)"/>
+                                       </xsl:with-param>
+                                       <xsl:with-param name="remainingLanguages">
+                                               <xsl:value-of select="substring($remainingLanguages,4,string-length($remainingLanguages))"/>
+                                       </xsl:with-param>
+                               </xsl:call-template>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+       <xsl:template name="chopBrackets">
+               <xsl:param name="chopString"/>
+               <xsl:variable name="string">
+                       <xsl:call-template name="chopPunctuation">
+                               <xsl:with-param name="chopString" select="$chopString"/>
+                       </xsl:call-template>
+               </xsl:variable>
+               <xsl:if test="substring($string, 1,1)='['">
+                       <xsl:value-of select="substring($string,2, string-length($string)-2)"/>
+               </xsl:if>
+               <xsl:if test="substring($string, 1,1)!='['">
+                       <xsl:value-of select="$string"/>
+               </xsl:if>
+       </xsl:template>
+       <xsl:template name="rfcLanguages">
+               <xsl:param name="nodeNum"/>
+               <xsl:param name="usedLanguages"/>
+               <xsl:param name="controlField008-35-37"/>
+               <xsl:variable name="currentLanguage" select="."/>
+               <xsl:choose>
+                       <xsl:when test="not($currentLanguage)"/>
+                       <xsl:when test="$currentLanguage!=$controlField008-35-37 and $currentLanguage!='rfc3066'">
+                               <xsl:if test="not(contains($usedLanguages,$currentLanguage))">
+                                       <language>
+       <xsl:if test="@code!='a'">
+                                                               <xsl:attribute name="objectPart"><xsl:choose><xsl:when test="@code='b'">summary or subtitle</xsl:when><xsl:when test="@code='d'">sung or spoken text</xsl:when><xsl:when test="@code='e'">libretto</xsl:when><xsl:when test="@code='f'">table of contents</xsl:when><xsl:when test="@code='g'">accompanying material</xsl:when><xsl:when test="@code='h'">translation</xsl:when></xsl:choose></xsl:attribute>
+                                                       </xsl:if>
+       <languageTerm authority="rfc3066" type="code">
+                                                       <xsl:value-of select="$currentLanguage"/>
+                                               </languageTerm>
+     </language>
+                               </xsl:if>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+</xsl:stylesheet>
+
+<!-- Stylus Studio meta-information - (c) 2004-2005. Progress Software Corporation. All rights reserved.
+<metaInformation>
+<scenarios ><scenario default="no" name="Apr 02 Test" userelativepaths="yes" externalpreview="no" url="file:///n:/jackie/test_files/v3.xml" htmlbaseurl="" outputurl="file:///n:/temp/x.xml" processortype="xalan" useresolver="no" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/><scenario default="no" name="v3Test1" userelativepaths="yes" externalpreview="no" url="file:///n:/jackie/test_files/v3.xml" htmlbaseurl="" outputurl="file:///n:/jackie/test_files/modsv3Converted.xml" processortype="internal" useresolver="no" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/><scenario default="no" name="Scenario1" userelativepaths="yes" externalpreview="no" url="file:///n:/ckeith/DESKTOP/test.xml" htmlbaseurl="" outputurl="" processortype="xalan" useresolver="no" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/><scenario default="no" name="Test" userelativepaths="yes" externalpreview="no" url="file:///n:/jackie/MARCXML/marcxmlfile.xml" htmlbaseurl="" outputurl="" processortype="xalan" useresolver="no" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/><scenario default="yes" name="z3950 package test" userelativepaths="yes" externalpreview="no" url="d.xml" htmlbaseurl="" outputurl="" processortype="xalan" useresolver="no" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/></scenarios><MapperMetaTag><MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/><MapperBlockPosition></MapperBlockPosition><TemplateContext></TemplateContext><MapperFilter side="source"></MapperFilter></MapperMetaTag>
+</metaInformation>
+--><!-- Stylus Studio meta-information - (c)1998-2003 Copyright Sonic Software Corporation. All rights reserved.
+<metaInformation>
+<scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
+</metaInformation>
+-->
\ No newline at end of file

diff --git a/misc/translator/po/prog_intranet_fr_FR.po b/misc/translator/po/prog_intranet_fr_FR.po
index b620af1..156d592 100644 (file)
--- a/misc/translator/po/prog_intranet_fr_FR.po
+++ b/misc/translator/po/prog_intranet_fr_FR.po
@@ -1,4 +1,3 @@
-# translation of prog_intranet_fr_FR.po to fr_FR
 # translation of prog_intranet_fr_FR.po to
 # translation of prog_intranet_fr_FR_10.po to
 # translation of prog_intranet_fr_FR_9.po to
@@ -17,18 +16,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: prog_intranet_fr_FR\n"
-"POT-Creation-Date: 2007-10-04 07:34+0200\n"
-"PO-Revision-Date: 2007-10-04 22:05+0200\n"
-"Last-Translator: POULAIN <paul@koha-fr.org>\n"
-"Language-Team: fr_FR\n"
+"POT-Creation-Date: 2007-10-20 19:18+0200\n"
+"PO-Revision-Date: 2007-10-20 19:18+0200\n"
+"Last-Translator: paul POULAIN <paul@koha-fr.org>\n"
+"Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "\n"
 
+#. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:425
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:415
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:362
 msgid " in tab "
 msgstr " dans l'onglet"
 
@@ -42,18 +43,15 @@ msgstr "numéro(s) attendu(s)"
 #
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:160
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:78
 msgid " mandatory fields empty (see bold subfields)"
 msgstr "champs obligatoires vides (voir les sous-champs en gras)"
 
-#
-#
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:160
-msgid " mandatory tags empty"
-msgstr "Champ(s) obligatoire(s) non renseigné(s)"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:415
+msgid " subfield "
+msgstr "sous-champs"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
@@ -73,10 +71,10 @@ msgstr ""
 "sont entrés.<br \\/>Vous sembler avoir signalé plus de numéros par an que "
 "prévu."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:154
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:156
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:258
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:156
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:259
 msgid "!- No attempt to code"
@@ -157,24 +155,6 @@ msgstr "# Abt."
 msgid "#%s"
 msgstr "N° %s"
 
-#. %1$s: TMPL_VAR name=subscriptionid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:12
-#, c-format
-msgid "#%s <a1>Serial Collection</a>"
-msgstr "#%s <a1>État de collection</a<"
-
-#. %1$s: TMPL_VAR name=subscriptionid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:14
-#, c-format
-msgid "#%s Create Routing List"
-msgstr "#%s Créer une liste de circulation"
-
-#. %1$s: TMPL_VAR name=subscriptionid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:13
-#, c-format
-msgid "#%s Edit Routing List"
-msgstr "#%s Modifier la liste de circulation"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:21
@@ -189,19 +169,19 @@ msgstr "#- blanc"
 msgid "#- National bibliographic agency"
 msgstr "#- Agence nationale bibliographique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:400
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:401
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:499
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:500
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:400
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:401
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:498
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:499
 msgid "#- No biographical material"
 msgstr "#- Pas de bibliographie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:210
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:212
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:209
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:211
 msgid "#- None of the following"
@@ -214,19 +194,19 @@ msgstr "#- Aucun des suivants"
 msgid "#- Not Modified"
 msgstr "#- Non modifié"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:178
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:180
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:275
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:277
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:178
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:180
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:274
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:276
 msgid "#- Not a government publication"
 msgstr "#- Pas une publication gouvernementale"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:149
 msgid "#- Unknown or not specified"
@@ -312,8 +292,8 @@ msgstr "#995|&lt;br&gt;Items :|{\\n995b}{ - 995j}{/995k}|"
 
 #. For the first occurrence,
 #. %1$S: type=text name=enrolmentfee
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:113
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:122
 #, c-format
 msgid "$ %S"
 msgstr "%S €"
@@ -328,8 +308,8 @@ msgstr "%S €"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=enrolmentfee
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:53
@@ -337,40 +317,20 @@ msgstr "%S €"
 msgid "$%s"
 msgstr "%s €"
 
-#. %1$S: type=text name=biblionumber
-#. %2$S: type=text name=title
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:830
-#, c-format
-msgid "%S (%S) <a1>Search for Biblio</a>"
-msgstr "%S (%S) <a1>Rechercher notice biblio</a>"
-
-#. %1$S: type=text name=aqbooksellerid
-#. %2$S: type=text name=aqbooksellername
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:825
-#, c-format
-msgid "%S (%S) <a1>Search for a Supplier</a>"
-msgstr "%S (%S) <a1>Rechercher fournisseur</a>"
-
 #. %1$S: type=text name=sublength
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1096
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1094
 #, c-format
 msgid "%S (*) (enter amount in numerals)"
 msgstr "%S (*) (Entrer la quantité en nombre)"
 
-#. %1$S: type=text name=seealso
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:30
-#, c-format
-msgid "%S (example for 200a: '200c','200d','200e'...)"
-msgstr "%S (exemple pour 200a : '200c','200d','200e'...)"
-
 #. %1$S: type=text name=link
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:88
 #, c-format
 msgid "%S (exemple:200b)"
 msgstr "%S (exemple : 200b)"
 
 #. %1$S: type=text name=hidden
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:86
 #, c-format
 msgid "%S (see online help)"
 msgstr "%S (voir aide en ligne)"
@@ -378,7 +338,7 @@ msgstr "%S (voir aide en ligne)"
 #. For the first occurrence,
 #. %1$S: type=text name=histstartdate
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:322
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1168
 #, c-format
 msgid "%S (the date of the 1st subscription)"
 msgstr "%S (Date du premier abonnement)"
@@ -411,38 +371,38 @@ msgstr "%S jours"
 #. %1$S: type=text name=basename
 #. %2$s: TMPL_VAR name=CGIextChoice
 #. %3$s: TMPL_VAR name=CGIsepChoice
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:268
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:271
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:230
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:274
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:230
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:276
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:235
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:90
 #, c-format
 msgid "%S into an application %s %s"
 msgstr "%S dans un logiciel  %s %s"
 
 #. %1$S: type=text name=enrolmentperiod
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:109
 #, c-format
 msgid "%S months"
 msgstr "%S mois"
 
 #. For the first occurrence,
 #. %1$S: type=text name=member
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:19
 #, c-format
 msgid "%S order by:"
 msgstr "%S Trié par"
 
 #. For the first occurrence,
 #. %1$S: type=text name=dateofbirthrequired
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:112
 #, c-format
 msgid "%S years"
 msgstr "%S ans"
@@ -458,13 +418,13 @@ msgstr ""
 #. For the first occurrence,
 #. %1$S: type=text name=enddate
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:323
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1172
 #, c-format
 msgid "%S(if empty : subscription still active)"
 msgstr "%S (si vide : l'abonnement est en cours)"
 
 #. %1$S: type=text name=invoice
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:271
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:270
 #, c-format
 msgid "%S(usually empty)"
 msgstr "%S (habituellement vide)"
@@ -501,12 +461,6 @@ msgstr "%p Décompte des prêts"
 msgid "%p Count items %p Amount <h3> Output </h3>"
 msgstr "%p Nombre de documents %p Montant <h3>Débit</h3>"
 
-#. %1$p: type=radio name=image value=removeImage
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:191
-#, c-format
-msgid "%p remove image"
-msgstr "%p enlever l'image"
-
 #. %1$p: type=radio name=overwrite_biblio value=0
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:59
 #, c-format
@@ -519,7 +473,9 @@ msgstr "%p Ignorer celle-ci, garder l'existante"
 msgid ""
 "%pNozebra: my catalogue is not that large and I want something simple to "
 "setup"
-msgstr "%pNozebra : mon catalogue n'est pas très gros et je veux quelque chose de simple à installer"
+msgstr ""
+"%pNozebra : mon catalogue n'est pas très gros et je veux quelque chose de "
+"simple à installer"
 
 #. %1$p: type=radio name=overwrite_biblio value=1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:61
@@ -533,7 +489,15 @@ msgstr "%p Écraser la notice existante avec celle-ci"
 msgid ""
 "%pZebra: I have a large catalogue, I'm not afraid having to setup more "
 "software on my server"
-msgstr "%pZebra : j'ai un gros catalogue, et je ne suis pas effrayé par l'installation de logiciels supplémentaires sur mon serveur"
+msgstr ""
+"%pZebra : j'ai un gros catalogue, et je ne suis pas effrayé par "
+"l'installation de logiciels supplémentaires sur mon serveur"
+
+#. %1$s: TMPL_VAR name=discount
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:184
+#, c-format
+msgid "%s %%"
+msgstr "%s %%"
 
 #. %1$s: TMPL_VAR name=borrowerfirstname
 #. %2$s: TMPL_VAR name=borrowersurname
@@ -554,11 +518,11 @@ msgstr "%s (%s jours)"
 #. %1$s: TMPL_VAR name=frameworktext
 #. %2$s: TMPL_VAR name=frameworkcode
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:163
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -566,28 +530,28 @@ msgstr "%s (%s)"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=itemtype
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:759
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:286
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:759
 #, c-format
 msgid "%s (<b> %s </b>)"
 msgstr "%s (<b>%s</b>)"
 
 #. %1$s: TMPL_VAR name=isurl
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:87
 #, c-format
 msgid "%s (if checked, it means that the subfield is an URL and can be clicked"
 msgstr " %s (coché, indique que le sous-champ est une URL valide et peut être cliqué"
 
 #. %1$s: TMPL_VAR name=isurl
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:34
 #, c-format
 msgid "%s (if checked, it means that the subfield is an URL and can be clicked)"
 msgstr " %s (coché, indique que le sous-champ est une URL valide et peut être cliqué)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:91
 #, c-format
 msgid ""
 "%s (if you select a value here, the indicators will be limited to the "
@@ -598,15 +562,15 @@ msgstr ""
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=tab
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:32
 #, c-format
 msgid "%s (ignore means that the subfield is NOT managed by Koha)"
 msgstr "%s (ignore signifie que le sous-champ n'est PAS géré par Koha)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=subfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:176
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:199
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:298
 #, c-format
@@ -614,23 +578,23 @@ msgid "%s -"
 msgstr "%s -"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=title
-#. %2$s: TMPL_VAR name=author
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:31
+#. %1$s: TMPL_VAR name=author
+#. %2$s: TMPL_VAR name=itemnotes
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:695
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:31
 #, c-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=line
-#. %2$s: TMPL_VAR name=column
+#. %1$s: TMPL_VAR name=module
+#. %2$s: TMPL_VAR name=code
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:273
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:273
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
@@ -648,6 +612,12 @@ msgstr "%s : "
 msgid "%s : %s"
 msgstr "%s : %s"
 
+#. %1$s: TMPL_VAR name=quantityreceived
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:117
+#, c-format
+msgid "%s <a1>More</a>"
+msgstr "%s <a1>Plus</a>"
+
 #. %1$s: TMPL_VAR name=fwkdescription
 #. %2$s: TMPL_VAR name=fwkname
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:114
@@ -665,14 +635,14 @@ msgstr "%s <h3>Confirmer la suppression du serveur  %s</h3>"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=crit
 #. %2$s: TMPL_VAR name=filter
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:34
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:24
 #, c-format
 msgid "%s =%s"
 msgstr "%s=%s"
@@ -683,12 +653,17 @@ msgstr "%s=%s"
 msgid "%s Checkout(s)"
 msgstr "%s prêt(s)"
 
-#. %1$s: TMPL_VAR name=biblioitemnumber
-#. %2$s: TMPL_VAR name=description
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:27
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=authtypecode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
 #, c-format
-msgid "%s GROUP - %s"
-msgstr "%s GROUPE - %s"
+msgid "%s Framework"
+msgstr "%s Grille de catalogage"
 
 #. %1$s: TMPL_VAR name=countreserv
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:619
@@ -698,7 +673,7 @@ msgstr "%s Réservations"
 
 #. %1$s: TMPL_VAR name=total
 #. %2$s: TMPL_VAR name=pagination_bar
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:52
 #, c-format
 msgid "%s Results found in catalogue. %s"
 msgstr "%s réponses trouvées dans le catalogue. %s"
@@ -710,7 +685,7 @@ msgid "%s biblio(s)"
 msgstr "%s notice(s)"
 
 #. %1$s: TMPL_VAR name=count
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:113
 #, c-format
 msgid "%s biblios"
 msgstr "%s notice(s)"
@@ -741,8 +716,8 @@ msgstr "%s donnée ajoutée"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=imported
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:23
 #, c-format
 msgid "%s imported records"
 msgstr "%s notices importées"
@@ -755,7 +730,7 @@ msgstr "%s numéros"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=count
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:230
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:223
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:211
 #, c-format
 msgid "%s item(s)"
@@ -782,8 +757,8 @@ msgstr "%s document(s) perdu(s) trouvé(s)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=enrolmentperiod
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:155
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:209
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:86
 #, c-format
 msgid "%s months"
@@ -791,24 +766,24 @@ msgstr "%s mois"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=alreadyindb
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:24
 #, c-format
 msgid "%s not imported because already in catalog"
 msgstr "%s non importé, parce que déjà dans le catalogue"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=alreadyinfarm
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:25
 #, c-format
 msgid "%s not imported because already in the reservoir"
 msgstr "%s non importé, parce que déjà dans le réservoir"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=notmarcrecord
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:26
 #, c-format
 msgid ""
 "%s not imported because they seem not to be in MARC format (or ISBN/ISSN "
@@ -851,8 +826,8 @@ msgstr "%s notice(s)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:27
 #, c-format
 msgid "%s records parsed"
 msgstr "%s notices traitées"
@@ -879,13 +854,13 @@ msgid "%s results found."
 msgstr "%s réponses trouvées."
 
 #. %1$s: TMPL_VAR name=suggestion
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:43
 #, c-format
 msgid "%s suggestions waiting <a1>Manage suggestions</a>"
 msgstr "%s suggestions en attente <a1>Traiter les suggestions</a>"
 
 #. %1$s: TMPL_VAR name=renewalsallowed
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:294
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:258
 #, c-format
 msgid "%s time(s)"
 msgstr "%s fois"
@@ -904,10 +879,10 @@ msgstr "%s semaines"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=dateofbirthrequired
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:156
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:157
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:214
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:215
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:211
 #, c-format
 msgid "%s years"
 msgstr "%s années"
@@ -927,41 +902,40 @@ msgstr "%s&nbsp;-&nbsp;%s"
 
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=author
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:94
 #, c-format
 msgid "%s(%s)"
 msgstr "%s (%s)"
 
 #. %1$s: TMPL_VAR name=collectionissn
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:170
 #, c-format
 msgid "%s)"
 msgstr "%s)"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=author
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:113
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:118
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:124
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:128
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:240
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:73
+#. %1$s: TMPL_VAR name=streetaddress
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:5
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:240
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:48
 #, c-format
 msgid "%s,"
 msgstr "%s,"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=wborsurname
-#. %2$s: TMPL_VAR name=wborfirstname
+#. %1$s: TMPL_VAR name=city
+#. %2$s: TMPL_VAR name=zipcode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:277
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:12
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -975,10 +949,10 @@ msgid "%s/%s/%s"
 msgstr "%s/%s/%s"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=html
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:554
+#. %1$s: TMPL_VAR name=itemlib
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:253
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:549
 #, c-format
 msgid "%s:"
 msgstr "%s : "
@@ -991,7 +965,7 @@ msgid "%s:%s"
 msgstr "%s : %s"
 
 #. %1$s: TMPL_VAR name=tagsubfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:55
 #, c-format
 msgid "%s?"
 msgstr "%s ?"
@@ -1016,18 +990,18 @@ msgstr "© %s"
 msgid "&copy; %s"
 msgstr "&copy; %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:90
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:145
 msgid "&gt;&gt;"
 msgstr "&gt;&gt;"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:97
 msgid "&gt;&gt;&gt;"
 msgstr ">>>"
 
@@ -1041,31 +1015,31 @@ msgid "&gt;="
 msgstr "&gt;="
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=query
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:25
+#. %1$s: TMPL_VAR name=searchdesc
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:25
 #, c-format
 msgid "&ldquo;%s&rdquo;"
 msgstr "&ldquo;%s&rdquo;"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:132
 msgid "&lt;&lt;"
 msgstr "&lt;&lt;"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:199
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:277
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:277
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:193
 msgid "&lt;&lt; Prev"
 msgstr "<< Prdt."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:130
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:219
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:220
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:23
 msgid "&lt;&lt; Previous"
 msgstr "&lt;&lt; Précédent"
 
@@ -1075,8 +1049,8 @@ msgid "&lt;&lt; Previous Page"
 msgstr "&lt;&lt; Page précédente"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:86
 msgid "&lt;&lt;&lt;"
 msgstr "<<<"
 
@@ -1151,22 +1125,22 @@ msgstr "&nbsp;&nbsp;&nbsp;&nbsp; Sujet (expression)"
 msgid "&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase"
 msgstr "&nbsp;&nbsp;&nbsp;&nbsp;Titre (expression)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:495
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:497
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:496
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:498
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:237
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:239
 msgid "&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest"
 msgstr "&nbsp;&nbsp;&nbsp;Date d'acquisition: du plus récent au plus ancien"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:500
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:502
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:501
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:503
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:242
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:244
 msgid "&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest"
 msgstr "&nbsp;&nbsp;&nbsp;DAte d'acquisition : du plus ancien au plus récent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:485
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:487
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:486
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:488
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:227
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:229
 msgid "&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest"
@@ -1174,8 +1148,8 @@ msgstr ""
 "&nbsp;&nbsp;&nbsp;Date de publication/copyright : du plus récent au plus "
 "ancien"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:490
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:492
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:491
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:493
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:232
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:234
 msgid "&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest"
@@ -1192,7 +1166,12 @@ msgstr "&nbsp;Pas de réponse."
 msgid "&nbsp;|&nbsp; <a1>phone</a> &nbsp;|&nbsp; <a2>letter</a>"
 msgstr "&nbsp;|&nbsp; <a1>téléphone</a> &nbsp;|&nbsp; <a2>lettre</a>"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:5
 msgid "&rsaquo;"
 msgstr "&rsaquo;"
 
@@ -1207,6 +1186,7 @@ msgid "&rsaquo; Add notice"
 msgstr "&rsaquo; Ajout notification"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:66
 msgid "&rsaquo; Add tag"
 msgstr "&rsaquo; Ajouter un champ"
 
@@ -1219,10 +1199,12 @@ msgid "&rsaquo; Checking out to %s, %s (%s)"
 msgstr "&rsaquo; : En prêt à, %s, %s (%s)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:2
 msgid "&rsaquo; Confirm Deletion"
 msgstr "&rsaquo; Confirmer la suppression"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:5
 msgid "&rsaquo; Data Deleted"
 msgstr "&rsaquo; Donnée supprimée"
@@ -1232,6 +1214,7 @@ msgid "&rsaquo; Modify notice"
 msgstr "&rsaquo; Modifier notification"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:65
 msgid "&rsaquo; Modify tag"
 msgstr "&rsaquo; Modifier le champ"
 
@@ -1252,14 +1235,13 @@ msgid "( ! means 'not visible' or in the case of Collapsed 'not Collapsed')"
 msgstr "(! signifie \"pas visible\" ou \"pas plié\" pour plié)"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=basketno
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:39
+#. %1$s: TMPL_VAR name=author
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:22
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
@@ -1274,12 +1256,17 @@ msgstr "(<a1>Déconnecter</a>)"
 msgid "(<a1>Set</a>) |"
 msgstr "(<a1>choisir</a>)"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:124
+#, c-format
+msgid "(<a1>View Circulation History</a>)"
+msgstr "(<a1>Historique de circulation</a>)"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:120
 msgid "(Choice, YesNo, Integer, Textarea, Float, Themes, or Languages)"
 msgstr "(Choice, YesNo,Integer,Textarea,Float,Themes, Languages)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:266
 msgid "(Derived value)"
 msgstr "(valeur dérivée)"
@@ -1328,46 +1315,46 @@ msgstr ""
 "amendes soient calculées chaque nuit.)"
 
 #. %1$s: TMPL_VAR name=biblionumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:139
 #, c-format
 msgid "(Record #%s)"
 msgstr "(Notice #%s)"
 
 #. %1$s: TMPL_VAR name=subscriptionsnumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:279
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:277
 #, c-format
 msgid "(We have %s subscriptions associated with this title)."
 msgstr "(Nous avons  %s abonnement(s) pour ce titre)."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:134
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:133
 msgid "(auto-filled from 300)"
 msgstr "(auto-rempli à partir du 300)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:198
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:304
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:142
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:248
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:198
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:304
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:304
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:198
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:304
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:248
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:11
 msgid "(auto-filled)"
 msgstr "(auto-rempli)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:89
 msgid "(choose one)"
 msgstr "(en choisir un)"
 
 #. %1$s: TMPL_VAR name=suggestionid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:88
 #, c-format
 msgid "(defined from suggestion #%s)"
 msgstr "(créé à partir de la suggestion #%s)"
@@ -1377,7 +1364,7 @@ msgid "(if applicable)"
 msgstr "(si applicable)"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:205
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:181
 msgid ""
 "(if checked, no item of this type can be issued. If not checked, every item "
 "of this type can be issued unless notforloan is set for a specific item)"
@@ -1392,17 +1379,17 @@ msgstr "(inclus)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=innerloop1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:281
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:283
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:285
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:280
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:282
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:284
 #, c-format
 msgid "(is %s)"
 msgstr "(est %s)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=timestamp
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:323
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:324
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:85
 #, c-format
 msgid "(modified on %s)"
 msgstr "(modifié le %s)"
@@ -1437,11 +1424,11 @@ msgstr "(ou rien si vous souhaitez visualiser l'état global) %S"
 msgid "(order #%s)"
 msgstr "(Commande N°%s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:850
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:848
 msgid "(select a branch)"
 msgstr "(Sélectionnez un site)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:873
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:871
 msgid ""
 "(select a letter &amp; patrons will be able to \"follow\" this subscription "
 "and recieve a mail on every new issue)"
@@ -1453,15 +1440,14 @@ msgstr ""
 msgid "(type card number or part of a name)"
 msgstr "(Entrer le n° de carte d'adhérent ou une partie du nom)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:258
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:176
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:199
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:298
 msgid "*"
 msgstr "*"
 
 #. INPUT type=text name=password
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:541
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:536
 msgid "****"
 msgstr "****"
 
@@ -1470,15 +1456,15 @@ msgid "*******"
 msgstr "*******"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:124
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:125
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:177
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:295
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:300
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:304
+#. %1$s: TMPL_VAR name=volume
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:296
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:301
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:305
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:198
 #, c-format
 msgid ", %s"
 msgstr ", %s"
@@ -1509,7 +1495,11 @@ msgid ""
 "funding)"
 msgstr ", France (grilles de catalogage, autorités, panier OPAC, bulletinage)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:356
+msgid ", Lost"
+msgstr ", Perdu"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:198
 msgid ", Mandatory"
 msgstr ", Obligatoire"
 
@@ -1524,8 +1514,20 @@ msgstr ""
 ", Nouvelle-Zélande, et Rosalie Blake, directrice de la bibliothèque (Koha "
 "1.0)"
 
+#. %1$s: TMPL_VAR name=due_date
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:354
+#, c-format
+msgid ", On loan until %s"
+msgstr "En prêt jusqu'au %s"
+
+#. %1$s: TMPL_VAR name=orderedcount
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:357
+#, c-format
+msgid ", On order (%s)"
+msgstr ", En commande (%s)"
+
 #. %1$s: TMPL_VAR name=seealso
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:198
 #, c-format
 msgid ", See %s"
 msgstr ", Voir %s"
@@ -1539,6 +1541,11 @@ msgstr ", Etats-Unis (Responsable de la Version 3.0)"
 msgid ", USA, Ohio (MARC support funding)"
 msgstr ", USA, Ohio (financement du support MARC)"
 
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:355
+msgid ", Withdrawn"
+msgstr ", Exemplaire retiré"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:250
 msgid ", but managed only by you."
 msgstr ""
@@ -1547,45 +1554,46 @@ msgstr ""
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=author
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:659
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:659
 #, c-format
 msgid ", by %s"
 msgstr ", par %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:198
 msgid ", repeatable"
 msgstr ", répétable"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=volume
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:295
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:300
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:304
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:296
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:301
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:305
 #, c-format
 msgid ",%s"
 msgstr ", %s"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=copyrightdate
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:50
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:317
+#. %1$s: TMPL_VAR name=marcnote
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:318
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:321
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:319
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:322
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:81
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:660
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:218
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:219
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:660
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:84
 #, c-format
 msgid "- %s"
 msgstr "- %s"
@@ -1606,7 +1614,7 @@ msgid "-- Choose a reason --"
 msgstr "-- Choisir un motif --"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:920
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1012
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1010
 msgid "-- please choose --"
 msgstr "-- Choisir --"
 
@@ -1725,7 +1733,7 @@ msgstr "...ou..."
 
 #. %1$s: TMPL_VAR name=author
 #. %2$s: TMPL_VAR name=class
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:118
 #, c-format
 msgid "/ %s %s"
 msgstr "/ %s %s"
@@ -1740,43 +1748,43 @@ msgstr "0 prêts"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:10
 msgid "0 Form of material"
-msgstr ""
+msgstr "0 Forme document"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:621
 msgid "0 Holds"
 msgstr "0 Réservations"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:295
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:297
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:392
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:394
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:295
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:297
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:391
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:393
 msgid "0- No Index"
 msgstr "0- Pas d'index"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:253
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:255
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:350
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:352
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:253
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:255
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:349
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:351
 msgid "0- Not a conference publication"
 msgstr "0- N'est Pas la publication d'une conférence"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:271
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:273
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:368
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:370
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:271
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:273
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:367
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:369
 msgid "0- Not a festschrift"
 msgstr "0- N'est pas un \"festshrift\""
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:314
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:316
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:411
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:413
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:314
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:316
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:410
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:412
 msgid "0- Not fiction"
@@ -1788,7 +1796,7 @@ msgstr "00- Catégorie document"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl:22
 msgid "01 Specific material designation"
-msgstr ""
+msgstr "01 Désignation spécifique"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:28
 msgid "01-04 Illustrations"
@@ -1796,68 +1804,68 @@ msgstr "01-04 Illustrations"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:101
 msgid "06- Form of an item"
-msgstr ""
+msgstr "06- Forme document"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:15
 msgid "06- Type of date / Publication Status"
-msgstr ""
+msgstr "06- Type de date / statut de publication"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:38
 msgid "1 => !OPAC Intranet Editor Collapsed"
 msgstr "1 => !OPAC Intranet Editeur Plié"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:258
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:260
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:355
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:357
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:258
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:260
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:354
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:356
 msgid "1- Conference publication"
 msgstr "1- Est la publication d'une conférence"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:276
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:278
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:373
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:375
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:278
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:372
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:374
 msgid "1- Festschrift"
 msgstr "1- Festschrift"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:319
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:321
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:416
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:418
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:319
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:321
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:415
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:417
 msgid "1- Fiction"
 msgstr "1- Fiction"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:209
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:211
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:153
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:209
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:209
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:211
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:209
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:155
 msgid "1- Full level, material not examined"
 msgstr "1- Niveau complet, document non dépouillé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:300
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:302
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:397
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:399
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:300
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:302
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:396
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:398
 msgid "1- Index present"
 msgstr "1- Index"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:10
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:10
 msgid "1-4 Record size"
 msgstr "1-4 Taille enregistrement"
 
@@ -1867,7 +1875,7 @@ msgid "1-5 Date entered on file"
 msgstr "1-5 Date du fichier"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:118
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:159
 msgid "1/2 Months (6/year)"
 msgstr "Bimestriel (6/an)"
 
@@ -1877,7 +1885,7 @@ msgid "1/2 months (6/year)"
 msgstr "Bimestriel (6/an)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:109
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:150
 msgid "1/2 weeks"
 msgstr "Bimensuel"
 
@@ -1892,7 +1900,7 @@ msgstr "Bimensuel (2/mois)"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1000
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1002
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:175
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:174
 msgid "1/2 years"
 msgstr "Bisannuel"
 
@@ -1904,19 +1912,19 @@ msgstr "Trimestriel (4/an)"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:112
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:963
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:965
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:153
 msgid "1/3 weeks"
 msgstr "1/3 semaines"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:156
 msgid "1/Month"
 msgstr "Mensuel"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:103
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:943
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:945
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:141
 msgid "1/day"
 msgstr "Quotidien"
 
@@ -1927,8 +1935,8 @@ msgstr "Mensuel (1/mois)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:121
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:124
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:165
 msgid "1/quarter"
 msgstr "Trimestriel"
 
@@ -1940,21 +1948,21 @@ msgstr "Trimestriel (1/trimestre)"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:953
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:955
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:147
 msgid "1/week"
 msgstr "Hebdomadaire"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:130
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:995
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:997
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:171
 msgid "1/year"
 msgstr "Annuel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:141
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:197
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:141
 msgid "10-16 indicator/subfields/size"
 msgstr "10-16 indicateur/sous-champs/taille"
 
@@ -2005,17 +2013,17 @@ msgstr "16- Forme littéraire"
 msgid "17- Biography"
 msgstr "17- Biographie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:200
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:200
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:200
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:200
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:144
 msgid "17- Encoding"
 msgstr "17- Encodage"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:258
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:202
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:258
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:258
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:258
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:202
 msgid "18 - Descriptive cataloging form"
 msgstr "18- Forme de catalogage descriptif"
 
@@ -2024,21 +2032,21 @@ msgstr "18- Forme de catalogage descriptif"
 msgid "18-21 Illustrations"
 msgstr "18-21 Illustrations"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:286
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:230
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:286
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:286
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:286
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:230
 msgid "19 - Linked record requirement"
 msgstr "19 - Condition de notice liée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:214
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:216
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:160
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:214
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:214
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:216
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:214
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:158
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:160
 msgid "2 - Less-than-full level, material not examined"
 msgstr "2 - Incomplet, document non examiné"
 
@@ -2064,13 +2072,13 @@ msgstr "2 ans"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:938
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:940
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:139
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:138
 msgid "2/day"
 msgstr "2/quotidien"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:992
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:169
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:168
 msgid "2/year"
 msgstr "Semestriel "
 
@@ -2078,10 +2086,10 @@ msgstr "Semestriel "
 msgid "2/years"
 msgstr "Semestriel (2/an)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:303
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:247
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:303
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:303
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:303
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:247
 msgid "20-24 entry map & lengths"
 msgstr "20-24 structure et longueur des entrées"
 
@@ -2122,20 +2130,20 @@ msgstr "3 mois"
 msgid "3 weeks"
 msgstr "3 semaines"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:219
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:221
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:219
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:221
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:219
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:221
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:219
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:221
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:163
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:165
 msgid "3- Abbreviated level"
 msgstr "3- Niveau abrégé"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:948
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:950
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:144
 msgid "3/week"
 msgstr "3/Hebdomadaire"
 
@@ -2184,14 +2192,14 @@ msgstr "39- Source de catalogage"
 msgid "4 => !OPAC Intranet Editor !Collapsed"
 msgstr "4 => !OPAC Intranet Editeur !Plié"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:224
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:226
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:168
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:170
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:224
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:226
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:224
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:226
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:224
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:226
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:170
 msgid "4- Core level"
 msgstr "4- Niveau central"
 
@@ -2199,21 +2207,21 @@ msgstr "4- Niveau central"
 msgid "5 => !OPAC !Intranet !Editor Collapsed"
 msgstr "5 => !OPAC !Intranet !Editeur Plié"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:229
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:231
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:173
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:229
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:231
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:229
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:231
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:229
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:231
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:175
 msgid "5- Partial (preliminary) level"
 msgstr "5- Niveau partiel (préliminaire)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:14
 msgid "5- Record status"
 msgstr "5- Statut notice"
 
@@ -2225,10 +2233,10 @@ msgstr "5- Public destinataire"
 msgid "6 => !OPAC Intranet !Editor !Collapsed"
 msgstr "6 => !OPAC Intranet !Editeur !Plié"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:47
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:47
 msgid "6- Type of record"
 msgstr "6- Type de notice"
 
@@ -2236,20 +2244,20 @@ msgstr "6- Type de notice"
 msgid "7 => !OPAC Intranet !Editor Collapsed"
 msgstr "7 => !OPAC Intranet !Editeur Plié"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:119
 msgid "7- Bibliographic level"
 msgstr "7- Niveau bibliographique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:234
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:236
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:178
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:180
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:234
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:236
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:234
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:236
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:234
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:236
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:178
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:180
 msgid "7- Minimal level"
 msgstr "7- Niveau minimum"
 
@@ -2270,20 +2278,20 @@ msgstr "7-8 Indéfini"
 msgid "8 => !OPAC !Intranet !Editor !Collapsed"
 msgstr "8 => !OPAC !Intranet !Editeur !Plié"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:162
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:162
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:162
 msgid "8- Hierarchic level"
 msgstr "8- Niveau hiérarchique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:239
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:241
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:183
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:185
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:241
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:241
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:183
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:185
 msgid "8- Prepublication level"
 msgstr "9- Niveau pré-print"
 
@@ -2291,17 +2299,15 @@ msgstr "9- Niveau pré-print"
 msgid "9 => Future use"
 msgstr "9 => Usage future"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:180
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:180
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:124
 msgid "9- Encoding"
 msgstr "9- Encodage"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=notes
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:61
 #, c-format
 msgid ": %s"
 msgstr ": %s"
@@ -2363,13 +2369,13 @@ msgstr ": %s erreurs trouvées"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=place
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:320
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:322
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:321
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:323
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:84
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:54
 #, c-format
 msgid "; %s"
 msgstr "; %s"
@@ -2399,8 +2405,8 @@ msgstr "; Edité par %s"
 msgid "; Volume:<i>%s</i>"
 msgstr "; Volume : <i>%s</i>"
 
-#. INPUT type=button
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:134
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:133
 msgid ""
 "<!-- TMPL_IF NAME=\"categorycode\" -->Update Category<!-- TMPL_ELSE -->Add "
 "Category<!-- /TMPL_IF -->"
@@ -2449,7 +2455,7 @@ msgstr "<a1> &laquo; Retour</a>&nbsp;&nbsp;&nbsp;&nbsp; <a2>[ Fait ]</a>"
 
 #. %1$s: TMPL_VAR name=firstname
 #. %2$s: TMPL_VAR name=surname
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:19
 #, c-format
 msgid "<a1>%s %s</a> &rsaquo; Modify"
 msgstr "<a1>%s %s</a> &rsaquo; Modifier"
@@ -2471,13 +2477,6 @@ msgstr "<a1>%s, %s</a> %s %s"
 msgid "<a1>%s, %s</a> (%s)"
 msgstr "<a1>%s, %s</a> (%s)"
 
-#. %1$s: TMPL_VAR name=tag
-#. %2$S: type=text name=indicator
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:225
-#, c-format
-msgid "<a1>%s</a> %S -"
-msgstr "<a1>%s</a> %S -"
-
 #. %1$s: TMPL_VAR name=riborcnum
 #. %2$s: TMPL_VAR name=riborsurname
 #. %3$s: TMPL_VAR name=ribortitle
@@ -2506,6 +2505,13 @@ msgstr "<a1>%s</a> &nbsp; (<b>%s </b>)"
 msgid "<a1>%s</a> &nbsp; (<b>%s</b>)"
 msgstr "<a1>%s</a> &nbsp; (<b>%s</b>)"
 
+#. %1$s: TMPL_VAR name=name
+#. %2$s: TMPL_VAR name=name
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:18
+#, c-format
+msgid "<a1>%s</a> &rsaquo; Update: %s"
+msgstr "<a1>%s</a> &rsaquo; Mise à jour %s"
+
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=barcode
 #. %3$s: TMPL_VAR name=branchname
@@ -2516,7 +2522,7 @@ msgstr "<a1>%s</a> (%s -- %s)"
 
 #. %1$s: TMPL_VAR name=name
 #. %2$s: TMPL_VAR name=phone
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:72
 #, c-format
 msgid "<a1>%s</a> (%s)"
 msgstr "<a1> %s </a> (%s)"
@@ -2560,9 +2566,7 @@ msgstr "<a1>Ajouter un membre à la liste</a> &nbsp; <a2>Tout supprimer</a>"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:202
 #, c-format
 msgid "<a1>Add adult</a> <a2>Add child</a>"
-msgstr ""
-"<a1>Inscription adulte</a> <a2>Inscription "
-"enfant</a>"
+msgstr "<a1>Inscription adulte</a> <a2>Inscription enfant</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:157
 #, c-format
@@ -2594,32 +2598,24 @@ msgstr ""
 "a> <a5>Circulation</a> <a6>Adhérents</a> <a7>OPAC</a> <a8>Fonctions OPAC</a> "
 "<a9>Intranet</a> <a10>Fonctions de log</a><a11>Autres</a>"
 
-#. %1$s: TMPL_VAR name=action
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
-#, c-format
-msgid "<a1>Authority MARC Framework</a> &rsaquo; %s"
-msgstr "<a1>Grille d'autorité Marc pour</a> &rsaquo; %s"
-
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
 #, c-format
-msgid "<a1>Authority MARC Framework</a> &rsaquo; Add tag"
-msgstr "<a1>Grille d'autorité Marc pour</a> &rsaquo; Ajouter un champ"
+msgid "<a1>Authority MARC Framework</a> &rsaquo;"
+msgstr "<a1>Grille d'autorité </a> &rsaquo;"
 
+#. %1$s: TMPL_VAR name=action
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
 #, c-format
-msgid "<a1>Authority MARC Framework</a> &rsaquo; Confirm Deletion"
-msgstr "<a1>Grille d'autorité Marc </a> &rsaquo; Confirmer la suppression"
+msgid "<a1>Authority MARC Framework</a> &rsaquo; %s"
+msgstr "<a1>Grille d'autorité Marc pour</a> &rsaquo; %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
 #, c-format
 msgid "<a1>Authority MARC Framework</a> &rsaquo; Data Deleted"
 msgstr "<a1>Grille d'autorité Marc pour</a> &rsaquo; Entrée supprimée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:65
-#, c-format
-msgid "<a1>Authority MARC Framework</a> &rsaquo; Modify tag"
-msgstr "<a1>Grille d'autorité Marc<a> &rsaquo; Modifier le champ"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:64
 #, c-format
 msgid "<a1>Authority Types</a> &rsaquo; Add authority type"
@@ -2650,18 +2646,6 @@ msgstr "<a1>Valeur autorisées</a> &rsaquo; Confirmer la suppression"
 msgid "<a1>Back</a> &nbsp; <a2>Print</a>"
 msgstr "<a1> Retour </a> &nbsp <a2>Imprimer</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
-#, c-format
-msgid "<a1>Biblio Framework</a> &rsaquo;"
-msgstr "<a1>Grille de catalogage</a> &rsaquo;"
-
-#. %1$s: TMPL_VAR name=frameworktext
-#. %2$s: TMPL_VAR name=frameworkcode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
-#, c-format
-msgid "<a1>Biblio Framework</a> &rsaquo; Delete Framework for %s (%s)?"
-msgstr "<a1>Grille de catalogage</a> &rsaquo; Supprimer la grille pour %s (%s)?"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:67
 #, c-format
 msgid "<a1>Budgets</a> &rsaquo;"
@@ -2699,12 +2683,7 @@ msgstr "<a1>Villes</a> &rsaquo;"
 msgid "<a1>Cities</a> &rsaquo; Confirm Deletion of City"
 msgstr "<a1>Villes</a> &rsaquo; Confirmer la suppression de la ville"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:9
-#, c-format
-msgid "<a1>Delete</a> <a2>Add to shelf</a> <a3>Print</a>"
-msgstr "<a1>Supprimer</a> <a2>Ajouter à l'étagère</a> <a3>Imprimer</a>"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:136
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:132
 #, c-format
 msgid "<a1>Edit subfields</a> <a2>Return to Auth Structure</a>"
 msgstr ""
@@ -2712,7 +2691,8 @@ msgstr ""
 "a>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:231
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:305
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:269
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:181
 #, c-format
 msgid "<a1>Edit</a> <a2>Delete</a>"
 msgstr "<a1>Modifier</a> <a2>Supprimer</a>"
@@ -2723,10 +2703,10 @@ msgid "<a1>Edit</a> <a2>Delete</a> <a3>Add budget</a>"
 msgstr "<a1>Modifier</a> <a2>Supprimer</a> <a3>Ajouter un budget</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:10
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:18
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Acquisitions</a> &rsaquo;"
 msgstr "<a1>Accueil</a> &rsaquo;<a2>Acquisitions</a> &rsaquo;"
@@ -2737,14 +2717,18 @@ msgstr "<a1>Accueil</a> &rsaquo;<a2>Acquisitions</a> &rsaquo;"
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; <a3>Shopping Basket %s</"
 "a> &rsaquo;"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; <a3>Panier %s</a> &rsaquo;"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; <a3>Panier %s</a> "
+"&rsaquo;"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:9
 #, c-format
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Add order from a "
 "suggestion"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Ajouter une ligne à partir d'une suggestion"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Ajouter une ligne à "
+"partir d'une suggestion"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:10
 #, c-format
@@ -2772,7 +2756,9 @@ msgstr "<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Recherche command
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Receipt order for : %s"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Réception de commande pour %s"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Réception de commande "
+"pour %s"
 
 #. %1$s: TMPL_VAR name=name
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:9
@@ -2780,41 +2766,64 @@ msgstr "<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Réception de com
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Receive parcel from "
 "supplier %s"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Réception de colis de %s"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Réception de colis de "
+"%s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Search Existing Records"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Recherche dans le catalogue"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Acquisitions</a> &rsaquo; Recherche dans le "
+"catalogue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:10
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:12
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:65
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:70
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:61
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Administration</a> &rsaquo;"
 msgstr "<a1> Accueil </a> &rsaquo;<a2>Administration</a> &rsaquo;"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:71
+#, c-format
+msgid ""
+"<a1>Home</a> &rsaquo; <a2>Administration</a> &rsaquo; <a3>Currencies &amp; "
+"Exchange Rates</a> &rsaquo;"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Administration</a> &rsaquo; <a3>Devises &amp; "
+"Taux de change</a>&rsaquo;"
+
+#. %1$s: TMPL_VAR name=frameworkcode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:30
+#, c-format
+msgid ""
+"<a1>Home</a> &rsaquo; <a2>Administration</a> &rsaquo; <a3>MARC Frameworks</"
+"a> &rsaquo; <a4>%s Framework Structure</a> &rsaquo;"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Administration</a> &rsaquo; Structure MARC des "
+"autorités</a> &rsaquo<a4>Structure de la grille %s</a> &rsaquo;"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:9
 #, c-format
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Administration</a> &rsaquo; Authority MARC "
 "subfield structure"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Administration</a> &rsaquo; Structure MARC des autorités"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Administration</a> &rsaquo; Structure MARC des "
+"autorités"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:9
 #, c-format
@@ -2836,6 +2845,11 @@ msgstr "<a1>Accueil</a> &rsaquo; <a2>Administration</a> &rsaquo; Règles de prê
 msgid "<a1>Home</a> &rsaquo; <a2>Administration</a> &rsaquo; MARC Check"
 msgstr "<a1>Accueil</a> &rsaquo; <a2>Administration</a> &rsaquo; Vérification MARC"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:373
+#, c-format
+msgid "<a1>Home</a> &rsaquo; <a2>Authorities</a> &rsaquo;"
+msgstr "<a1>Accueil</a> &rsaquo;<a2>Autorités</a> &rsaquo;"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:66
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Catalogue</a> &rsaquo;"
@@ -2848,7 +2862,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo;"
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Catalogue</a> &rsaquo; <a3>%s</a> &rsaquo; Place a "
 "hold on %s"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; <a3>%s</a> &rsaquo; Réserver %s"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; <a3>%s</a> &rsaquo; "
+"Réserver %s"
 
 #. %1$s: TMPL_VAR name=title
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:10
@@ -2856,10 +2872,12 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; <a3>%s</a> &rsaquo;
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Catalogue</a> &rsaquo; Checkout History for <i>%s</"
 "i>"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Historique de lecture pour <i>%s</i>"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Historique de lecture "
+"pour <i>%s</i>"
 
 #. %1$s: TMPL_VAR name=title
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:94
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Catalogue</a> &rsaquo; Details for <i>%s</i>"
 msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Détails pour <i>%s</i>"
@@ -2876,15 +2894,19 @@ msgid "<a1>Home</a> &rsaquo; <a2>Catalogue</a> &rsaquo; Item Details for <i>"
 msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Exemplaires pour <i>"
 
 #. %1$s: TMPL_VAR name=title
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:46
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Catalogue</a> &rsaquo; MARC Details for <i>%s</i>"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Notice MARC pour <i>%s</i>"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Notice MARC pour <i>%s</"
+"i>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl:10
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Catalogue</a> &rsaquo; Subject Search Results"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Résultat de la recherche sujet"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Résultat de la "
+"recherche sujet"
 
 #. %1$s: TMPL_VAR name=todaysdate
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:9
@@ -2892,7 +2914,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Catalogue</a> &rsaquo; Résultat de la rec
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Circulation</a> &rsaquo Circulation Reports "
 "&rsaquo Overdues as of %s"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Statistiques &rsaquo; Retards au %s"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Statistiques &rsaquo; "
+"Retards au %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:22
 #, c-format
@@ -2910,12 +2934,16 @@ msgstr "<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Prêts"
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Circulation</a> &rsaquo; Circulation Statistics "
 "for %s"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Statistiques de prêt pour %s"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Statistiques de prêt "
+"pour %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Circulation</a> &rsaquo; Holds"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Réservations mises de coté"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Réservations mises de "
+"coté"
 
 #. %1$s: TMPL_VAR name=LoginBranchname
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:9
@@ -2951,16 +2979,18 @@ msgstr "<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Transferts à fair
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Circulation</a> &rsaquo; Transfers to your branch"
-msgstr "<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Transferts vers votre site"
+msgstr ""
+"<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Transferts vers votre "
+"site"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:8
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Labels</a> &rsaquo; Create Layout"
 msgstr "<a1>Accueil</a> &rsaquo; <a2>Circulation</a> &rsaquo; Créer modèle"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:14
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Patrons</a> &rsaquo;"
 msgstr "<a1> Accueil </a> &rsaquo;<a2>Adhérents</a> &rsaquo;"
@@ -2982,7 +3012,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Adhérents</a> &rsaquo; Compte pour %s %s"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Patrons</a> &rsaquo; Cannot Delete Patron"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Adhérents</a> &rsaquo; Impossible de supprimer l'adhérent"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Adhérents</a> &rsaquo; Impossible de supprimer "
+"l'adhérent"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl:9
 #, c-format
@@ -3006,7 +3038,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Adhérents</a> &rsaquo; Payer amende pour
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Patrons</a> &rsaquo; Reading Record for %s %s"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Adhérents</a> &rsaquo; Historique de lecture de %s %s"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Adhérents</a> &rsaquo; Historique de lecture "
+"de %s %s"
 
 #. %1$s: TMPL_VAR name=surname
 #. %2$s: TMPL_VAR name=firstname
@@ -3023,7 +3057,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Acquisition"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Reports</a> &rsaquo; All Holds"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo;  Toutes les réservations"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo;  Toutes les "
+"réservations"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:10
 #, c-format
@@ -3043,7 +3079,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Prêts"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:10
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Reports</a> &rsaquo; Checkouts by patron category"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Prêts par catégorie de lecteur"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Prêts par catégorie "
+"de lecteur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:9
 #, c-format
@@ -3058,7 +3096,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Types de documen
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:9
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Reports</a> &rsaquo; Items with no checkouts"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Documents ne sortant pas"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Documents ne sortant "
+"pas"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:9
 #, c-format
@@ -3068,7 +3108,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Documents perdus
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:17
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Reports</a> &rsaquo; Most-Circulated Items"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Documents circulant le plus"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Documents circulant "
+"le plus"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:10
 #, c-format
@@ -3078,14 +3120,18 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Adhérents"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:10
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Reports</a> &rsaquo; Patrons with No Checkouts"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Adhérents n'empruntant pas"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Adhérents "
+"n'empruntant pas"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:10
 #, c-format
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Reports</a> &rsaquo; Patrons with the most "
 "Checkouts"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Adhérents empruntant le plus"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Statistiques</a> &rsaquo; Adhérents empruntant "
+"le plus"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:793
 #, c-format
@@ -3098,7 +3144,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; "
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Alert subscribers for <i>%s</"
 "i>"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Adhérents surveillant <i>%s</i>"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Adhérents surveillant "
+"<i>%s</i>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:30
 #, c-format
@@ -3111,7 +3159,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Abonnement à é
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Check In subscription for <i>%"
 "s</i>"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Bulletiner pour <i>%s</i>"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Bulletiner pour <i>%"
+"s</i>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:28
 #, c-format
@@ -3119,10 +3169,12 @@ msgid "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Claims"
 msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Réclamations"
 
 #. %1$s: TMPL_VAR name=subscriptionid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:99
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Details for Subscription #%s"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Détails de l'abonnement N°%s"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Détails de "
+"l'abonnement N°%s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:52
 #, c-format
@@ -3132,7 +3184,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Listes de circul
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:23
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Edit Routing List"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Modifier la liste de circulation"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Modifier la liste de "
+"circulation"
 
 #. %1$s: TMPL_VAR name=bibliotitle
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:68
@@ -3140,13 +3194,17 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Modifier la list
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Serial Collection information "
 "for <i>%s</i>"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Etat de collection de <i>%s</i>"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Etat de collection de "
+"<i>%s</i>"
 
 #. %1$s: TMPL_VAR name=bibliotitle
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:84
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Serial Edition <i>%s</i>"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Bulletinage de <i>%s</i>"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Bulletinage de <i>%s</"
+"i>"
 
 #. %1$s: TMPL_VAR name=bibliotitle
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:9
@@ -3154,7 +3212,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Bulletinage de <
 msgid ""
 "<a1>Home</a> &rsaquo; <a2>Serials</a> &rsaquo; Subscription information for "
 "<i>%s</i>"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Informations d'abonnement pour <i>%s</i>"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Périodiques</a> &rsaquo; Informations "
+"d'abonnement pour <i>%s</i>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:101
 #, c-format
@@ -3164,7 +3224,9 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Outils</a> &rsaquo;"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl:44
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Tools</a> &rsaquo; Clean Patron Records"
-msgstr "<a1> Accueil </a> &rsaquo;<a2>Outils</a> &rsaquo;Nettoyer le fichier adhérents"
+msgstr ""
+"<a1> Accueil </a> &rsaquo;<a2>Outils</a> &rsaquo;Nettoyer le fichier "
+"adhérents"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:165
 #, c-format
@@ -3212,17 +3274,28 @@ msgstr "<a1> Accueil </a> &rsaquo;<a2>Outils</a> &rsaquo; Règles de retard"
 msgid "<a1>Home</a> &rsaquo; Administration"
 msgstr "<a1>Accueil</a> &rsquo; Administration système"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:24
+#, c-format
+msgid "<a1>Home</a> &rsaquo; Authorities"
+msgstr "<a1>Accueil</a> &rsaquo; Autorités"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:14
 #, c-format
 msgid "<a1>Home</a> &rsaquo; Cataloguing"
 msgstr "<a1>Accueil</a> &rsaquo; Catalogage"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:8
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:8
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:8
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:8
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:13
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:9
+#, c-format
+msgid "<a1>Home</a> &rsaquo; Circulation"
+msgstr "<a1>Accueil</a> &rsquo; Circulation"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:8
 #, c-format
 msgid "<a1>Home</a> &rsaquo; Labels"
 msgstr "<a1>Accueil</a> &rsaquo; Etiquettes"
@@ -3253,71 +3326,115 @@ msgstr "<a1>Accueil</a> &rsaquo; Gestion des suggestions"
 msgid "<a1>Home</a> &rsaquo; Tools"
 msgstr "<a1>Accueil</a> &rsaquo;  Outils"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:87
+#, c-format
+msgid "<a1>Item Types</a> &rsaquo; Add item type"
+msgstr "<a1>Types de documents</a> &rsaquo; Ajouter un type de documetns"
+
+#. %1$s: TMPL_VAR name=itemtype
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:92
+#, c-format
+msgid "<a1>Item Types</a> &rsaquo; Cannot Delete Item Type '%s'"
+msgstr ""
+"<a1>Types de document</a> &rsaquo; Impossible de supprimer le type de "
+"document %s"
+
+#. %1$s: TMPL_VAR name=itemtype
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:94
+#, c-format
+msgid "<a1>Item Types</a> &rsaquo; Delete Item Type '%s'?"
+msgstr "<a1>types de document</a> &rsaquo; Supprimer le type de documents '%s' ?"
+
+#. %1$s: TMPL_VAR name=itemtype
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:85
+#, c-format
+msgid "<a1>Item Types</a> &rsaquo; Modify item type '%s'"
+msgstr "<a1>Types de documents</a> &rsaquo; Modifier le type de document '%s'"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:98
+#, c-format
+msgid "<a1>Item Types</a> &rsaquo;Data Deleted"
+msgstr "<a1>Types de documents</a> &rsaquo; Donnée supprimée"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:15
 #, c-format
-msgid "<a1>Libraries, branches, agency categories</a> &rsaquo;"
-msgstr "<a1>Sites</a> &rsaquo; "
+msgid "<a1>Libraries, Branches, &amp; Agency Categories</a> &rsaquo;"
+msgstr "<a1>Sites &amp; Catégories de sites</a> &rsaquo; "
 
 #. %1$s: TMPL_VAR name=categorycode
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:13
 #, c-format
 msgid ""
-"<a1>Libraries, branches, agency categories</a> &rsaquo; Confirm Deletion of "
-"Agency Category %s"
-msgstr "<a1>Sites</a> &rsaquo; Confirmer la suppression de la catégorie %s ?"
+"<a1>Libraries, Branches, &amp; Agency Categories</a> &rsaquo; Confirm "
+"Deletion of Agency Category %s"
+msgstr ""
+"<a1>Sites &amp; Catégories de sites</a> &rsaquo; Confirmer la suppression de "
+"la catégorie %s"
 
 #. %1$s: TMPL_VAR name=branchcode
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:18
 #, c-format
 msgid ""
-"<a1>Libraries, branches, agency categories</a> &rsaquo; Confirm deletion of "
-"library '%s'"
-msgstr "<a1>Sites</a> &rsaquo;  Confirmer la suppression du site '%s'"
+"<a1>Libraries, Branches, &amp; Agency Categories</a> &rsaquo; Confirm "
+"deletion of library '%s'"
+msgstr ""
+"<a1>Sites &amp; Catégories de sites</a> &rsaquo;  Confirmer la suppression "
+"du site '%s'"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc:64
 #, c-format
 msgid "<a1>Log In</a> to Koha"
 msgstr "<a1>Se connecter</a> à Koha"
 
-#. %1$s: TMPL_VAR name=action
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
 #, c-format
-msgid "<a1>MARC Subfield Structure</a> &rsaquo; %s"
-msgstr "<a1>Structure MARC</a> &rsaquo; %s"
+msgid "<a1>MARC Frameworks</a> &rsaquo;"
+msgstr "<a1>Grilles de catalogage</a> &rsaquo;"
 
-#. %1$s: TMPL_VAR name=tagsubfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:55
+#. %1$s: TMPL_VAR name=frameworktext
+#. %2$s: TMPL_VAR name=frameworkcode
+#. %3$s: TMPL_VAR name=action
+#. %4$s: TMPL_VAR name=searchfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:65
 #, c-format
-msgid "<a1>MARC Subfield Structure</a> &rsaquo; Confirm Deletion of Subfield %s"
-msgstr "<a1>Structure MARC</a> &rsaquo; Confirmez la suppression du sous-champ %s"
+msgid ""
+"<a1>MARC Frameworks</a> &rsaquo; <a2>MARC Framework for %s (%s)</a> &rsaquo; "
+"%s %s"
+msgstr ""
+"<a1>Grilles de catalogage</a> &rsaquo; <a2>Grille de catalogage %s (%s) </a> "
+"&rsaquo; %s %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:54
+#. %1$s: TMPL_VAR name=searchfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:66
 #, c-format
-msgid "<a1>MARC Subfield Structure</a> &rsaquo; Edit MARC subfields constraints"
-msgstr "<a1>Structure MARC</a> &rsaquo; Edition des contraintes de sous-champs MARC"
+msgid "<a1>MARC Frameworks</a> &rsaquo; Confirm Deletion of Tag '%s'"
+msgstr "<a1>Grille de catalogage</a> &rsaquo; Confirmez la suppression du champ '%s'"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:67
 #, c-format
-msgid "<a1>MARC Subfield Structure</a> &rsaquo; Subfield Deleted"
-msgstr "<a1>Structure MARC</a> &rsaquo; Sous-champ supprimé"
+msgid "<a1>MARC Frameworks</a> &rsaquo; Data Deleted"
+msgstr "<a1>Grilles de catalogage</a> &rsaquo; Entrée supprimée"
 
-#. %1$s: TMPL_VAR name=action
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:65
+#. %1$s: TMPL_VAR name=frameworktext
+#. %2$s: TMPL_VAR name=frameworkcode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
 #, c-format
-msgid "<a1>MARC Tag Structure</a> &rsaquo; %s"
-msgstr "<a1>Structure MARC</a> &rsaquo; %s"
+msgid "<a1>MARC Frameworks</a> &rsaquo; Delete Framework for %s (%s)?"
+msgstr "<a1>Grilles de catalogage</a> &rsaquo; Supprimer la grille pour %s (%s) ?"
 
-#. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:66
+#. %1$s: TMPL_VAR name=frameworktext
+#. %2$s: TMPL_VAR name=frameworkcode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:68
 #, c-format
-msgid "<a1>MARC Tag Structure</a> &rsaquo; Confirm Deletion of Tag '%s'"
-msgstr "<a1>Structure MARC</a> &rsaquo; Confirmez la suppression du champ '%s'"
+msgid "<a1>MARC Frameworks</a> &rsaquo; MARC Framework for %s (%s)"
+msgstr "<a1>Grilles de catalogage</a> &rsaquo; Grille de catalogage pour  %s (%s) ?"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:67
+#. %1$s: TMPL_VAR name=action
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:12
 #, c-format
-msgid "<a1>MARC Tag Structure</a> &rsaquo; Data Deleted"
-msgstr "<a1>Structure MARC</a> &rsaquo; Information supprimée"
+msgid "<a1>MARC Links</a> &rsaquo; %s"
+msgstr "<a1>Liaisons MARC </a> &rsaquo; %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:101
 #, c-format
@@ -3339,6 +3456,22 @@ msgstr "<a1>Notifications</a> &rsaquo; Notification ajoutée"
 msgid "<a1>Noticess</a> &rsaquo; Modify notice"
 msgstr "<a1>Notifications</a> &rsaquo; Modifier notification"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:78
+#, c-format
+msgid "<a1>Patron Categories</a> &rsaquo;"
+msgstr "<a1>Catégories de lecteurs</a> &rsaquo;"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:79
+#, c-format
+msgid "<a1>Patron Categories</a> &rsaquo; Category Deleted"
+msgstr "<a1>Catégories de lecteurs</a> &rsaquo; Catégories supprimée"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:77
+#, c-format
+msgid "<a1>Patron Categories</a> &rsaquo; Data recorded"
+msgstr "<a1>Catégories de lecteurs</a> &rsaquo; donnée enregistrée"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:23
 #, c-format
 msgid "<a1>Pay fines</a> <a2>Create Manual Invoice</a> <a3>Create Manual Credit</a>"
@@ -3351,8 +3484,8 @@ msgstr ""
 msgid "<a1>Previous Records</a> <a2>Next Records</a>"
 msgstr "<a1>Notices précédentes</a> / <a2>Notices suivantes</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:184
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:184
 #, c-format
 msgid "<a1>Print</a> &nbsp; <a2>Close</a>"
 msgstr "<a1> Imprimer </a> &nbsp;<a2>Fermer</a>"
@@ -3439,6 +3572,36 @@ msgstr "<a1>Mots vides</a> &rsaquo; Supprimer le mot vide '%s' ?"
 msgid "<a1>Subscriptions</a> <a2>Back to biblio</a> <a3>Complete view</a>"
 msgstr "<a1>Abonnements</a> <a2>Retour à la notice</a> <a3>Vue complète</a>"
 
+#. %1$s: TMPL_VAR name=tagfield
+#. %2$s: TMPL_VAR name=action
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:30
+#, c-format
+msgid "<a1>Tag %s Subfield Structure</a> &rsaquo; %s"
+msgstr "<a1>Structure du champ %s</a> &rsaquo; %s"
+
+#. %1$s: TMPL_VAR name=tagfield
+#. %2$s: TMPL_VAR name=tagsubfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:31
+#, c-format
+msgid "<a1>Tag %s Subfield Structure</a> &rsaquo; Confirm Deletion of Subfield %s"
+msgstr ""
+"<a1>Structure du champ %s</a> &rsaquo; Confirmez la suppression du sous-"
+"champ %s"
+
+#. %1$s: TMPL_VAR name=tagfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:30
+#, c-format
+msgid "<a1>Tag %s Subfield Structure</a> &rsaquo; Edit subfields constraints"
+msgstr ""
+"<a1>Structure du champ %s</a> &rsaquo; Edition des contraintes de sous-"
+"champs MARC"
+
+#. %1$s: TMPL_VAR name=tagfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:31
+#, c-format
+msgid "<a1>Tag %s Subfield Structure</a> &rsaquo; Subfield Deleted"
+msgstr "<a1>Structure du champ %s</a> &rsaquo; Sous-champ supprimé"
+
 #. %1$s: TMPL_VAR name=shelfname
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:66
 #, c-format
@@ -3459,6 +3622,26 @@ msgstr ""
 "<a1>Recherche</a> <a2>Etagères viruelles</a> <a3>Ajout notice</a> <a4>Mise à "
 "jour catalogue</a>"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:87
+#, c-format
+msgid "<a1>z39.50 Servers</a> &rsaquo;"
+msgstr "<a1>Serveurs z3950</a> &rsaquo;"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:88
+#, c-format
+msgid "<a1>z39.50 Servers</a> &rsaquo; Confirm Deletion"
+msgstr "<a1>Serveurs z3950</a> &rsaquo; Confirmer la suppression"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:89
+#, c-format
+msgid "<a1>z39.50 Servers</a> &rsaquo; z39.50 Server Added"
+msgstr "<a1>Serveurs z3950</a> &rsaquo; Serveur ajouté"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:90
+#, c-format
+msgid "<a1>z39.50 Servers</a> &rsaquo; z39.50 Server Deleted"
+msgstr "<a1>Serveurs z3950</a> &rsaquo; Serveur supprimé"
+
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=author
 #. %3$s: TMPL_VAR name=isbn
@@ -3481,7 +3664,7 @@ msgstr "<b>(%s)</b> - <a1>%s</a>"
 msgid "<b>%s</b> subscription(s)"
 msgstr "<b>%s</b> abonnement(s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:231
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:196
 msgid ""
 "<b>&lt;a href=\"[856u]\"&gt;open site&lt;/a&gt;</b> will show the link just "
 "below the title"
@@ -3489,68 +3672,6 @@ msgstr ""
 "<b>&lt;a href=\"[856u]\"&gt;voir site&lt;/a&gt;</b> affichera le lien sous "
 "le titre"
 
-#. %1$s: TMPL_VAR name=dateaccessioned
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:68
-#, c-format
-msgid "<b><a1> Accession Date:</a></b> %s"
-msgstr "<b><a1>Date d'acquisition : </a></b> %s"
-
-#. %1$s: TMPL_VAR name=issues
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:72
-#, c-format
-msgid "<b><a1>Total Issues:</a></b> %s"
-msgstr "<b><a1>Total des prêts : </a></b> %s"
-
-#. %1$s: TMPL_VAR name=biblionumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:76
-#, c-format
-msgid "<b>Biblio number:</b> %s"
-msgstr "<b>Numéro de notice : </b> %s"
-
-#. %1$s: TMPL_VAR name=biblionumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:28
-#, c-format
-msgid "<b>Biblionumber:</b> %s"
-msgstr "<b>Numéro de notice : </b> %s"
-
-#. %1$s: TMPL_VAR name=classification
-#. %2$s: TMPL_VAR name=dewey
-#. %3$s: TMPL_VAR name=subclass
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:33
-#, c-format
-msgid "<b>Classification:</b> %s%s%s"
-msgstr "<b>Indexation : </b> %s%s%s"
-
-#. %1$s: TMPL_VAR name=holdingbranch
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:56
-#, c-format
-msgid "<b>Current Library:</b> %s"
-msgstr "<b>Site actuel : </b> %s"
-
-#. %1$s: TMPL_VAR name=date_due
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:60
-#, c-format
-msgid "<b>Date Due:</b> %s"
-msgstr "<b>Date de retour : </b> %s"
-
-#. %1$s: TMPL_VAR name=publicationyear
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:37
-#, c-format
-msgid "<b>Date:</b> %s"
-msgstr "<b>Date : </b> %s"
-
-#. %1$s: TMPL_VAR name=biblioitemnumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:75
-#, c-format
-msgid "<b>Group Number:</b> %s"
-msgstr "<b>Numéro de groupe :</b> %s"
-
-#. %1$s: TMPL_VAR name=homebranch
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:55
-#, c-format
-msgid "<b>Home Library:</b> %s"
-msgstr "<b>Site d'origine : </b> %s"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl:27
 msgid ""
 "<b>ISBD --</b> Koha can display records in International Standard "
@@ -3560,30 +3681,12 @@ msgstr ""
 "Standard Bibliographic Description. La syntaxe de ce champ est  assez "
 "complexe : "
 
-#. %1$s: TMPL_VAR name=isbn
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:34
-#, c-format
-msgid "<b>ISBN:</b> %s"
-msgstr "<b>ISBN : </b> %s"
-
-#. %1$s: TMPL_VAR name=illus
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:40
-#, c-format
-msgid "<b>Illus:</b> %s"
-msgstr "<b>Illus. : </b> %s"
-
 #. %1$s: TMPL_VAR name=issue
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:30
 #, c-format
 msgid "<b>Issue:</b> %s"
 msgstr "<b>Numéro : </b> %s"
 
-#. %1$s: TMPL_VAR name=itemtype
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:29
-#, c-format
-msgid "<b>Item type:</b> %s"
-msgstr "<b>Type de document : </b> %s"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl:46
 msgid ""
 "<b>KohaAdminEmailAddress --</b> The email address that will receive requests "
@@ -3592,42 +3695,6 @@ msgstr ""
 "<b>KohaAdminEmailAddress --</b>L'adresse électronique à laquelle les "
 "adhérents enverront leurs demandes de modification de leurs coordonnées."
 
-#. %1$s: TMPL_VAR name=card0
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:61
-#, c-format
-msgid "<b>Last Borrower 1:</b> %s"
-msgstr "<b>Dernier emprunteur 1 : </b> %s"
-
-#. %1$s: TMPL_VAR name=card1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:62
-#, c-format
-msgid "<b>Last Borrower 2:</b> %s"
-msgstr "<b>Dernier emprunteur 2 : </b> %s"
-
-#. %1$s: TMPL_VAR name=datelastborrowed
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:58
-#, c-format
-msgid "<b>Last borrowed:</b> %s"
-msgstr "<b>Emprunté pour la dernière fois le : </b> %s"
-
-#. %1$s: TMPL_VAR name=datelastseen
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:57
-#, c-format
-msgid "<b>Last seen:</b> %s"
-msgstr "<b>Vu pour la dernière fois le :  </b> %s"
-
-#. %1$s: TMPL_VAR name=loanlength
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:31
-#, c-format
-msgid "<b>Loan length:</b> %s"
-msgstr "<b>Durée du prêt : </b> %s"
-
-#. %1$s: TMPL_VAR name=count
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:43
-#, c-format
-msgid "<b>No. of Items:</b> %s"
-msgstr "<b>N° d'exemplaires : </b> %s"
-
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl:33
 msgid ""
@@ -3644,76 +3711,20 @@ msgstr ""
 "l'abonnement  crée une \"suggestion\" qui est envoyée dans le module "
 "acquisition."
 
-#. For the first occurrence,
-#. %1$s: TMPL_VAR name=bnotes
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:42
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:66
-#, c-format
-msgid "<b>Notes:</b> %s"
-msgstr "<b>Remarques : </b> %s"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl:26
 msgid "<b>Notes:</b> Please return this journal promptly as others are waiting."
 msgstr ""
 "<b>Remarques : </b> Prière de rendre ce périodique rapidement, d'autres "
 "l'attendent."
 
-#. %1$s: TMPL_VAR name=pages
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:39
-#, c-format
-msgid "<b>Pages:</b> %s"
-msgstr "<b>Pages : </b> %s"
-
-#. %1$s: TMPL_VAR name=paidfor
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:65
-#, c-format
-msgid "<b>Paid for:</b> %s"
-msgstr "<b>Réglé : </b> %s"
-
-#. %1$s: TMPL_VAR name=place
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:36
-#, c-format
-msgid "<b>Place:</b> %s"
-msgstr "<b>Emplacement : </b> %s"
-
-#. %1$s: TMPL_VAR name=publishercode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:35
-#, c-format
-msgid "<b>Publisher:</b> %s"
-msgstr "<b>Editeur : </b> %s"
-
-#. %1$s: TMPL_VAR name=renewals
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:67
-#, c-format
-msgid "<b>Renewals:</b> %s"
-msgstr "<b>Renouvellements : </b> %s"
-
-#. %1$s: TMPL_VAR name=rentalcharge
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:32
-#, c-format
-msgid "<b>Rental charge:</b> %s"
-msgstr "<b>Frais de location : </b> %s"
-
-#. %1$s: TMPL_VAR name=replacementprice
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:63
-#, c-format
-msgid "<b>Replacement Price:</b> %s"
-msgstr "<b>Prix de remplacement : </b> %s"
-
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=title
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:29
 #, c-format
 msgid "<b>Serial Title:</b> %s"
 msgstr "<b>Titre de périodique : </b> %s"
 
-#. %1$s: TMPL_VAR name=size
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:41
-#, c-format
-msgid "<b>Size:</b> %s"
-msgstr "<b>Format : </b> %s"
-
 #. %1$s: TMPL_VAR name=subscriptionid
 #. %2$S: type=text name=serialseq
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:235
@@ -3727,18 +3738,6 @@ msgstr "<b>Abt. %s</b> Nouveau numéro %S"
 msgid "<b>Title:</b> %s"
 msgstr "<b>Titre : </b> %s"
 
-#. %1$s: TMPL_VAR name=url
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:30
-#, c-format
-msgid "<b>URL:</b> %s"
-msgstr "<b>URL : </b> %s"
-
-#. %1$s: TMPL_VAR name=volumeddesc
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:38
-#, c-format
-msgid "<b>Volume:</b> %s"
-msgstr "<b>Epaisseur : </b> %s"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:65
 msgid "<b>Waiting suggestion,</b> accept or reject these suggestions with a reason."
 msgstr ""
@@ -4014,7 +4013,7 @@ msgstr "<i>en </i>%s"
 
 #. %1$s: TMPL_VAR name=biblionumber
 #. %2$s: TMPL_VAR name=bibliotitle
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:115
 #, c-format
 msgid "<i>(%s)</i> <a1>%s</a>"
 msgstr "<i>(%s)</i> <a1>%s</a>"
@@ -4041,7 +4040,7 @@ msgid "="
 msgstr "="
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:46
 msgid ""
 "A \"thesaurus category\": it refers to a thesaurus category. See the "
 "corresponding admin table."
@@ -4050,7 +4049,7 @@ msgstr ""
 "Voir la Table de gestion correspondante."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:47
 msgid ""
 "A \"value builder\": values builders are perl programs that help you select "
 "the value of the field. They are MARC-flavor dependant and sometimes fill "
@@ -4107,12 +4106,12 @@ msgstr "TOUS les champs d'exemplaire DOIVENT : "
 msgid "About"
 msgstr "A propos"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:69
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:49
 msgid "About Koha"
 msgstr "A propos de Koha"
 
@@ -4140,6 +4139,10 @@ msgstr "Suggestions acceptées"
 msgid "Access denied"
 msgstr "Accès refusé"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:105
+msgid "Accession Date:"
+msgstr "Accédé le"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:29
 msgid "Account Management Fee"
 msgstr "Gestion de la comptabilité des cotisations"
@@ -4174,16 +4177,16 @@ msgstr "Compte de %s, %s"
 msgid "Accounting Details"
 msgstr "Détails de comptabilité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:193
 msgid "Accounting details"
 msgstr "Détails de comptabilité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:28
 msgid "Accounts and budgets"
 msgstr "Postes et budgets"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:29
 msgid "Accounts and budgets administration for acquisitions."
 msgstr "Postes et budgets pour les acquisitions"
 
@@ -4192,15 +4195,15 @@ msgstr "Postes et budgets pour les acquisitions"
 msgid "Acquisition Date"
 msgstr "Date d'acquisition"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:129
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:10
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:36
 msgid "Acquisitions"
 msgstr "Acquisitions"
 
@@ -4209,10 +4212,10 @@ msgstr "Acquisitions"
 msgid "Acquisitions statistics"
 msgstr "Statistiques sur les acquisitions"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:112
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:33
 msgid "Action"
 msgstr "Action"
 
@@ -4220,28 +4223,28 @@ msgstr "Action"
 msgid "Action :"
 msgstr "Action : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:240
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:82
 msgid "Actions"
 msgstr "Actions"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:173
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:169
 msgid "Active"
 msgstr "Actif"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:57
 msgid "Active:"
 msgstr "Actif:"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:262
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:265
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:261
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:264
 msgid "Actual Cost"
 msgstr "Coût réel"
 
@@ -4249,21 +4252,22 @@ msgstr "Coût réel"
 msgid "Adam Thick"
 msgstr "Adam Thick"
 
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:246
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:109
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:45
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:261
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:139
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:31
 msgid "Add"
 msgstr "Ajouter"
 
@@ -4280,18 +4284,17 @@ msgstr "Ajouter <i>%s</i>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:12
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:220
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:207
 msgid "Add Agency Category"
 msgstr "Ajouter une catégorie"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:450
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newbiblio.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:472
 msgid "Add Bibliographic Record"
 msgstr "Ajouter notice bibliographique"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:225
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:221
 msgid "Add Category"
 msgstr "Ajouter une catégorie"
 
@@ -4310,18 +4313,18 @@ msgstr "Ajouter une commune"
 msgid "Add Credit"
 msgstr "Ajouter  crédit"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:76
 msgid "Add Currency"
 msgstr "Ajouter une devise"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:169
 msgid "Add Item"
 msgstr "Nouvel exemplaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:314
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:278
 msgid "Add Item type"
 msgstr "Ajouter un type de document"
 
@@ -4329,14 +4332,14 @@ msgstr "Ajouter un type de document"
 msgid "Add List Member"
 msgstr "Ajouter un membre à la liste"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:32
 msgid "Add MARC"
 msgstr "Ajout notice"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:444
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:438
 msgid "Add MARC Record"
 msgstr "Ajout notice MARC"
 
@@ -4349,7 +4352,7 @@ msgid "Add Member, person"
 msgstr "Inscrire un individuel"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:202
 msgid "Add New Category"
 msgstr "Ajouter une nouvelle catégorie"
 
@@ -4381,14 +4384,13 @@ msgstr "Ajouter note"
 msgid "Add Notice"
 msgstr "Ajouter notification"
 
-#. INPUT type=button name=step4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:579
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:573
 msgid "Add Patron"
 msgstr "Ajouter adhérent"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:186
 msgid "Add Printer"
 msgstr "Ajouter une imprimante"
 
@@ -4398,8 +4400,8 @@ msgid "Add Record"
 msgstr "Ajouter une notice"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:42
 msgid "Add Record Without Search"
 msgstr "Ajouter une notice sans recherche"
 
@@ -4423,12 +4425,12 @@ msgid "Add Subscription"
 msgstr "Ajouter un abonnement"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:201
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:225
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:226
 msgid "Add Tag"
 msgstr "Ajouter un champ"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:146
 msgid "Add To Order"
 msgstr "Ajouter à une commande"
 
@@ -4436,12 +4438,12 @@ msgstr "Ajouter à une commande"
 msgid "Add Z39.50 Server"
 msgstr "Ajouter un serveur Z39.50"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:87
 msgid "Add a book to the receipt"
 msgstr "Ajouter un document à la réception"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:175
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:172
 msgid "Add a city"
 msgstr "Ajouter une commune"
 
@@ -4468,7 +4470,7 @@ msgstr "Ajouter une nouvelle étagère"
 msgid "Add a subscription"
 msgstr "Ajouter un abonnement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:809
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:806
 msgid "Add a subscription (Serial Holdings Record)"
 msgstr "Ajout d'un abonnement "
 
@@ -4497,10 +4499,10 @@ msgstr "Ajouter un autre champ"
 msgid "Add authorised value"
 msgstr "Ajout valeur autorisée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:205
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:214
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:300
+#. INPUT type=button
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:397
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:406
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:553
 msgid "Add authority"
 msgstr "Ajouter autorité"
 
@@ -4509,7 +4511,7 @@ msgstr "Ajouter autorité"
 msgid "Add authority type"
 msgstr "Ajout d'un type d'autorité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:151
 msgid "Add biblio"
 msgstr "Ajout notice"
 
@@ -4517,8 +4519,8 @@ msgstr "Ajout notice"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:99
 msgid "Add category"
 msgstr "Ajouter une catégorie"
 
@@ -4533,7 +4535,7 @@ msgid "Add child"
 msgstr "Ajouter un enfant"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:175
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:172
 msgid "Add city"
 msgstr "Ajouter une commune"
 
@@ -4554,13 +4556,12 @@ msgid "Add help"
 msgstr "Ajouter de l'aide"
 
 #. INPUT type=button
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:192
 msgid "Add item"
 msgstr "Valider l'exemplaire"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:90
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:114
 msgid "Add item type"
 msgstr "Ajouter un type de document"
 
@@ -4576,7 +4577,7 @@ msgstr "Ajouter une lettre"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:31
 msgid "Add library"
 msgstr "Ajouter un site"
 
@@ -4597,7 +4598,7 @@ msgstr "Ajouter des nouvelles"
 msgid "Add or remove virtual shelves"
 msgstr "Ajouter ou supprimer les étagères virtuelles"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:32
 msgid "Add order"
 msgstr "Ajouter une commande"
 
@@ -4614,25 +4615,24 @@ msgid "Add professional"
 msgstr "Ajouter un professionnel"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:137
 msgid "Add road type"
 msgstr "Ajouter un type de voie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:150
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1200
+#. INPUT type=button
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1196
 msgid "Add subscription"
 msgstr "Ajouter un abonnement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:36
 msgid "Add supplier"
 msgstr "Ajout d'un fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:84
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:83
 msgid "Add tag"
 msgstr "Ajouter un champ"
 
@@ -4644,11 +4644,15 @@ msgstr "Ajouter à une nouvelle étagère virtuelle :"
 msgid "Add to existing group"
 msgstr "Ajouter au groupe existant"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:9
+msgid "Add to shelf"
+msgstr "Ajouter à une étagère"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:49
 msgid "Add to virtual shelf"
-msgstr "Ajouter à l'étagère virtuelle"
+msgstr "Ajouter à l'étagère"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:74
 msgid "Add word"
@@ -4664,12 +4668,18 @@ msgstr "Ajouter un serveur Z39.50"
 msgid "Adding a new bibliographic record"
 msgstr "Ajouter une nouvelle notice bibliographique"
 
+#. For the first occurrence,
 #. %1$s: TMPL_VAR name=authtypetext
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:373
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:384
 #, c-format
 msgid "Adding authority (%s)"
 msgstr "Ajout autorité (%s)"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:125
+msgid "Additional Authors:"
+msgstr "Autres auteurs :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:194
 msgid "Additional Content Types"
 msgstr "Autres types de contenu"
@@ -4678,24 +4688,35 @@ msgstr "Autres types de contenu"
 msgid "Additional infos"
 msgstr "Informations complémentaires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:65
 msgid "Additional parameters"
 msgstr "Paramètres divers"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:29
 msgid "Address"
 msgstr "Adresse"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:224
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:230
 msgid "Address 2:"
 msgstr "Adresse 2"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:215
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:354
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:63
+msgid "Address Line 1"
+msgstr "Adresse 1"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:64
+msgid "Address Line 2"
+msgstr "Adresse 2"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:65
+msgid "Address Line 3"
+msgstr "Adresse 3"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:221
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:355
 msgid "Address:"
 msgstr "Adresse : "
 
@@ -4708,31 +4729,38 @@ msgstr "Adresse : l'adresse de l'adhérent semble erronée"
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:208
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:204
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:19
 msgid "Adult"
 msgstr "Adulte"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:14
+msgid "Advanced"
+msgstr "Avancé"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:28
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:110
-msgid "Advanced constraint"
-msgstr "Restrictions MARC"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:83
+msgid "Advanced constraints"
+msgstr "Contraintes avancées"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:156
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:190
 msgid "Age Required"
 msgstr "Age requis"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:155
+msgid "Age Required:"
+msgstr "Age requis"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:110
 msgid "Age required"
 msgstr "Age requis"
 
@@ -4740,7 +4768,7 @@ msgstr "Age requis"
 msgid "Agency Categories"
 msgstr "Catégories de site"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:54
 msgid "Agency Categories:"
 msgstr "Catégories de site :"
 
@@ -4754,14 +4782,18 @@ msgstr "Al Banks"
 msgid "Alert subscribers for <i>%s</i>"
 msgstr "Alerter  inscrits pour <i>%s</i>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:62
 msgid "All"
 msgstr "Tous"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:435
+msgid "All Branches"
+msgstr "Tous sites"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:116
 msgid "All Item Types"
 msgstr "Tous types de document"
@@ -4788,15 +4820,19 @@ msgstr ""
 "Tous les adhérents ayant un historique de prêt antérieur à %s ont été rendus "
 "anonymes."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:218
 msgid "Allowed"
 msgstr "Autorisé"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:101
+msgid "Already Recieved"
+msgstr "Déjà reçus"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:121
 msgid "Alternate Address"
 msgstr "Autre adresse"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:347
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:348
 msgid "Alternate address"
 msgstr "Autre adresse"
 
@@ -4808,7 +4844,7 @@ msgstr "Autre adresse : "
 msgid "Alternate city:"
 msgstr "Autre ville :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:207
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:200
 msgid "Alternate title:"
 msgstr "Autre titre :"
 
@@ -4820,11 +4856,9 @@ msgstr "Autre code postal :"
 msgid "Alternative phone"
 msgstr "Autre téléphone"
 
-#. %1$s: TMPL_VAR name=contaltphone
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:159
-#, c-format
-msgid "Alternative phone %s"
-msgstr "Autre téléphone %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:155
+msgid "Alternative phone:"
+msgstr "Autre téléphone :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tmpl:16
 msgid ""
@@ -4843,11 +4877,11 @@ msgstr "Ambrose Li"
 msgid "Ambrose Li (translation tool)"
 msgstr "Ambrose Li (outil de traduction)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl:30
 msgid "Amount"
 msgstr "Montant"
 
@@ -4856,7 +4890,7 @@ msgid "Amount Outstanding"
 msgstr "Montant à recouvrer"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:45
 msgid ""
 "An \"authorised value\": it refers to a list of authorised values for this "
 "subfield. See the corresponding admin table."
@@ -4870,13 +4904,13 @@ msgstr ""
 "Une étagère publique peut-être vue par tout le monde, mais est gérée par "
 "vous seul."
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:14
 msgid "An Error has Occurred!"
 msgstr "Une erreur s'est produite!"
 
@@ -4905,6 +4939,9 @@ msgstr "Rendre anonyme l'historique de prêt antérieur à %S"
 
 #. INPUT type=checkbox name=request
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:38
 msgid "Any"
 msgstr "Tous"
 
@@ -4929,7 +4966,7 @@ msgstr "Toute expression"
 msgid "Any Word"
 msgstr "Tout mot"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:844
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:842
 msgid "Any branch"
 msgstr "Tout site"
 
@@ -4955,9 +4992,9 @@ msgstr ""
 "Tous les documents réservés par un adhérent seront affichés en haut à droite "
 "de cet écran."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:69
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:73
 msgid "Anywhere"
 msgstr "Partout"
 
@@ -4970,6 +5007,12 @@ msgstr "Version Apache : "
 msgid "Appear in position"
 msgstr "S'affiche en position"
 
+#
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:56
+msgid "Apply Filter"
+msgstr "Filtrer"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl:48
 msgid "Approve"
 msgstr "Approuver"
@@ -4979,9 +5022,11 @@ msgstr "Approuver"
 msgid "Apr"
 msgstr "Avr"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:169
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:169
 msgid "April"
 msgstr "Avril"
 
@@ -4994,37 +5039,37 @@ msgstr ""
 "adhérents ?"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:57
-msgid "Are you sure you want to delete this biblio? "
-msgstr "Êtes vous sûr de vouloir supprimer cette nogice?"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:127
+msgid "Are you sure you want to delete this item?"
+msgstr "Êtes vous sûr de vouloir supprimer cet exemplaire ?"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:56
-msgid "Are you sure you want to delete this item?"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:86
+msgid "Are you sure you want to delete this record? "
 msgstr "Êtes vous sûr de vouloir supprimer cet exemplaire ?"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Are you sure you want to delete this subscription?"
 msgstr "Êtes vous sur de vouloir supprimer cet abonnement ?"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:467
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:462
 msgid "Arrival date:"
 msgstr "Date d'arrivée :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:297
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:70
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:295
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:249
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:117
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:235
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:336
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:335
 msgid "Arrived"
 msgstr "Arrivé"
 
@@ -5053,10 +5098,6 @@ msgstr ""
 "souhaitez, pour par exemple changer une longue liste (1,2,3,4,...,51) en une "
 "plus courte (1-51)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:7
-msgid "As New Record (Duplicate)"
-msgstr "Comme une nouvelle notire (Dupliquer)"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:23
 #, c-format
 msgid ""
@@ -5071,33 +5112,35 @@ msgstr ""
 msgid "Aug"
 msgstr "Août"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:173
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:173
 msgid "August"
 msgstr "Août"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:167
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:198
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:229
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:260
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:291
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:322
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:353
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:384
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:415
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:241
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:271
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:301
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:331
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:361
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:391
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:148
 msgid "Auth"
 msgstr "Autor."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:173
 msgid "Auth value"
 msgstr "Valeur autorisée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:25
 msgid ""
 "Auth value : means the value is not free, but in the authorised value list "
@@ -5106,32 +5149,32 @@ msgstr ""
 "Valeur autorisée : signifie que la valeur n'est pas libre, mais dans la "
 "liste de valeurs autorisées du type sélectionné"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:120
 msgid "Auth value:"
 msgstr "Valeur autorisée : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:137
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:741
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl:50
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:267
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl:125
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:741
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:136
 msgid "Author"
 msgstr "Auteur"
 
@@ -5141,23 +5184,23 @@ msgstr "Auteur"
 msgid "Author %s"
 msgstr "Auteur %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:460
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:462
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:461
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:463
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:202
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:204
 msgid "Author (A-Z)"
 msgstr "Auteur (A-Z)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:465
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:467
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:466
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:468
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:207
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:209
 msgid "Author (Z-A)"
 msgstr "Auteur (Z-A)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl:23
 msgid "Author:"
 msgstr "Auteur : "
 
@@ -5167,17 +5210,17 @@ msgstr "Auteur : "
 msgid "Author: %s"
 msgstr "Auteur :  %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:179
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:176
 msgid "Authorised"
 msgstr "Autorisé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:107
 msgid "Authorised value"
 msgstr "Valeur autorisée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:15
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:53
 msgid "Authorised values"
 msgstr "Valeurs autorisées"
 
@@ -5186,22 +5229,22 @@ msgstr "Valeurs autorisées"
 msgid "Authorised values management"
 msgstr "Gestion des valeurs autorisées"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:33
 msgid "Authorities"
 msgstr "Autorités"
 
 #. %1$s: TMPL_VAR name=authid
 #. %2$s: TMPL_VAR name=authtypetext
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:104
 #, c-format
 msgid "Authority #%s (%s)"
 msgstr "Autorité  #%s (%s)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
-msgid "Authority MARC Framework"
+msgid "Authority MARC Framework:"
 msgstr "Grille d'autorité MARC"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:75
@@ -5210,7 +5253,7 @@ msgstr "Grille d'autorité Marc pour"
 
 #. %1$s: TMPL_VAR name=tagfield
 #. %2$s: TMPL_VAR name=authtypecode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:85
 #, c-format
 msgid "Authority MARC subfield structure admin for %s (authority: %s)"
 msgstr "Gestion de la structure des sous-champs Marc autorités pour %s (autorité %s)"
@@ -5248,19 +5291,18 @@ msgstr "Autorité numéro  %s"
 msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
 msgstr "Autorité numéro <!-- TMPL_VAR name=\"authid\" -->"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:35
 msgid "Authority search"
 msgstr "Recherche autorité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:41
 msgid "Authority search results"
 msgstr "Résultats recherche autorité"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:29
 msgid "Authority type"
@@ -5275,40 +5317,36 @@ msgstr "Type d'autorité : code absent"
 msgid "Authority types"
 msgstr "Types d'autorité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:126
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:122
 msgid "Authority:"
 msgstr "Autorité : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:91
 msgid "Authorized Value"
 msgstr "Valeur autorisée"
 
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:37
 #, c-format
 msgid "Authorized Value %s"
 msgstr "Valeur autorisée : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:91
 msgid "Authorized value"
 msgstr "Valeur autorisée"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:73
-msgid "Authorized values admin"
-msgstr "Gestion des valeurs autorisées"
+msgid "Authorized values"
+msgstr "Valeurs autorisées"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl:23
 msgid "Authors"
 msgstr "Auteurs"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:134
-msgid "Authors:"
-msgstr "Auteurs : "
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:376
 msgid "Autre"
 msgstr "Autre"
@@ -5330,16 +5368,16 @@ msgstr "Autres types de documents graphiques non projetables"
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Autumn"
 msgstr "Automne"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:93
 msgid "Avail"
 msgstr "Dispo."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:254
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:250
 msgid "Available"
 msgstr "Disponible"
 
@@ -5355,24 +5393,18 @@ msgstr "Durée moyenne de prêt"
 msgid "Average checkout period statistics"
 msgstr "Statistique de la durée moyenne de prêt"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:49
 msgid "Average loan time"
 msgstr "Durée moyenne du prêt"
 
-#. %1$s: TMPL_VAR name=barcode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:50
-#, c-format
-msgid "BARCODE %s"
-msgstr "CODE A BARRES %s"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:97
 msgid "BASKET"
 msgstr "PANIER"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:28
 msgid "Back"
 msgstr "Retour"
 
@@ -5403,26 +5435,31 @@ msgstr "Bande dessinée"
 msgid "Bar Code"
 msgstr "Code à barres"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:231
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:99
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:238
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:645
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:739
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:253
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:162
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:194
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:265
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:191
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:265
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:645
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:739
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:253
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:54
 msgid "Barcode"
 msgstr "Code à barres"
 
+#. For the first occurrence,
 #. %1$s: TMPL_VAR name=barcode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:20
 #, c-format
 msgid "Barcode %s"
@@ -5434,11 +5471,11 @@ msgstr "Code à barres (texte)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=barcode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:145
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:42
 #, c-format
 msgid "Barcode : %s"
 msgstr "Code à barres : %s"
@@ -5470,38 +5507,38 @@ msgstr ""
 "Sur la base du <br \\/> modèle de numérotation saisi<br \\/> cela "
 "ressemblera à ceci <br \\/>\\n"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:96
-msgid "Basic constaints"
-msgstr "Éditeur des restrictions"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:65
+msgid "Basic constraints"
+msgstr "Contraintes de base"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:24
 msgid "Basic parameters"
 msgstr "Paramètres de base"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:43
 msgid "Basket"
 msgstr "Panier"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:33
 msgid "Basket Details"
 msgstr "Contenu du panier"
 
 #. %1$s: TMPL_VAR name=basketno
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:93
 #, c-format
 msgid "Basket Number: %s"
 msgstr "Numéro de panier : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:139
 msgid "Basket empty"
 msgstr "Panier vide"
 
 #. %1$s: TMPL_VAR name=basketno
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:34
 #, c-format
 msgid "Basket number %s"
 msgstr "Numéro de panier %s"
@@ -5581,15 +5618,15 @@ msgstr ""
 "une catégorie C (Centrale) et une catégorie A (Annexe), avec comme "
 "définition Bibliothèque Centrale et Bibliothèque Annexe."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:126
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:125
 msgid "Beginnning date:"
 msgstr "Date de début :  "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1059
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1057
 msgid "Begins On: (*)"
 msgstr "Commence le : (*)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1149
 msgid "Begins with"
 msgstr "Commence au"
 
@@ -5597,27 +5634,14 @@ msgstr "Commence au"
 msgid "Benedykt P. Barszcz (Polish for 2.0)"
 msgstr "Benedykt P. Barszcz (Polonais pour version 2.0)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:828
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:826
 msgid "Biblio"
 msgstr "Notice bibliographique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:13
 msgid "Biblio Framework"
 msgstr "Grille de catalogage"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
-msgid "Biblio Framework &rsaquo;"
-msgstr "Grille de catalogage &rsaquo;"
-
-#. %1$s: TMPL_VAR name=frameworktext
-#. %2$s: TMPL_VAR name=frameworkcode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
-#, c-format
-msgid "Biblio Framework &rsaquo; Delete Framework for %s (%s)?"
-msgstr "Grille de catalogage &rsaquo; Supprimer la grille pour %s (%s)?"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:80
 msgid "Biblio Summary"
 msgstr "Abrégé"
@@ -5626,12 +5650,15 @@ msgstr "Abrégé"
 msgid "Biblio count"
 msgstr "Nombre de notices"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tmpl:7
 msgid "Biblio framework"
 msgstr "Grille de catalogage"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:126
+msgid "Biblio number:"
+msgstr "Numéro de notice : "
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:115
 msgid "Biblio:"
 msgstr "Notice biblio : "
 
@@ -5639,10 +5666,6 @@ msgstr "Notice biblio : "
 msgid "Bibliographic Details"
 msgstr "Détails bibliographiques"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:5
-msgid "Bibliographic Record"
-msgstr "Notice bibliographique"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:310
 msgid "Bibliographie"
 msgstr "Bibliographie"
@@ -5656,8 +5679,12 @@ msgstr "Bibliographies"
 msgid "Biblioitem Number:"
 msgstr "Numéro du Biblioitem : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:25
+msgid "Biblionumber:"
+msgstr "Numéro de notice :"
+
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:134
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:132
 msgid "Biblios in reservoir"
 msgstr "Notices dans le réservoir"
 
@@ -5694,7 +5721,7 @@ msgid "Bois"
 msgstr "Bois"
 
 #. IMG
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:155
 msgid "Book Cover Image"
 msgstr "Image de couverture"
 
@@ -5703,6 +5730,10 @@ msgstr "Image de couverture"
 msgid "Book Fund Administration"
 msgstr "Gestion des postes budgétaires"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:4
+msgid "Book Funds"
+msgstr "Ligne de crédit"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl:12
 msgid ""
 "Book Funds may be ignored if you are setting your System Preferences to "
@@ -5713,14 +5744,17 @@ msgstr ""
 "Préférences Système sur acquisitions\"simple\" : les postes budgétaires sont "
 "utiles uniquement quand vous utilisez les acquisitions \"normal\"."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:182
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:232
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:224
 msgid "Book fund"
 msgstr "Ligne de crédit"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:180
+msgid "Book fund:"
+msgstr "Ligne de crédit :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:23
 msgid "Book information"
 msgstr "Information document"
@@ -5730,8 +5764,8 @@ msgstr "Information document"
 msgid "Book seller"
 msgstr "Fournisseur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:206
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:209
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:205
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:208
 msgid "Bookfund"
 msgstr "Ligne de crédit"
 
@@ -5754,8 +5788,9 @@ msgstr ""
 "Livres, Pamphlets, rapports techniques, Manuscrits, Publications légales, "
 "Mémoires et thèses"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:267
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:128
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:261
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:48
 msgid "Borrower"
 msgstr "Adhérent"
 
@@ -5769,6 +5804,17 @@ msgstr "Catégories d'adhérent "
 msgid "Borrower Category"
 msgstr "Catégorie d'adhérent"
 
+#
+#. %1$s: TMPL_VAR name=CGIflags
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:29
+#, c-format
+msgid "Borrower Flags :%s"
+msgstr "Indicateurs adhérents : %s"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:52
+msgid "Borrower desc"
+msgstr "Adhérent desc"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:25
 msgid "Borrowernumber"
 msgstr "N° d'adhérent"
@@ -5785,41 +5831,45 @@ msgstr "Aide adhérents"
 msgid "Braille"
 msgstr "Braille"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:182
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:236
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:309
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:215
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:839
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:236
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:136
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:239
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:239
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:194
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:43
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:215
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:841
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:136
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:181
 msgid "Branch"
 msgstr "Site"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:116
 msgid "Branch :"
 msgstr "Site : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:419
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:297
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:414
 msgid "Branch:"
 msgstr "Site : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:30
+msgid "Branchcode"
+msgstr "Code site"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:320
 msgid "Brevet"
 msgstr "Brevet"
@@ -5860,7 +5910,7 @@ msgstr "Permet de consulter les logs du système"
 msgid "Budget"
 msgstr "Budget"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:363
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:349
 msgid "Budget Amount"
 msgstr "Montant budget"
 
@@ -5876,30 +5926,33 @@ msgid "Budget Date"
 msgstr "Date budget"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:95
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:301
 msgid "Budget amount"
 msgstr "Montant budget"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:292
+msgid "Budget amount:"
+msgstr "Montant budget :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:81
 #, c-format
 msgid "Budget deleted, return to <a1>budget list</a>"
 msgstr "Budget supprimé, retourner à la <a1>liste des budgets</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:233
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:236
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:232
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:235
 msgid "Budgeted Cost"
 msgstr "Coût budgété"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:243
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:242
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:245
 msgid "Budgeted GST"
 msgstr "TVA budgetée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:89
 msgid "Budgets"
 msgstr "Budgets"
 
@@ -5923,7 +5976,7 @@ msgstr "Budgets &rsaquo; Supprimer le poste budgétaire ?"
 msgid "Budgets and Bookfunds"
 msgstr "Budgets et postes budgétaires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:83
 msgid "Budgets and Funds"
 msgstr "Budgets et postes budgétaires"
 
@@ -5931,10 +5984,10 @@ msgstr "Budgets et postes budgétaires"
 msgid "Bulk edit"
 msgstr "Modifications globales"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:55
 msgid "By"
 msgstr "Par"
 
@@ -5957,7 +6010,7 @@ msgid "CONFIRM DELETION of %s"
 msgstr "CONFIRMEZ SUPPRESSION de %s"
 
 #. %1$s: TMPL_VAR name=categorycode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:149
 #, c-format
 msgid "Cagegory %s is in use. Deletion not possible!"
 msgstr "Cette catégorie est utilisée %s fois. Suppression impossible!"
@@ -5967,37 +6020,37 @@ msgid "Calendar information"
 msgstr "Calendrier"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:37
 msgid "Call No."
 msgstr "Cote"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:213
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:231
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:231
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:213
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:95
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:837
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:835
 msgid "Call Number"
 msgstr "Cote"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:475
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:477
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:476
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:478
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:217
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:219
 msgid "Call Number (Fiction Z-A to Non-fiction 9-0)"
 msgstr "Cote (Fiction Z-A à Non fiction 9-0)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:470
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:472
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:471
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:473
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:212
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:214
 msgid "Call Number (Non-fiction 0-9 to Fiction A-Z)"
 msgstr "Cote (Non fiction 0-9 à Fiction A-Z)"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:117
 msgid "Call Number:"
 msgstr "Cote : "
 
@@ -6006,8 +6059,8 @@ msgstr "Cote : "
 msgid "Call no"
 msgstr "Cote n°"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:51
 msgid "Call number"
 msgstr "Cote"
 
@@ -6024,32 +6077,34 @@ msgstr "Cote"
 msgid "Callnumber %S Barcode %S"
 msgstr "Cote  %S code à barres %S"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:69
+msgid "Can be entered as a single IP, or a subnet such as 192.168.1.*"
+msgstr ""
+"Peut être saisi comme une adresse IP simple, un sous réseau tel que "
+"192.168.1.*"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:244
 msgid "Can't be cancelled when item is on transfer"
 msgstr "Ne peut  pas être annulé, lorsqu'il y a un exemplaire en transfert"
 
+#. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:425
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:415
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:362
 msgid "Can't save this record because the following field aren't filled :\\n\\n"
 msgstr "Impossible d'enregistrer la notice, les champs suivants sont vides : \\n\\n"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:340
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:238
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:119
+#. INPUT type=button
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:176
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:70
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:211
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:250
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:70
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -6063,13 +6118,8 @@ msgid "Cancel a Reserve"
 msgstr "Annuler une réservation"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:50
-msgid "Cancel and Return to Authorized Values"
-msgstr "Annuler et retourner à valeurs autorisées"
-
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:93
-msgid "Cancel and Return to MARC Tag Structure"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:94
+msgid "Cancel and Return to MARC Frameworks"
 msgstr "Annuler et retourner à la structure des champs MARC"
 
 #. INPUT type=submit name=submit
@@ -6094,18 +6144,12 @@ msgstr ""
 "Annuler une réservation et retourner à : <!-- TMPL_VAR NAME=\"homebranch\" --"
 ">"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:71
-msgid "Cancelled:"
-msgstr "Annulé : "
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:210
 msgid "Cannot Delete Item Type"
 msgstr "Impossible de supprimer ce type de document"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=itemtype
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:95
 #, c-format
 msgid "Cannot Delete Item Type '%s'"
 msgstr "Impossible de supprimer le type de document '%s'"
@@ -6114,6 +6158,14 @@ msgstr "Impossible de supprimer le type de document '%s'"
 msgid "Cannot Delete Patron"
 msgstr "Impossible de supprimer cet adhérent"
 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=categorycode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:78
+#, c-format
+msgid "Cannot Delete: Category %s in Use"
+msgstr "Impossible de supprimer cette catégorie (utilisée %s fois)"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:229
 msgid "Cant' be selected (lost or long overdue)"
 msgstr "Ne peut être choisi (perdu ou en retard depuis très longtemps)"
@@ -6127,18 +6179,18 @@ msgstr "Caractère braille et moon"
 msgid "Card"
 msgstr "Carte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:411
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:406
 msgid "Card number:"
 msgstr "Numéro de carte :"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:10
 msgid "Cardnumber"
 msgstr "Numéro de carte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:67
 msgid "Cardnumber already in use"
 msgstr "Désolé, ce code à barres est déjà utilisé"
 
@@ -6187,21 +6239,21 @@ msgstr "Recherche catalogue"
 msgid "Catalogs"
 msgstr "Catalogues"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:311
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:161
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:200
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:202
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:80
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:34
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:5
 msgid "Catalogue"
 msgstr "Catalogue"
 
@@ -6209,12 +6261,12 @@ msgstr "Catalogue"
 msgid "Catalogue Details"
 msgstr "Détails du catalogue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:47
 msgid "Catalogue by itemtype"
 msgstr "Catalogue par type de document"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:105
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:104
 msgid "Catalogue details"
 msgstr "Détails du catalogue"
 
@@ -6227,13 +6279,17 @@ msgstr "Recherche catalogue"
 msgid "Catalogue statistics"
 msgstr "Statistiques sur le catalogue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:49
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:30
 msgid "Cataloguing"
 msgstr "Catalogage"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:21
+msgid "Cataloguing Search"
+msgstr "Recherche catalogue"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:117
@@ -6246,12 +6302,11 @@ msgid "Category Code and Description"
 msgstr "Code de catégorie et description"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:80
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:171
 msgid "Category Deleted"
 msgstr "Catégorie supprimée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:187
 msgid "Category Name"
 msgstr "Nom de la catégorie"
 
@@ -6261,29 +6316,33 @@ msgstr ""
 "La catégorie ne peut être supprimée parce qu'il y a des sites qui "
 "l'utilisent."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:222
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:107
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:106
 msgid "Category code"
 msgstr "Code catégorie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:214
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:218
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:152
+msgid "Category code:"
+msgstr "Code catégorie :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:123
 msgid "Category type"
 msgstr "Type de catégorie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:424
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:181
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:232
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:419
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:148
 msgid "Category:"
 msgstr "Catégorie : "
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=categorycode
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:27
 #, c-format
 msgid "Category: %s"
 msgstr "Catégorie : %s"
@@ -6294,8 +6353,8 @@ msgstr "Catégorie : %s"
 msgid "Categorycode"
 msgstr "Code catégorie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:260
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:229
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:260
 msgid "Cell value"
 msgstr "Valeur de cellule"
 
@@ -6334,11 +6393,9 @@ msgstr "Modification de l'identifiant utilisateur et/ou du mot de passe"
 msgid "Change Username and/or Password for %s %s"
 msgstr "Modification de l'identifiant utilisateur et/ou du mot de passe de %s %s"
 
-#. %1$s: TMPL_VAR name=framework
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:455
-#, c-format
-msgid "Change framework : %s"
-msgstr "Avec la grille : %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:475
+msgid "Change framework:"
+msgstr "Changer la grille :"
 
 #. %1$S: type=text name=targetvalue
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:162
@@ -6347,27 +6404,28 @@ msgid "Change to : %S"
 msgstr "Changer pour : %S"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:52
 msgid "Character encoding:"
 msgstr "Format des données :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:275
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:196
 msgid "Charge"
 msgstr "Frais"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:11
 msgid "Check Expiration"
 msgstr "Vérificater dates d'expiration"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:243
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:679
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:716
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:243
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:28
 msgid "Check In"
 msgstr "Retours"
 
@@ -6381,20 +6439,22 @@ msgstr "Bulletiner <i>%s</i>"
 msgid "Check In?"
 msgstr "Retours ?"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:27
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:34
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:20
 msgid "Check Out"
 msgstr "Prêt"
 
@@ -6413,15 +6473,15 @@ msgstr "Tout (dé)cocher"
 msgid "Check expiration"
 msgstr "Vérification des dates d'expiration"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:15
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:65
 msgid "Check in"
 msgstr "Retours"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:58
 msgid "Check out to:"
 msgstr "Préter à :"
 
@@ -6437,14 +6497,13 @@ msgstr "Vérification du nom de l'hôte dans koha.xml"
 msgid "Check your database settings in"
 msgstr "Vérifiez les réglages de votre base de données"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:218
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:254
 msgid "Checked"
 msgstr "Contrôlé"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:157
-msgid "Checked (searched by default)"
-msgstr "Vérifié(recherché par défaut)"
+msgid "Checked (searched by default):"
+msgstr "Actif (recherché par défaut)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:77
 msgid "Checked Out"
@@ -6454,6 +6513,10 @@ msgstr "En prêt"
 msgid "Checked-In items"
 msgstr "Documents retournés"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:218
+msgid "Checked:"
+msgstr "Actif :"
+
 #. %1$s: TMPL_VAR name=title
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:18
 #, c-format
@@ -6469,14 +6532,14 @@ msgstr "Statistiques sur les prêts"
 msgid "Checkouts"
 msgstr "En prêt"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:27
 msgid "Checkouts by patron category"
 msgstr "Prêts par catégorie d'adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:60
 msgid ""
 "Checks the MARC structure. If you change your MARC Bibliographic framework "
 "it's recommended that you run this tool to test for errors in your "
@@ -6486,16 +6549,16 @@ msgstr ""
 "MARC, il est recommandé de lancer ce script pour vérifier qu'il n'y a pas "
 "d'erreurs dans vos grilles"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:209
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:205
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:19
 msgid "Child"
 msgstr "Enfant"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:126
 msgid "Children"
 msgstr "Enfant"
 
@@ -6507,6 +6570,7 @@ msgstr "Chinois :"
 #
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:163
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl:40
 msgid "Choose"
 msgstr "Choisir"
@@ -6527,12 +6591,12 @@ msgstr "Choisir le fichier à parcourir."
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Choose Hemisphere:"
 msgstr "Choisir hémisphère : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:228
 msgid "Choose Layout Type"
 msgstr "Choisissez le type de présentation"
 
@@ -6544,7 +6608,7 @@ msgstr "Choisir l'order des champs à imprimer"
 msgid "Choose Order Of Text Fields to Print"
 msgstr "Choisir l'ordre des champs de texte à imprimer"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:33
 msgid "Choose a Framework:"
 msgstr "Choisir une grille : "
 
@@ -6554,7 +6618,7 @@ msgstr "Choisir une imprimante réseau : "
 
 #. %1$s: TMPL_VAR name=tablename
 #. %2$s: TMPL_VAR name=kohafield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:30
 #, c-format
 msgid "Choose and validate 1 of the following for %s.%s"
 msgstr "Choisir et valider 1 des champs suivants pour <b>%s.%s</b>"
@@ -6569,18 +6633,19 @@ msgstr "Choisir votre site : "
 msgid "Choose this Patron"
 msgstr "Choisir cet adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:179
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:181
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:220
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:222
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:55
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:8
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:6
 msgid "Circulation"
 msgstr "Circulation"
 
@@ -6592,11 +6657,11 @@ msgstr "Circulation -- Prêts"
 msgid "Circulation -- Returns"
 msgstr "Circulation -- Retours"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:31
 msgid "Circulation Reports"
 msgstr "Statistiques de circulation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:10
 msgid "Circulation history"
 msgstr "Historique de circulation"
 
@@ -6604,8 +6669,8 @@ msgstr "Historique de circulation"
 msgid "Circulation notes:"
 msgstr "Notes de circulation : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:45
 msgid "Circulation rules"
 msgstr "Règles de circulation"
 
@@ -6621,6 +6686,7 @@ msgstr "Circulation : Retards par site à %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:140
 msgid "Cities"
 msgstr "Communes"
 
@@ -6633,29 +6699,27 @@ msgid "Cities &rsaquo; Confirm Deletion of City"
 msgstr "Communes &rsaquo; Confirmer suppression de la commune"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:40
 msgid "Cities and towns"
 msgstr "Gestion des communes"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:143
-msgid "Cities management"
-msgstr "Gestion des communes"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:147
+msgid "City ID"
+msgstr "Identifiant commune"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:4
 msgid "City Search:"
 msgstr "Recherche commune"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:80
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:101
 msgid "City id"
 msgstr "Identifiant commune"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:148
 msgid "City name"
 msgstr "Nom de commune"
 
@@ -6664,14 +6728,14 @@ msgstr "Nom de commune"
 msgid "City name & zipcode missing"
 msgstr "Nom de commune et code postal absents"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:89
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:149
 msgid "City zipcode"
 msgstr "Code postal de la commune"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:253
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:372
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:259
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:373
 msgid "City:"
 msgstr "Commune : "
 
@@ -6699,18 +6763,18 @@ msgstr "Réclamation numéros manquants"
 msgid "Claim Order"
 msgstr "Réclamation commande"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:264
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:266
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:96
 msgid "Claimed"
 msgstr "Réclamé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:38
 msgid "Claims"
 msgstr "Réclamations"
 
@@ -6718,17 +6782,18 @@ msgstr "Réclamations"
 msgid "Class"
 msgstr "Class"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:179
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:179
 msgid "Classification"
 msgstr "Classification"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:203
 msgid "Classification:"
 msgstr "Classification :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:47
 msgid "Clean borrowers"
 msgstr "Apurer les adhérents"
 
@@ -6750,13 +6815,17 @@ msgstr ""
 "Koha."
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:125
 msgid "Click to &quot;Unmap&quot;"
 msgstr "Cliquer pour \"supprimer\""
 
-#. INPUT type=button name=clode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:80
+#. A
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:524
+msgid "Click to Expand this Tag"
+msgstr "Cliquer pour détailler ce champ"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:80
 msgid "Close"
 msgstr "Fermer"
 
@@ -6770,28 +6839,28 @@ msgid "Close Window"
 msgstr "Fermer la fenêtre"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:41
 msgid "Close this basket"
 msgstr "Fermer ce panier"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=closedate
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:39
 #, c-format
 msgid "Closed On: %s"
 msgstr "Fermé le : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:57
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:121
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:178
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:190
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:271
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:57
 msgid "Code"
 msgstr "Code"
 
@@ -6813,15 +6882,16 @@ msgid "Collection des monographies"
 msgstr "Collection de monographies"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:169
 msgid "Collection:"
 msgstr "Collection : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:70
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:73
 msgid "Column"
 msgstr "Colonne"
 
@@ -6847,7 +6917,7 @@ msgstr "venant de %s"
 msgid "Compact view"
 msgstr "Vue partielle"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:25
 msgid "Company"
 msgstr "Société"
 
@@ -6855,14 +6925,12 @@ msgstr "Société"
 msgid "Company Name"
 msgstr "Nom de société"
 
-#. %1$s: TMPL_VAR name=name
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:138
-#, c-format
-msgid "Company Name %s"
-msgstr "Nom de société %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:134
+msgid "Company Name:"
+msgstr "Nom de société :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:137
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:133
 msgid "Company details"
 msgstr "Coordonnées société"
 
@@ -6880,19 +6948,17 @@ msgstr "Fichiers informatiques"
 msgid "Computer files, Data, Software"
 msgstr "Fichiers informatiques, Données, Logiciel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:92
 msgid "Comtd"
 msgstr "Engagé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:167
 msgid "Configuration OK, you don't have errors in your MARC parameters table"
 msgstr "Configuration OK, il n'y pas d'erreurs dans votre table de paramètres MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:25
-msgid "Configure these parameters in the order they appear"
-msgstr ""
-"Configurer ces paramètres dans leur ordre "
-"d'apparition"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:23
+msgid "Configure these parameters in the order they appear."
+msgstr "Configurer ces paramètres dans leur ordre d'apparition"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:73
@@ -6905,12 +6971,10 @@ msgstr "Confirmer"
 msgid "Confirm Checkout"
 msgstr "Confirmer le prêt"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:115
 msgid "Confirm Deletion"
 msgstr "Confirmer la suppression"
 
@@ -6927,7 +6991,7 @@ msgid "Confirm Deletion of Agency Category %s"
 msgstr "Confirmer la suppression de la catégorie %s ?"
 
 #. %1$s: TMPL_VAR name=categorycode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:149
 #, c-format
 msgid "Confirm Deletion of Category %s"
 msgstr "Confirmer la suppression de la catégorie %s ?"
@@ -6935,17 +6999,17 @@ msgstr "Confirmer la suppression de la catégorie %s ?"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=categorycode
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:78
 #, c-format
 msgid "Confirm Deletion of Category '%s'"
 msgstr "Confirmer la suppression de la catégorie %s ?"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:97
 msgid "Confirm Deletion of City"
 msgstr "Confirmer la suppression de la commune"
 
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:125
 #, c-format
 msgid "Confirm Deletion of Currency %s"
 msgstr "Confirmer la suppression de la devise %s "
@@ -6959,7 +7023,7 @@ msgid "Confirm Deletion of Currency '%s'"
 msgstr "Confirmer la suppression de la devise %s'"
 
 #. %1$s: TMPL_VAR name=bookfundid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:229
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:221
 #, c-format
 msgid "Confirm Deletion of Fund <em>%s</em>"
 msgstr "Confirmer la suppression du poste budgétaire <em>%s</em>"
@@ -6978,22 +7042,22 @@ msgstr "Confirmer la suppression du paramètre '%s'"
 msgid "Confirm Deletion of Printer <em>%s</em>"
 msgstr "Confirmer la suppression de l'imprimante <em>%s</em>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:94
 msgid "Confirm Deletion of Road Type"
 msgstr "Confirmer la suppression du type de voie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:55
 msgid "Confirm Deletion of Subfield"
 msgstr "Confirmer la suppression du sous-champ"
 
 #. %1$s: TMPL_VAR name=tagsubfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:108
 #, c-format
 msgid "Confirm Deletion of Subfield %s?"
 msgstr "Confirmer la suppression du sous-champ %s ?"
 
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:102
 #, c-format
 msgid "Confirm Deletion of Tag <em>%s</em>?"
 msgstr "Confirmer la suppression du champ <em>%s</em> ?"
@@ -7005,7 +7069,7 @@ msgstr "Confirmer la suppression du champ <em>%s</em> ?"
 msgid "Confirm Deletion of authority structure definition for %s (%s)"
 msgstr "Confirmer la définition de la structure d'autorité pour %s (%s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:236
 msgid "Confirm delete:"
 msgstr "Confirmer la suppression : "
 
@@ -7032,10 +7096,6 @@ msgstr "Confirmer la réservation"
 msgid "Confirm hold and transfer"
 msgstr "Confirmer la réservation puis transférer"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:491
-msgid "Confirm it's not a duplicate"
-msgstr "Confirmer que ce n'est pas un doublon"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:80
 msgid "Congratulations, Installation complete"
 msgstr "Félicitations, installation terminée"
@@ -7053,13 +7113,13 @@ msgstr "Etudier la formule <b>N°{X}/{Y}</b>.Les réglages XYZ suivants : "
 msgid "Considered lost"
 msgstr "Considéré comme perdu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:95
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:93
 msgid "Constraints"
 msgstr "Restricteurs"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:259
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:265
 msgid "Contact"
 msgstr "Contact "
 
@@ -7068,15 +7128,13 @@ msgid "Contact Name"
 msgstr "Nom du contact"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:148
 msgid "Contact details"
 msgstr "Coordonnées du contact"
 
-#. %1$s: TMPL_VAR name=contact
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:153
-#, c-format
-msgid "Contact name %s"
-msgstr "Nom du contact %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:149
+msgid "Contact name:"
+msgstr "Nom du contact :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:243
 msgid "Content (mail content):"
@@ -7104,8 +7162,8 @@ msgstr "Contient des informations biographiques"
 msgid "Continue to login to Koha"
 msgstr "Continuez pour vous connectez-vous à Koha"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:152
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:154
 msgid "Copyright Date"
 msgstr "Date de copyright"
 
@@ -7120,7 +7178,7 @@ msgid "Copyright Date:"
 msgstr "Date de copyright :"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:184
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:30
 msgid "Copyright:"
 msgstr "Copyright : "
@@ -7137,7 +7195,7 @@ msgstr "Nombre"
 msgid "Count of Checkouts"
 msgstr "Nombre de prêts"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:833
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:831
 msgid "Create Biblio"
 msgstr "Créer une notice"
 
@@ -7157,12 +7215,12 @@ msgstr "Créer un nouveau modèle d'étiquette"
 msgid "Create New Layout"
 msgstr "Créer un nouveau modèle d'étiquette"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:33
 msgid "Create Routing List"
 msgstr "Créer une liste de circulation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:31
 msgid "Create a Blank Bibliographic Record"
 msgstr "Créer une notice bibliographique à partir de zéro"
 
@@ -7170,28 +7228,31 @@ msgstr "Créer une notice bibliographique à partir de zéro"
 msgid "Create a new virtual shelf"
 msgstr "Créer une une nouvelle étagère virtuelle"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:62
 msgid ""
 "Create and manage Authorities frameworks that define the characteristics of "
 "your MARC Records (field and subfield definitions)."
 msgstr "Créer et gérer les autorités (champs et sous champs)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:56
 msgid ""
 "Create and manage Bibliographic frameworks that define the characteristics "
 "of your MARC Records (field and subfield definitions) as well as templates "
 "for the MARC editor."
-msgstr "Créer et gérer les grilles de catalogage (champ et sous champs) qui définissent les caractéristiques de vos notices MARC (champs et sous champs), ainsi que l'organisation de la grille."
+msgstr ""
+"Créer et gérer les grilles de catalogage (champ et sous champs) qui "
+"définissent les caractéristiques de vos notices MARC (champs et sous "
+"champs), ainsi que l'organisation de la grille."
 
 #. %1$s: TMPL_VAR name=authtypecode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:141
 #, c-format
 msgid "Create authority framework for %s using"
 msgstr "Créer une grille d'autorité pour %s en utilisant"
 
 #. %1$s: TMPL_VAR name=frameworkcode
 #. %2$s: TMPL_VAR name=frameworktext
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:125
 #, c-format
 msgid "Create framework for %s (%s) using"
 msgstr "Créer une grille d'autorité pour %s (%s) en utilisant"
@@ -7206,7 +7267,7 @@ msgstr "Créer ou imprimer des code à barres"
 msgid "Create printable labels and barcodes from catalog data."
 msgstr "Créer des étiquettes et des codes à barres imprimables à partir du catalogue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:45
 msgid "Created by"
 msgstr "Créé par"
 
@@ -7224,7 +7285,7 @@ msgstr "Type de crédit"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:75
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:166
 msgid "Currencies"
 msgstr "Devises"
 
@@ -7237,25 +7298,29 @@ msgstr "Recherche devise :"
 msgid "Currencies administration"
 msgstr "Gestion des devises"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:30
 msgid "Currencies and exchange rates"
 msgstr "Devises et taux de change"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:55
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:179
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:128
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:57
 msgid "Currency"
 msgstr "Devise"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:158
 msgid "Currency Deleted"
 msgstr "Devise supprimée"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:102
+msgid "Currency:"
+msgstr "Devise :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:24
 msgid "Current Library:"
 msgstr "Site actuel : "
@@ -7269,10 +7334,15 @@ msgid "DVD video / Videodisc"
 msgstr "DVD Video / Videodisque"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:10
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:39
 msgid "Daily reconciliation"
 msgstr "Etat de caisse quotidien"
 
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:63
+msgid "Damaged Status:"
+msgstr "Statut document :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl:64
 msgid "Daniel Holth"
 msgstr "Daniel Holth"
@@ -7282,24 +7352,22 @@ msgstr "Daniel Holth"
 msgid "Data Added"
 msgstr "Donnée ajoutée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:265
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:257
 msgid "Data Deleted"
 msgstr "Donnée supprimée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:221
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:213
 msgid "Data Recorded"
 msgstr "Donnée enregistrée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:156
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:295
 msgid "Data deleted"
 msgstr "Donnée supprimée"
@@ -7308,17 +7376,14 @@ msgstr "Donnée supprimée"
 msgid "Data error"
 msgstr "Erreur de donnée"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:139
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:129
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:259
 msgid "Data recorded"
 msgstr "Donnée enregistrée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:139
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:206
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:251
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:18
 msgid "Database"
@@ -7333,28 +7398,37 @@ msgstr "Réglages de la base de données : "
 msgid "Database tables created"
 msgstr "Tables de la base de données créées"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:139
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:206
+msgid "Database:"
+msgstr "Base de données :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:285
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:287
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:285
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:139
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:46
 msgid "Date"
 msgstr "Date"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:236
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:229
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:23
 msgid "Date Due"
 msgstr "Date de retour"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:57
+msgid "Date Due:"
+msgstr "Date de retour :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:58
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:31
 msgid "Date Received"
 msgstr "Date de réception"
 
@@ -7366,7 +7440,7 @@ msgstr "Date réception inversée"
 msgid "Date arrived at current library:"
 msgstr "Date d'arrivée au site actuel : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:192
 msgid "Date due"
 msgstr "Date de retour"
@@ -7384,8 +7458,8 @@ msgstr "Date de naissance"
 msgid "Date of birth"
 msgstr "Date de naissance"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:99
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:134
 msgid "Date of birth:"
 msgstr "Date de naissance"
 
@@ -7410,6 +7484,7 @@ msgid "Date/time"
 msgstr "Date/heure"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:41
 msgid "Date:"
 msgstr "Date : "
@@ -7420,8 +7495,8 @@ msgstr "Date : "
 msgid "Date_due"
 msgstr "Date de retour"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:480
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:482
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:481
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:483
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:222
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:224
 msgid "Dates"
@@ -7431,15 +7506,15 @@ msgstr "Dates"
 msgid "David Strainchamps"
 msgstr "David Strainchamps"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:289
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:232
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:218
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:251
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:254
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:142
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:218
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:195
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:232
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:289
 msgid "Day"
 msgstr "Jour"
 
@@ -7448,9 +7523,9 @@ msgstr "Jour"
 msgid "Day name"
 msgstr "Nom du jour"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:220
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:148
 msgid "Day of week"
 msgstr "Jour de la semaine"
 
@@ -7463,10 +7538,10 @@ msgstr "Cher %s"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=LibraryName
 #. %2$s: TMPL_VAR name=title
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl:1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl:1
 #, c-format
 msgid "Dear %s user, You have suggested that the library acquire %s"
 msgstr "Cher adhérent %s, vous avez suggéré à la bibliothèque d'acheter %s"
@@ -7480,19 +7555,23 @@ msgstr "Suspendu"
 msgid "Dec"
 msgstr "Dcbre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:177
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:177
 msgid "December"
 msgstr "Décembre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:160
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:141
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:37
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:123
@@ -7500,12 +7579,24 @@ msgstr "Décembre"
 msgid "Default"
 msgstr "Par défaut"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:67
+msgid "Default Framework"
+msgstr "Grille par défaut"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:111
 msgid "Default framework"
 msgstr "Grille par défaut"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:84
+msgid "Default value"
+msgstr "Valeur par défaut"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:24
 msgid "Default values"
 msgstr "Valeurs par défaut"
 
@@ -7521,12 +7612,12 @@ msgstr ""
 "champs MARC bibliographique.Les valeurs des autorités sont gérées par des "
 "modules d'extension"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:54
 msgid "Define categories and authorised values for them."
 msgstr "Définit des catégories et les valeurs autorisées pour eux."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:46
 msgid ""
 "Define circulation rules in a matrix for libraries / patrons / itemtypes / "
 "circ codes (number of checkouts, duration, fee, etc.)."
@@ -7534,16 +7625,16 @@ msgstr ""
 "Définit les règles de prêt par site/type d'adhérent/de document (nombre de "
 "prêts, durée, coût...)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:41
 msgid "Define cities and towns that your patrons live in."
 msgstr "Définit les villes dans lesquelles vos lecteurs habitent habituellement."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:31
 msgid "Define currencies and exchange rates used for acquisitions."
 msgstr "Définit des monnaies et taux de change utilisés dans les acquisitions."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:48
 msgid ""
 "Define fines in a matrix for libraries / patrons / itemtypes (cost, grace "
 "period, etc.)."
@@ -7555,11 +7646,11 @@ msgstr ""
 msgid "Define holidays (days where the library is closed)"
 msgstr "Définit les jours fériés (jours où la bibliothèque est fermée)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:33
 msgid "Define item types and circulation codes used for circulation rules."
 msgstr "Définir les types de documents utilisés pour les règles de prêt."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:27
 msgid "Define libraries, branches and agency categories."
 msgstr "Définir les sites."
 
@@ -7567,11 +7658,11 @@ msgstr "Définir les sites."
 msgid "Define notices (print and email notification messages for overdues, etc.)"
 msgstr "Définir les notifications (notifications sur retard...)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:39
 msgid "Define patron categories."
 msgstr "Catégories d'adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:44
 msgid ""
 "Define road types (street, avenue, way, etc.). Road types display as "
 "authorized values when adding/editing patrons and can be used in geographic "
@@ -7592,7 +7683,7 @@ msgid "Define the holidays for branch %s"
 msgstr "Définir les jours fériés du site %s"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:58
 msgid ""
 "Define the mappingbetween the Koha transactional database (SQL) and the MARC "
 "Bibliographic records. Note that the mapping can be defined through MARC "
@@ -7602,7 +7693,7 @@ msgstr ""
 "ces liens peuvent être définis dans la structure MARC.Cet outil est juste un "
 "raccourci pour activer les liens."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:72
 msgid "Define which servers to query for MARC data in the integrated Z39.50 client."
 msgstr "Définir les serveurs z3950 à utiliser pour le catalogage rapide."
 
@@ -7610,20 +7701,20 @@ msgstr "Définir les serveurs z3950 à utiliser pour le catalogage rapide."
 msgid "Defines the Z39.50 servers you want Koha to search."
 msgstr "Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:17
 msgid "Defining"
 msgstr "Définition"
 
 #. %1$s: TMPL_VAR name=branch
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:50
 #, c-format
 msgid "Defining circulation rules for %s"
 msgstr "Définition des règles de prêt pour %s"
 
 #. %1$s: TMPL_VAR name=branch
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:51
 #, c-format
 msgid "Defining fines rules for %s"
 msgstr "Définition des règles de retard pour %s"
@@ -7661,78 +7752,77 @@ msgstr ""
 "Le délai1 doit être plus petit que le délai2, lui même plus petit que le "
 "délai3 pour la catégorie d'adhérent %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:62
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:99
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:182
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:193
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:84
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:149
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:178
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:270
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:84
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:163
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:179
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:107
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:198
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:220
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:188
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:203
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:175
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:188
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:213
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:190
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:182
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:189
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:214
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:216
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:194
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:270
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:140
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:61
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:45
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:60
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:274
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:137
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:139
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:140
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:19
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:100
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:349
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:335
 msgid "Delete Book Budget?"
 msgstr "Supprimer le poste budgétaire?"
 
 #. INPUT type=button name=guarantordelete
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:181
 msgid "Delete Guarantor"
 msgstr "Supprimer le garant"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=itemtype
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:210
 #, c-format
 msgid "Delete Item Type '%s'?"
 msgstr "Supprimer le type de document '%s'?"
@@ -7788,27 +7878,27 @@ msgstr ""
 "historiques de prêt"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:166
 msgid "Delete this Category"
 msgstr "Supprimer cette catégorie"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:149
 msgid "Delete this Currency"
 msgstr "Supprimer cette devise"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:255
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:247
 msgid "Delete this Fund"
 msgstr "Supprimer ce poste budgétaire"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:224
 msgid "Delete this Item Type"
 msgstr "Supprimer ce type de document"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:158
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:150
 msgid "Delete this Printer"
 msgstr "Supprimer cette imprimante"
 
@@ -7818,7 +7908,7 @@ msgid "Delete this Server"
 msgstr "Supprimer ce serveur"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:372
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:358
 msgid "Delete this budget"
 msgstr "Supprimer ce budget"
 
@@ -7835,33 +7925,31 @@ msgstr "Supprimer cette étagère"
 msgid "Delete virtual shelves"
 msgstr "Supprimer des étagères virtuelles"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:43
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:60
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:236
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:179
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:179
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:237
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:109
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:154
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:252
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:272
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl:24
 msgid "Description"
 msgstr "Description"
 
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:58
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:80
 msgid "Description missing"
 msgstr "Description manquante"
 
@@ -7874,20 +7962,22 @@ msgid "Description projet"
 msgstr "Description de projet"
 
 #. %1$s: TMPL_VAR name=liblibrarian
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:135
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:110
 #, c-format
 msgid "Description%s"
 msgstr "Description %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:156
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:319
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:320
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:227
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:153
 msgid "Description:"
 msgstr "Description :"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=liblibrarian
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:58
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:104
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
@@ -7904,15 +7994,11 @@ msgstr "Dessin technique"
 msgid "Destination library:"
 msgstr "Site de destination : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:132
-msgid "Detail"
-msgstr "Détail"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:269
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:287
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:287
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:269
 msgid "Details"
 msgstr "Détails"
 
@@ -7920,8 +8006,8 @@ msgstr "Détails"
 msgid "Deux fois par mois"
 msgstr "Bimensuel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:145
 msgid "Dewey"
 msgstr "Dewey"
 
@@ -7933,7 +8019,7 @@ msgstr "Classification Dewey"
 msgid "Dewey Subclass:"
 msgstr "Sous-classe Dewey : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:206
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:100
 msgid "Dewey:"
@@ -7963,15 +8049,13 @@ msgstr "Répertoires"
 msgid "Discographies"
 msgstr "Discographies"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:122
 msgid "Discount"
 msgstr "Remise"
 
-#. %1$s: TMPL_VAR name=discount
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:187
-#, c-format
-msgid "Discount %s %%"
-msgstr "Remise %s %%"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:183
+msgid "Discount:"
+msgstr "Remise :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:268
 msgid "Discours, art oratoire"
@@ -7993,8 +8077,8 @@ msgstr "Afficher "
 msgid "Display member details."
 msgstr "Afficher les coordonnées de l'adhérent."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:161
 msgid "Display only used Tags/Subfields"
 msgstr "Afficher seulement les champs/sous-champs utilisés"
 
@@ -8007,19 +8091,19 @@ msgid "Distributed to"
 msgstr "Distribué à"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:373
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:359
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:224
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:95
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:167
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:260
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:166
 msgid "Do Not Delete"
 msgstr "Ne pas supprimer"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:260
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:252
 msgid "Do not Delete"
 msgstr "Ne pas supprimer"
 
@@ -8048,11 +8132,11 @@ msgid "Document &agrave; projeter"
 msgstr "Document à projeter"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:233
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:188
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:244
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:233
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:188
 msgid "Document Type"
 msgstr "Type de document"
 
@@ -8060,8 +8144,8 @@ msgstr "Type de document"
 msgid "Document pictural"
 msgstr "Document pictural"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:90
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:90
 msgid "Document type"
 msgstr "Type document"
 
@@ -8082,8 +8166,8 @@ msgstr "Ne pas exporter les exemplaires"
 msgid "Dorian Meid (German translation)"
 msgstr "Dorian Meid (traduction allemande)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:242
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:242
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:242
 msgid "Draw Guide Boxes"
 msgstr "Tracer des cases modèles"
 
@@ -8093,11 +8177,16 @@ msgstr "Tracer des cases modèles"
 msgid "Due %s"
 msgstr "dû %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:63
 msgid "Due Date"
 msgstr "Date de retour"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:51
+msgid "Due Date desc"
+msgstr "Date de retour desc"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:642
 msgid "Due date"
 msgstr "Date de retour"
@@ -8106,7 +8195,15 @@ msgstr "Date de retour"
 msgid "Duplicate"
 msgstr "Dupliquer"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:7
+msgid "Duplicate Record"
+msgstr "Dupliquer notice"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:444
+msgid "Duplicate Record?"
+msgstr "Dupliquer notice ?"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:45
 #, c-format
 msgid ""
 "Duplicate suspected <a1>Detail</a> Duplicate ? <a2>Yes</a> &nbsp;&nbsp;"
@@ -8116,31 +8213,29 @@ msgstr ""
 "Non, n'en est pas un"
 
 #. %1$s: TMPL_VAR name=duplicateauthvalue
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:403
 #, c-format
 msgid "Duplicate suspected with <a1>%s</a>"
 msgstr "Doublon suspecté avec <a1>%s</a>"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:65
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:69
 msgid "E-mail"
 msgstr "Email"
 
-#. %1$s: TMPL_VAR name=contemail
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:163
-#, c-format
-msgid "E-mail %s"
-msgstr "Email %s"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:268
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:312
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:274
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:318
 msgid "E-mail (home):"
 msgstr "Email (domicile) :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:321
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:327
 msgid "E-mail (prof):"
 msgstr "Email (travail) :"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:159
+msgid "E-mail:"
+msgstr "Email :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl:41
 msgid "EMN (Ecole des Mines de Nantes)"
 msgstr "EMN (Ecole des Mines de Nantes)"
@@ -8149,7 +8244,7 @@ msgstr "EMN (Ecole des Mines de Nantes)"
 msgid "ENSMP (Ecole Nationale Supérieure des Mines de Paris)"
 msgstr "ENSMP (Ecole Nationale Supérieure des Mines de Paris)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:189
 msgid "ERROR : Barcode already exists !"
 msgstr "ERREUR : Code à barres déjà utilisé !"
 
@@ -8223,8 +8318,12 @@ msgstr "Chaque case doit être remplie avec l'amende, l'échéance et la durée
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:20
-msgid "Each box needs to be filled in with issuelength,maxissues"
-msgstr "Remplir chaque case  avec la durée du prêt, le nombre maximum de prêts"
+msgid ""
+"Each box needs to be filled in with issuelength,maxissues. For example: 21,5 "
+"enables 5 issues for 21 days"
+msgstr ""
+"Remplir chaque case  avec la durée du prêt, le nombre maximum de prêts. Par "
+"exemple : 21,5 permet 5 prêts pour 21 jours"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:89
 msgid ""
@@ -8244,49 +8343,48 @@ msgstr "Facile"
 msgid "Ed Summers (Some code and Perl packages like MARC::Record)"
 msgstr "Ed Summers (Codes et paquetages Perl tels que Enregistrement::MARC)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:181
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:269
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:137
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:178
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:189
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:122
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:160
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:219
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:187
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:147
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:187
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:212
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:189
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:137
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:175
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:215
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:193
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:269
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:164
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:57
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:172
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:47
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:210
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:117
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:272
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:9
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:12
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:63
 msgid "Edit"
 msgstr "Modifier"
 
@@ -8294,7 +8392,7 @@ msgstr "Modifier"
 #. %1$s: TMPL_VAR name=categorycode
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:12
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:220
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:207
 #, c-format
 msgid "Edit Agency Category %s"
 msgstr "Modifier catégorie de site %s"
@@ -8303,10 +8401,14 @@ msgstr "Modifier catégorie de site %s"
 msgid "Edit Bibliographic Record"
 msgstr "Modifier notice bibliographique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:171
 msgid "Edit Item"
 msgstr "Modifier exemplaire"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:6
+msgid "Edit Items"
+msgstr "Modifier exemplaire"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:18
 msgid "Edit Label Template"
 msgstr "Modifier un modèle d'étiquette"
@@ -8314,31 +8416,35 @@ msgstr "Modifier un modèle d'étiquette"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=biblionumber
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:444
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:438
 #, c-format
 msgid "Edit MARC Record Number %s"
 msgstr "Modifier la notice MARC numéro %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:66
 msgid "Edit MARC subfields constraints"
 msgstr "Modifier les restrictions des sous-champs MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:5
+msgid "Edit Record"
+msgstr "Editer notice"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:35
 msgid "Edit Routing List"
 msgstr "Modifier la liste de circulation"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:186
 msgid "Edit Subfields"
 msgstr "Modifier les sous-champs"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc:6
 msgid "Edit Supplier"
 msgstr "Modifier"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:830
 msgid "Edit biblio"
 msgstr "Editer notice"
 
@@ -8352,10 +8458,6 @@ msgstr "Ajouter de l'aide"
 msgid "Edit serials"
 msgstr "Bulletinage"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:78
-msgid "Edit subfield"
-msgstr "Modifier les sous-champs"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:77
 msgid "Edit this shelf"
 msgstr "Modifier cette étagère"
@@ -8373,8 +8475,8 @@ msgid "Editing preferences for %s module"
 msgstr "Éditer les préférences pour le module %s"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:13
 msgid ""
 "Editing the SubFields from the MARC tag structure page is very time-"
@@ -8401,27 +8503,27 @@ msgstr "Email : %s"
 msgid "Encyclopedias"
 msgstr "Encyclopédies"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:357
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:356
 msgid "End Date :"
 msgstr "Date de fin : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:358
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:344
 msgid "End date"
 msgstr "Date de fin"
 
 #. %1$s: TMPL_VAR name=dateformat
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:281
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:275
 #, c-format
-msgid "End date (%s)"
-msgstr "Date de fin (%s)"
+msgid "End date (%s):"
+msgstr "Date de fin (%s) :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl:63
 msgid "End date:"
 msgstr "Date de fin : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:323
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1175
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1171
 msgid "Ending date:"
 msgstr "Date de fin : "
 
@@ -8437,7 +8539,7 @@ msgstr "Enregistrement sonore"
 msgid "Enregistrement video"
 msgstr "Enregistrement video"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:192
 msgid "Enrollment Fee"
 msgstr "Frais d'inscription"
 
@@ -8455,16 +8557,16 @@ msgstr ""
 "soit comme des nombres entiers ou avec 6 décimales, sans indications de la "
 "devise (ex. \"1,25000\" au lieu de \"1,25 €\")."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:193
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:189
 msgid "Enrollment Period"
 msgstr "Durée d'inscription"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:112
 msgid "Enrollment fee"
 msgstr "Frais d'inscription"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:109
 msgid "Enrollment period"
 msgstr "Durée d'inscription"
 
@@ -8481,19 +8583,21 @@ msgstr ""
 "école, peut-être), fixez alors le nombre à 4. Si l'inscription n'expire "
 "jamais, fixer le sur un nombre anormalement élevé (99)."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:158
-msgid "Enrolment fee"
-msgstr "Frais d'inscription"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:157
+msgid "Enrolment fee:"
+msgstr "Frais d'inscription :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:155
-msgid "Enrolment period"
-msgstr "Durée d'inscription"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:154
+msgid "Enrolment period:"
+msgstr "Durée d'inscription :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:228
-msgid "Enter a summary that will overwrite the default one in search results lists"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:195
+msgid ""
+"Enter a summary that will overwrite the default one in search results lists. "
+"Example, for a website itemtype :"
 msgstr ""
 "Saisissez un abrégé qui effacera celui par défaut dans la liste de résultats "
-"d'une recherche"
+"d'une recherche. Exemple pour un type de documents \"site web\""
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:136
 msgid "Enter barcode"
@@ -8504,35 +8608,37 @@ msgstr "Entrez le code à barres"
 msgid "Enter item barcode:"
 msgstr "Entrez le code à barres"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:13
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:11
 msgid "Enter patron card number or partial name:"
 msgstr "Entrer le n° de carte d'adhérent ou une partie du nom : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:20
 msgid "Enter search keywords:"
 msgstr "Entrer les termes de recherche :"
 
@@ -8544,17 +8650,18 @@ msgid "Enter search terms"
 msgstr "Entrer les termes de recherche"
 
 #. INPUT type=text name=q
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:23
 msgid "Enter the terms you wish to search for."
 msgstr "Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche."
 
@@ -8562,11 +8669,11 @@ msgstr "Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche.
 msgid "Envoyer"
 msgstr "Envoyer"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:208
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:208
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl:27
@@ -8602,8 +8709,8 @@ msgstr "Erreur 405"
 msgid "Error 500"
 msgstr "Erreur 500"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:32
 msgid "Error :"
 msgstr "Erreur : "
 
@@ -8613,7 +8720,7 @@ msgstr "Erreur : "
 msgid "Error : Barcode Not Unique For serialseq %s"
 msgstr "Erreur : code à barres pas unique pour le périodique %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:125
 msgid "Error:"
 msgstr "Erreur : "
 
@@ -8634,7 +8741,7 @@ msgstr "Essais"
 msgid "Est Cost"
 msgstr "Coût estimé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:54
 msgid "Est."
 msgstr "Est."
 
@@ -8667,11 +8774,7 @@ msgstr "Tout est OK, mise à jour effectuée"
 msgid "Example MARC21 Subject Headings Authority"
 msgstr "Exemple MARC21 Subject Headings Authority"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:230
-msgid "Example, for a website itemtype :"
-msgstr "Exemple, pour un type de document de type site web : "
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:53
 msgid "Exchange rates"
 msgstr "Taux de change"
 
@@ -8679,7 +8782,7 @@ msgstr "Taux de change"
 msgid "Existing holds"
 msgstr "Réservation(s) existante(s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:146
 msgid "Existing items"
 msgstr "Exemplaire(s) existant(s)"
 
@@ -8687,8 +8790,8 @@ msgstr "Exemplaire(s) existant(s)"
 msgid "Expiration Date"
 msgstr "Date d'expiration"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:82
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
@@ -8700,7 +8803,7 @@ msgstr "Date d'expiration"
 msgid "Expired account"
 msgstr "Carte expirée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:486
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:481
 msgid "Expiry date:"
 msgstr "Date d'expiration"
 
@@ -8712,10 +8815,9 @@ msgstr "Explication"
 msgid "Explanation:"
 msgstr "Explication : "
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl:101
 msgid "Export"
 msgstr "Exportation"
 
@@ -8730,26 +8832,20 @@ msgstr "Exporter vers"
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Fall"
 msgstr "Automne"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:68
 msgid "Fax"
 msgstr "Fax"
 
-#. For the first occurrence,
-#. %1$s: TMPL_VAR name=fax
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:161
-#, c-format
-msgid "Fax %s"
-msgstr "Fax %s"
-
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:336
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:330
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:157
 msgid "Fax:"
 msgstr "Fax : "
 
@@ -8767,14 +8863,16 @@ msgstr "Fax : %s"
 msgid "Feb"
 msgstr "Fév."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:167
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:167
 msgid "February"
 msgstr "Février"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:167
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:174
 msgid "Female"
 msgstr "Féminin"
 
@@ -8786,12 +8884,17 @@ msgstr "Fiction"
 msgid "Field Options:"
 msgstr "Options de champ : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:448
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:449
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:58
 msgid "Field-weighted, Relevance Ranked"
 msgstr "Par critère et ordre"
 
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+msgid "Fields marked with * are mandatory"
+msgstr "Les champs notés avec un * sont obligatoires"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:26
 msgid "Fields to Print"
 msgstr "Choisir les champs à imprimer"
@@ -8816,17 +8919,17 @@ msgid "Filmographies"
 msgstr "Filmographies"
 
 #
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:115
+#. INPUT type=submit name=filter
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:215
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:70
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:68
 msgid "Filter"
 msgstr "Sélectionner"
 
@@ -8840,6 +8943,11 @@ msgid "Filter location"
 msgstr "Filtrer sur la localisation"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:20
+msgid "Filter on :"
+msgstr "Filtrer sur :"
+
+#
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:48
 msgid "Filter on ISSN"
 msgstr "Sélection de l'ISSN :"
@@ -8850,33 +8958,28 @@ msgid "Filter on title"
 msgstr "Filter sur le titre"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:22
 msgid "Filtered on"
 msgstr "Sélectionné sur"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:56
 msgid "Filters"
 msgstr "Critères de sélection"
 
-#. INPUT type=submit name=search
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:186
-msgid "Find"
-msgstr "Rechercher"
-
 #. INPUT type=button name=guarantorsearch
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:186
 msgid "Find guarantor"
 msgstr "Rechercher un garant"
 
@@ -8884,13 +8987,13 @@ msgstr "Rechercher un garant"
 msgid "Fine"
 msgstr "Amende"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:133
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:9
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:38
 msgid "Fines"
 msgstr "Amendes"
 
@@ -8913,8 +9016,8 @@ msgstr ""
 "tâches (crontab), après minuit, pour que les amendes soient calculées chaque "
 "nuit"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:47
 msgid "Fines rules"
 msgstr "Règles de retard"
 
@@ -8934,11 +9037,11 @@ msgstr "Terminer"
 msgid "First"
 msgstr "Premier"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:890
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:893
 msgid "First Issue ETA:"
 msgstr "Date d'arrivée prévue  du 1er n° :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:243
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:242
 msgid "First arrival:"
 msgstr "Première arrivée :"
 
@@ -8956,12 +9059,12 @@ msgstr ""
 msgid "Firstname"
 msgstr "Prénom"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:125
 msgid "Firstname:"
 msgstr "Prénom : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:263
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:261
 msgid "Fix Itemtype"
 msgstr "Choisir  le type de document"
 
@@ -8973,19 +9076,19 @@ msgstr "Flag"
 msgid "Florian Bischof"
 msgstr "Florian Bischof"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:56
 msgid "Font Size:"
 msgstr "Taille de la fonte: : "
 
 #. %1$s: TMPL_VAR name=booksellerid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:37
 #, c-format
 msgid "For Supplier Id %s"
 msgstr "Pour le fournisseur %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:14
 msgid "For each subfield you can set :"
 msgstr "Pour chaque sous-champ vous pouvez choisir : "
@@ -9012,7 +9115,7 @@ msgstr ""
 "aucune autre valeur."
 
 #. %1$s: TMPL_VAR name=booksellerid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:96
 #, c-format
 msgid "ForSupplier Id: %s"
 msgstr "Pour le fournisseur %s"
@@ -9023,24 +9126,23 @@ msgstr "Dette remise"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:58
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:60
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:160
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:78
 msgid "Form not submitted because of the following problem(s)"
 msgstr "Formulaire non soumis à cause du (des) problème(s) suivant(s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:160
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:243
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:159
 msgid "Format"
 msgstr "Format"
 
@@ -9052,7 +9154,7 @@ msgstr "Genre"
 msgid "Formulaires"
 msgstr "Formulaires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:139
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:140
 msgid "Framework"
 msgstr "Grille de catalogage"
 
@@ -9076,11 +9178,11 @@ msgstr ""
 msgid "Francisco M. Marzoa Alonso"
 msgstr "Francisco M. Marzoa Alonso"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:184
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:243
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:245
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:269
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:46
 msgid "Free"
 msgstr "Libre"
 
@@ -9100,7 +9202,7 @@ msgstr "Français : "
 msgid "Freq"
 msgstr "Fréquence"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:128
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:127
 msgid "Frequency (*):"
 msgstr "Périodicité (*) : "
 
@@ -9108,26 +9210,26 @@ msgstr "Périodicité (*) : "
 msgid "Frequency: (*)"
 msgstr "Périodicité (*) : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:160
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:160
 msgid "Friday"
 msgstr "Vendredi"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:111
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:154
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:41
 msgid "From"
 msgstr "De"
 
@@ -9146,11 +9248,11 @@ msgstr "De %S"
 msgid "From %S (included) to %S (excluded)"
 msgstr "De %S (inclus) à %S (exclu)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:152
 msgid "From a Suggestion"
 msgstr "A partir d'une suggestion"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:149
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:150
 msgid "From an existing record:"
 msgstr "A partir d'une notice existante : "
 
@@ -9158,10 +9260,10 @@ msgstr "A partir d'une notice existante : "
 msgid "From:"
 msgstr "Du :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:206
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:206
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:206
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:206
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:150
 msgid "Full level"
 msgstr "Niveau complet"
 
@@ -9169,7 +9271,7 @@ msgstr "Niveau complet"
 msgid "Fullfilled"
 msgstr "Rempli"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:58
 msgid "Fund"
 msgstr "Poste budgétaire"
 
@@ -9187,24 +9289,27 @@ msgstr "Gestion des budgets"
 msgid "GO"
 msgstr "VALIDER"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:124
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:125
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:111
 msgid "GST"
 msgstr "TVA"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:96
 msgid "GST Registered"
 msgstr "TVA enregistrée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:177
+msgid "GST Registered:"
+msgstr "TVA :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:45
 msgid "Gap between Columns:"
 msgstr "Espace entre les colonnes : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:46
 msgid "Gap between Rows:"
 msgstr "Espace entre les lignes : "
 
@@ -9227,10 +9332,6 @@ msgstr "Gestion des index MACLES"
 msgid "Gestion_des_index_MACLES"
 msgstr "Gestion_des_index_MACLES"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl:32
-msgid "Get It !"
-msgstr "Le choisir !"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:106
 msgid "Get It!"
 msgstr "Le choisir !"
@@ -9248,7 +9349,7 @@ msgstr "Giuseppe Angilella"
 msgid "Glen Stewart"
 msgstr "Glen Stewart"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:18
 msgid "Global system preferences"
 msgstr "Préférences système"
 
@@ -9261,7 +9362,7 @@ msgstr "Valider"
 msgid "Go back to tools home."
 msgstr "Retourner à l'accueil des outils."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:215
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:407
 #, c-format
 msgid "Go to <a1>original authority</a>"
 msgstr "Aller à <a1>l'autorité originale</a>"
@@ -9270,7 +9371,7 @@ msgstr "Aller à <a1>l'autorité originale</a>"
 msgid "Gravure"
 msgstr "Gravure"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:244
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:236
 msgid "Group"
 msgstr "Groupe"
 
@@ -9278,6 +9379,10 @@ msgstr "Groupe"
 msgid "Group Maintenance"
 msgstr "Maintenance des groupes"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:125
+msgid "Group Number:"
+msgstr "Numéro de groupe :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:107
 msgid "Guarantees:"
 msgstr "Cautions : "
@@ -9286,7 +9391,7 @@ msgstr "Cautions : "
 msgid "Guarantor:"
 msgstr "Garant : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:72
 msgid "HELP"
 msgstr "AIDE"
 
@@ -9347,13 +9452,13 @@ msgstr "Livres de poche"
 msgid "Has been checked out %s times"
 msgstr "A été prêté %s fois"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:88
 msgid "Heading Ascendant"
 msgstr "Vedette croissant"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:89
 msgid "Heading Descendant"
 msgstr "Vedette décroissant"
 
@@ -9361,12 +9466,12 @@ msgstr "Vedette décroissant"
 msgid "Hebdomadaire"
 msgstr "Hebdomadaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:121
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:123
 msgid "Help"
 msgstr "Aide"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:35
 msgid "Help input:"
 msgstr "Aide à la saisie : "
 
@@ -9396,7 +9501,7 @@ msgstr ""
 "que Koha ignore en faisant des recherches sur le catalogue ou en "
 "construisant l'index des mots-clé."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:33
 msgid "Hidden"
 msgstr "Caché"
 
@@ -9404,11 +9509,15 @@ msgstr "Caché"
 msgid "Hide Details"
 msgstr "Cacher les détails"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1168
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:23
+msgid "Hint:"
+msgstr "Truc :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1164
 msgid "History"
 msgstr "Historique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc:5
 msgid "History search"
 msgstr "Recherche historique"
@@ -9426,8 +9535,8 @@ msgstr "Date de réservation <a1>trier</a>"
 msgid "Hold Over"
 msgstr "Réservation dépassée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:738
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:264
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:738
 msgid "Hold date"
 msgstr "Date de réservation"
 
@@ -9497,8 +9606,8 @@ msgstr "ite de localisation"
 msgid "Holdingbranch"
 msgstr "Site de localisation"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:6
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:5
 msgid "Holds"
 msgstr "Réservations"
 
@@ -9507,7 +9616,7 @@ msgid "Holds at your library"
 msgstr "Réservations sur votre site"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:34
 msgid "Holds awaiting pickup"
 msgstr "Réservations mises de coté"
 
@@ -9518,7 +9627,7 @@ msgid "Holds for your library on : %s"
 msgstr "Transferts en cours <b>vers</b> votre site le : %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:33
 msgid "Holds to pull"
 msgstr "Réservations à traiter"
 
@@ -9548,8 +9657,8 @@ msgstr "Jour de fermeture répété toujours le même jour de la semaine"
 msgid "Holiday repeated yearly on the same date"
 msgstr "Jour de fermeture répété chaque année à la même date"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:23
 msgid "Holidays"
 msgstr "Jours fériés"
 
@@ -9565,6 +9674,7 @@ msgstr "Site d'origine"
 msgid "Home Library"
 msgstr "Bibliothèque d'origine"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:23
 msgid "Home Library:"
@@ -9578,15 +9688,15 @@ msgstr "Accueil :"
 msgid "Horowhenua Library Trust"
 msgstr "Horowhenua Library Trust"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:127
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:198
-msgid "Hostname"
-msgstr "Nom du serveur hôte"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:250
 msgid "Hostname/Port"
 msgstr "Nom du serveur hôte/port"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:198
+msgid "Hostname:"
+msgstr "Nom du serveur hôte :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:264
 msgid "Humour, satire"
 msgstr "Humour, satire"
@@ -9628,6 +9738,10 @@ msgstr ""
 msgid "INPUT SAVED"
 msgstr "DONNÉE SAUVEGARDÉE"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:69
+msgid "IP"
+msgstr "IP"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl:5
 msgid "IP address change"
 msgstr "Changement d'adresse IP"
@@ -9636,17 +9750,17 @@ msgstr "Changement d'adresse IP"
 msgid "ISBD"
 msgstr "ISBD"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:165
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:168
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:139
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:137
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:167
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -9662,7 +9776,8 @@ msgstr "ISBN %s"
 msgid "ISBN :<i>%s</i>"
 msgstr "ISBN : <i>%s</i>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:88
 msgid "ISBN:"
@@ -9670,20 +9785,20 @@ msgstr "ISBN : "
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=isbn
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:111
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:110
 #, c-format
 msgid "ISBN: %s"
 msgstr "ISBN : %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:108
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:68
 msgid "ISSN"
 msgstr "ISSN"
 
@@ -9693,10 +9808,10 @@ msgstr "ISSN"
 msgid "ISSN like <b>%s</b>"
 msgstr "issn tel que <b>%s</b>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:173
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:177
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:104
 msgid "ISSN:"
 msgstr "ISSN : "
 
@@ -9708,21 +9823,36 @@ msgstr "ISSN : %s"
 
 #
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:58
 msgid "If ISBN is already in the reservoir:"
 msgstr "Si l'ISBN est déjà dans le réservoir : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:27
-msgid "If a cell is not filled, the 1st of the following value is searched :"
+msgid "If a cell is not filled, the value in the default column (top right) is used"
+msgstr ""
+"Si une case n'est pas remplie, la valeur saisie dans la colonne de droite "
+"(\"défaut\") est utilisée"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:28
+msgid ""
+"If a rule is filled for a given branch, it is used, otherwise, it's the rule "
+"of the \"default\" branch"
+msgstr ""
+"Si une règle est saisie pour un site donné, elle est utilisée. Sinon, la "
+"règle pour le site \"par défaut\" est prise en compte."
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:27
+msgid ""
+"If a total is filled (last line), the patron must fit both itemtype and "
+"total rule"
 msgstr ""
-"Si une case n'est pas remplie, la première des valeurs suivantes est "
-"recherchée : "
+"Si un total est saisi (ligne du bas), l'adhérent doit remplir à la fois la "
+"règle du type de documents et la règle du total."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:33
 msgid ""
 "If an ISBN already exists in the reservoir, you can choose whether to ignore "
 "the new one or overwrite the old one."
@@ -9730,19 +9860,6 @@ msgstr ""
 "Si un ISBN existe déjà dans le réservoir, vous pouvez choisir soit d'ignorer "
 "la nouvelle notice soit d'écraser l'ancienne."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:490
-#, c-format
-msgid "If it <em>is</em> a duplicate, <a1>Edit Items</a> of the existing record."
-msgstr "Si c'est un doublon, <a1>Modifier les exemplaires</a>de la notice existante."
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:491
-msgid "If not, click to"
-msgstr "Sinon, cliquez sur"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:32
-msgid "If nothing is set, default is 21,5 (hardcoded)"
-msgstr "Si rien n'est défini, la valeur par défaut est 21,5 (fixé dans le code)"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tmpl:18
 msgid ""
 "If the issuing is problematic, then another box will appear and ask for "
@@ -9824,8 +9941,8 @@ msgstr ""
 "s'affichera sous forme de virgules lorsque vous aurez confirmé "
 "l'enregistrement."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:11
 msgid ""
 "If you are CERTAIN that you will never use a MARC tag, then you can delete "
@@ -9961,6 +10078,10 @@ msgstr "Ignorer celui-ci, garder l'existant."
 msgid "Il ne s'agit pas d'un texte litteraire"
 msgstr "Il ne s'agit pas d'un texte litteraire"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:37
+msgid "Illus:"
+msgstr "Illustrateur :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:285
 msgid "Illustration"
 msgstr "Illustrations"
@@ -9969,21 +10090,26 @@ msgstr "Illustrations"
 msgid "Illustrations"
 msgstr "Illustrations"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:96
 msgid "Illustrator:"
 msgstr "Illustrateur : "
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:401
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:234
 msgid "Image"
 msgstr "Image"
 
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:135
+msgid "Image:"
+msgstr "Image :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:8
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:63
 msgid "Import"
 msgstr "Importer"
 
@@ -9994,13 +10120,13 @@ msgstr "Importe des données dans le réservoir"
 
 #
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:18
 msgid "Import into the reservoir"
 msgstr "Importer dans le réservoir"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:21
 msgid "Import results :"
 msgstr "Résultats de l'importation : "
 
@@ -10046,12 +10172,12 @@ msgstr ""
 "Sur cet écran, vous pouvez voir le détail de l'abonnement, et le modifier si "
 "nécessaire."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:37
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:175
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:37
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:171
 msgid "Inactive"
 msgstr "Inactif"
 
@@ -10082,7 +10208,7 @@ msgid "Information"
 msgstr "Information"
 
 #. %1$s: TMPL_VAR name=name
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:128
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:130
 #, c-format
 msgid "Information for : %s"
 msgstr "Renseignements sur : %s"
@@ -10091,18 +10217,18 @@ msgstr "Renseignements sur : %s"
 msgid "Initial word"
 msgstr "Mot de début"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:154
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:98
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:153
 msgid "Initials:"
 msgstr "Initiales : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:295
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:294
 msgid "Inner Counter"
 msgstr "Compteur interne"
 
 #. INPUT type=button name=insert
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:93
 msgid "Insert"
 msgstr "Insérer"
 
@@ -10114,13 +10240,13 @@ msgstr "Installation terminée"
 msgid "Invalid username or password"
 msgstr "Nom d'utilisateur ou mot de passe invalide"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:17
 msgid "Inventory/Stocktaking"
 msgstr "Inventaire/récolement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:32
 msgid "Inventory/stocktaking"
 msgstr "Inventaire/récolement"
 
@@ -10128,47 +10254,45 @@ msgstr "Inventaire/récolement"
 msgid "Invoice"
 msgstr "Numéro de facture"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:185
-msgid "Invoice Item Price Includes GST"
-msgstr "Le prix facturé comprend la TVA"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:181
+msgid "Invoice Item Price Includes GST:"
+msgstr "Le prix facturé comprend la TVA :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:270
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:269
 msgid "Invoice Number"
 msgstr "Numéro de facture"
 
 #. %1$s: TMPL_VAR name=booksellerinvoicenumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:97
 #, c-format
 msgid "Invoice Number: %s"
 msgstr "Facture numéro : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:90
 msgid "Invoice Prices are"
 msgstr "Les prix facturés sont en"
 
-#. %1$s: TMPL_VAR name=invoiceprice
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:180
-#, c-format
-msgid "Invoice Prices are%s"
-msgstr "Les prix facturés sont en %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:176
+msgid "Invoice Prices are:"
+msgstr "Les prix facturés sont en :"
 
 #. %1$s: TMPL_VAR name=booksellerinvoicenumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:37
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:38
 #, c-format
 msgid "Invoice number %s"
 msgstr "Facture numéro %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:114
 msgid "Invoice prices"
 msgstr "Prix facturés"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:932
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:934
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:132
 msgid "Irregular"
 msgstr "Irrégulier"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:238
 msgid "Irregularity:"
 msgstr "Irrégularité : "
 
@@ -10183,8 +10307,8 @@ msgid "Irregulier"
 msgstr "Irrégulier"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:34
 msgid "Is a URL"
 msgstr "Est une URL"
 
@@ -10201,7 +10325,7 @@ msgstr ""
 "sous-champ de ce champ : "
 
 #. %1$s: TMPL_VAR name=duplicatetitle
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:487
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:445
 #, c-format
 msgid "Is this a duplicate of <a1>%s</a>?"
 msgstr "Est-ce un doublon de <a1>%s</a>?"
@@ -10210,16 +10334,15 @@ msgstr "Est-ce un doublon de <a1>%s</a>?"
 msgid "Isorel"
 msgstr "Isorel"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:604
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:143
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:604
 msgid "Issue"
 msgstr "Prêt"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:286
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:284
 msgid "Issue #"
 msgstr "Prêter #"
 
@@ -10231,15 +10354,19 @@ msgstr "Prêter #"
 msgid "Issue %S"
 msgstr "Numéro %S"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:123
+msgid "Issue History"
+msgstr "Etat de collection"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:113
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:75
 msgid "Issue date"
 msgstr "Date du prêt"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:162
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:315
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:314
 msgid "Issue number"
 msgstr "Numéro de parution"
 
@@ -10261,17 +10388,12 @@ msgstr "Prêts"
 msgid "Issues count"
 msgstr "Décompte des prêts"
 
-#. A
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:90
-msgid "Issues history"
-msgstr "Historique des n° parus"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:94
 msgid "Issues summary"
 msgstr "Abrégé des n° parus"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:31
 msgid "Issuing branch"
 msgstr "Site de prêt"
 
@@ -10287,8 +10409,8 @@ msgstr ""
 "Durée du prêt et quantité : vous disent combien de documents et pour combien "
 "de temps une catégorie d'adhérent peut emprunter un type de document"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/issuingrules.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/issuingrules.tmpl:7
 msgid "Issuing rules"
 msgstr "Règles de prêt"
 
@@ -10331,10 +10453,10 @@ msgstr ""
 msgid "Italian:"
 msgstr "Italien : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:289
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:292
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:59
 msgid "Item"
 msgstr "Exemplaire"
 
@@ -10358,7 +10480,7 @@ msgstr "Code à barres de l'exemplaire : "
 msgid "Item Callnumber"
 msgstr "Cote de l'exemplaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:250
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:223
 msgid "Item Cancelled"
 msgstr "Exemplaire annulé"
@@ -10376,6 +10498,11 @@ msgid "Item Count"
 msgstr "Nombre de documents"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:61
+msgid "Item Damaged"
+msgstr "Document endommagé"
+
+#
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:21
 msgid "Item Details"
@@ -10385,8 +10512,8 @@ msgstr "Détails des exemplaires"
 msgid "Item Information"
 msgstr "Information sur les documents"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:21
 msgid "Item Location (items.itemcallnumber) between"
 msgstr "Cote de l'exemplaire ((items.itemcallnumber) entre"
 
@@ -10394,6 +10521,11 @@ msgstr "Cote de l'exemplaire ((items.itemcallnumber) entre"
 msgid "Item Location (items.location) is"
 msgstr "La localisation du document (items.location) est"
 
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:61
+msgid "Item Lost"
+msgstr "Exemplaire perdu"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl:101
 msgid "Item Number:"
 msgstr "Numéro de l'exemplaire : "
@@ -10403,7 +10535,11 @@ msgstr "Numéro de l'exemplaire : "
 msgid "Item Status"
 msgstr "Etat de l'exemplaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:61
+msgid "Item Status Summary"
+msgstr "Etat de l'exemplaire"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:56
 msgid "Item Status:"
 msgstr "Etat de l'exemplaire : "
 
@@ -10421,18 +10557,25 @@ msgid "Item Type:"
 msgstr "Type de document : "
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:231
 msgid "Item Types Administration"
 msgstr "Gestion des types de document"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:61
+msgid "Item Withdrawn"
+msgstr "Exemplaire retiré"
+
 #. %1$s: TMPL_VAR name=wbrname
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:325
 #, c-format
 msgid "Item being transfered to <b> %s</b>"
 msgstr "Document en transfert vers <b> %s</b>"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:266
+msgid "Item count"
+msgstr "Nombre de documents"
+
 #. %1$s: TMPL_VAR name=transfertfrom
 #. %2$s: TMPL_VAR name=transfertto
 #. %3$s: TMPL_VAR name=transfertwhen
@@ -10475,15 +10618,10 @@ msgid "Item is on reserve for %s"
 msgstr "Exemplaire en réservation pour %s"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:248
 msgid "Item lost"
 msgstr "Exemplaire(s) perdu(s)"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:64
-msgid "Item lost:"
-msgstr "Exemplaire perdu : "
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:254
 msgid "Item not for loan"
 msgstr "Exemplaire exclu du prêt"
@@ -10513,15 +10651,16 @@ msgstr "Le document devrait maintenant être mis de coté à %s"
 msgid "Item tag"
 msgstr "Champ des exemplaires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:127
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:137
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:248
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:233
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:226
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:212
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl:22
 msgid "Item type"
 msgstr "Type de document"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:185
 msgid "Item type:"
 msgstr "Type de document : "
@@ -10530,8 +10669,8 @@ msgstr "Type de document : "
 msgid "Item types"
 msgstr "Types de document"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:11
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:32
 msgid "Item types and circulation codes"
 msgstr "Types de documents et règles de prêt."
 
@@ -10565,6 +10704,10 @@ msgstr "L'exemplaire était perdu, retrouvé maintenant."
 msgid "Item was on loan to <a1>%s</a> %s and has been returned."
 msgstr "L'exemplaire était emprunté par <a1>%s</a> %s et a été retourné."
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:96
+msgid "Item(s)"
+msgstr "Exemplaires(s)"
+
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:44
 msgid "Item:"
@@ -10575,12 +10718,11 @@ msgstr "Exemplaire :"
 msgid "Itemnumber"
 msgstr "Numéro d'exemplaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:42
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:261
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:189
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:261
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:44
 msgid "Items"
 msgstr "Exemplaires"
 
@@ -10594,8 +10736,8 @@ msgstr "Document(s) en prêt"
 msgid "Items Overdue as of %s"
 msgstr "Document(s) en retard au %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:32
 msgid "Items checked out the most"
 msgstr "Document(s) les plus prétés"
 
@@ -10605,19 +10747,19 @@ msgstr "Document(s) attendu(s)"
 
 #
 #. %1$s: TMPL_VAR name=title
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:139
 #, c-format
 msgid "Items for %s"
 msgstr "Exemplaires pour %s"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:46
 msgid "Items lost"
 msgstr "Exemplaires perdus"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:40
 msgid "Items not checked out"
 msgstr "Document(s) jamais prétés"
 
@@ -10642,27 +10784,32 @@ msgstr "Exemplaires à imprimer dans la tâche %s (%s exemplaires)"
 msgid "Items with no checkouts"
 msgstr "Documents jamais prêtés"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:643
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:251
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:125
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:147
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:643
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:22
 msgid "Itemtype"
 msgstr "Type de document"
 
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:30
+msgid "Itemtype :"
+msgstr "Type de document :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:113
 msgid "Itemtype limit to any of the following:"
 msgstr "Limiter le type de document à :"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:77
 msgid "Itemtype missing"
 msgstr "Type de document manquant"
 
@@ -10690,9 +10837,11 @@ msgstr ""
 msgid "Jan"
 msgstr "Janv"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:166
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:166
 msgid "January"
 msgstr "Janvier"
 
@@ -10714,9 +10863,11 @@ msgstr "Revue"
 msgid "Jul"
 msgstr "Juil"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:172
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:172
 msgid "July"
 msgstr "Juil"
 
@@ -10725,9 +10876,11 @@ msgstr "Juil"
 msgid "Jun"
 msgstr "Juin"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:171
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:171
 msgid "June"
 msgstr "Juin"
 
@@ -10754,7 +10907,7 @@ msgstr "<b>Katipo Communications</b> (Chris Cormack)"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl:18
 msgid "Keyword"
 msgstr "Tous les mots"
 
@@ -10767,12 +10920,12 @@ msgstr "Kip DeGraaf"
 msgid "Kits"
 msgstr "Kits"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc:43
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc:43
 msgid "Koha"
 msgstr "Koha"
 
@@ -10785,14 +10938,16 @@ msgstr "Koha &rsaquo;"
 msgid "Koha &rsaquo; Acquisitions"
 msgstr "Koha &rsaquo; Acquisitions"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
 msgid "Koha &rsaquo; Acquisitions &rsaquo;"
 msgstr "Koha &rsaquo; Acquisitions &rsaquo;"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:2
 msgid "Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion"
-msgstr "Koha &rsaquo; Acquisitions &rsaquo; Ajouter une commande à partir d'une suggestion"
+msgstr ""
+"Koha &rsaquo; Acquisitions &rsaquo; Ajouter une commande à partir d'une "
+"suggestion"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:2
 msgid "Koha &rsaquo; Acquisitions &rsaquo; Book Funds"
@@ -10820,7 +10975,9 @@ msgstr "Koha &rsaquo; Acquisitions &rsaquo; Résumé de réception pour : %s"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:2
 #, c-format
 msgid "Koha &rsaquo; Acquisitions &rsaquo; Receive parcel from supplier %s"
-msgstr "Koha &rsaquo; Acquisitions &rsaquo;  Réceptionner colis du fournissur %sRecherche fournisseur"
+msgstr ""
+"Koha &rsaquo; Acquisitions &rsaquo;  Réceptionner colis du fournissur %"
+"sRecherche fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:2
 msgid "Koha &rsaquo; Acquisitions &rsaquo; Search Existing Records"
@@ -10830,7 +10987,9 @@ msgstr "Koha &rsaquo; Acquisitions &rsaquo; Rechercher dans le catalogue"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:2
 #, c-format
 msgid "Koha &rsaquo; Acquisitions &rsaquo; Shopping Basket %s &rsaquo;"
-msgstr "Koha &rsaquo; Acquisitions &rsaquo; Panier de commande %s &rsaquo;vérification MARC : "
+msgstr ""
+"Koha &rsaquo; Acquisitions &rsaquo; Panier de commande %s &rsaquo;"
+"vérification MARC : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:2
 msgid "Koha &rsaquo; Add to Virtual Shelf"
@@ -10843,20 +11002,17 @@ msgstr "Koha &rsaquo; Administrationsystème"
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:2
 msgid "Koha &rsaquo; Administration &rsaquo;"
 msgstr "Koha &rsaquo; Administration &rsaquo;système"
 
@@ -10866,12 +11022,22 @@ msgstr "Koha &rsaquo; Administration &rsaquo; Grilles d'autoritévérification M
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:2
 msgid "Koha &rsaquo; Administration &rsaquo; Authority MARC subfield structure"
-msgstr "Koha &rsaquo; Administration système &Grilles d'autorités, sous-champsrsaquo; règles de prêt"
+msgstr ""
+"Koha &rsaquo; Administration système &Grilles d'autorités, sous-"
+"champsrsaquo; règles de prêt"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:2
 msgid "Koha &rsaquo; Administration &rsaquo; Authorized Values"
 msgstr "Koha &rsaquo; Administration &rsaquo; Valeurs autoriséesbudgets"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:2
+msgid ""
+"Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange Rates "
+"&rsaquo;"
+msgstr ""
+"Koha &rsaquo; Administration système &rsaquo; Devises &amp; Taux de change "
+"&rsaquo;"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:2
 msgid "Koha &rsaquo; Administration &rsaquo; Fines"
 msgstr "Koha &rsaquo; Administration système &Asaquo; amendes"
@@ -10884,10 +11050,18 @@ msgstr "Koha &rsaquo; Administration système &rsaquo; Budgetsbudgets"
 msgid "Koha &rsaquo; Administration &rsaquo; Issuing Rules"
 msgstr "Koha &rsaquo; Administration système &rsaquo; règles de prêt"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:2
+msgid "Koha &rsaquo; Administration &rsaquo; Item Types"
+msgstr "Koha &rsaquo; Administration système &Asaquo; types de documents"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:2
 msgid "Koha &rsaquo; Administration &rsaquo; MARC Check"
 msgstr "Koha &rsaquo; Administration système &rsaquo; vérificat MARC : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:2
+msgid "Koha &rsaquo; Administration &rsaquo; Patron Categories &rsaquo;"
+msgstr "Koha &rsaquo; Administration &rsaquo; Catégories d'adhérents"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:2
 msgid "Koha &rsaquo; Authorities"
 msgstr "Koha &rsaquo; Autorités"
@@ -10992,9 +11166,10 @@ msgstr "Koha &rsaquo; Report catalogage autorité"
 msgid "Koha &rsaquo; Cataloguing Authority Selection"
 msgstr "Koha &rsaquo; Report catalogage autorité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:2
 msgid "Koha &rsaquo; Circulation"
 msgstr "Koha &rsaquo; Circulation"
 
@@ -11050,13 +11225,13 @@ msgstr "Koha &rsaquo; Circulation &rsaquo; Transferts vers votre site"
 msgid "Koha &rsaquo; Dictionary Search"
 msgstr "Koha &rsaquo; Recherche dictionnaire"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:2
 msgid "Koha &rsaquo; Error"
 msgstr "Koha &rsaquo; Erreur"
 
@@ -11084,18 +11259,20 @@ msgstr "Koha &rsaquo; Recherche garant"
 msgid "Koha &rsaquo; Hold Report &rsaquo; All Holds"
 msgstr "Koha &rsaquo; Rapport réservations &rsaquo; Toutes les réservations"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:1
 msgid "Koha &rsaquo; Labels"
 msgstr "Koha &rsaquo; Etiquettes"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:1
 msgid "Koha &rsaquo; Labels &rsaquo; Create Layout"
-msgstr "Koha &rsaquo; Etiquettes Adhérent Créer un modèle&rsaquo; créer un crédit manuel"
+msgstr ""
+"Koha &rsaquo; Etiquettes Adhérent Créer un modèle&rsaquo; créer un crédit "
+"manuel"
 
 #. %1$s: TMPL_VAR name=bookselname
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:2
@@ -11122,14 +11299,14 @@ msgstr ""
 "des lignes budgétaires"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl:2
 msgid "Koha &rsaquo; Patron Quick Search"
 msgstr "Koha &rsaquo; Recherche rapide adhérent"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:2
 msgid "Koha &rsaquo; Patrons &rsaquo;"
 msgstr "Koha &rsaquo; Adhérents Catalogue &rsaquo;"
 
@@ -11142,7 +11319,9 @@ msgstr "Koha &rsaquo;  Adhérents &rsaquo; Résultats de recherche"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl:2
 #, c-format
 msgid "Koha &rsaquo; Patrons &rsaquo; Set Privileges for %s, %s"
-msgstr "Koha &rsaquo;  Adhérents &rsaquo; Définir les permissions de %s, %sRésultats de recherche"
+msgstr ""
+"Koha &rsaquo;  Adhérents &rsaquo; Définir les permissions de %s, %sRésultats "
+"de recherche"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:2
 msgid "Koha &rsaquo; Reports"
@@ -11154,7 +11333,9 @@ msgstr "Koha &rsaquo; Statistiques &rsaquo; AcquisitionsToutes les réservations
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Average checkout period"
-msgstr "Koha &rsaquo; Statistiques PériodiquDurée moyenne des prêtses &rsaquo; Selection fournisseur"
+msgstr ""
+"Koha &rsaquo; Statistiques PériodiquDurée moyenne des prêtses &rsaquo; "
+"Selection fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Catalogue statistics"
@@ -11166,7 +11347,9 @@ msgstr "Koha &rsaquo; Statistiques AutoritésCirculation &rsaquo; Liste des Rép
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Checkouts by patron category"
-msgstr "Koha &rsaquo; Statistiques Outils &rPrêts pas catégorie de lecteursaquo; Documents perdus"
+msgstr ""
+"Koha &rsaquo; Statistiques Outils &rPrêts pas catégorie de lecteursaquo; "
+"Documents perdus"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Inventory/Stocktaking"
@@ -11178,7 +11361,9 @@ msgstr "Koha &rsaquo; Statistiques Outils &rTypes de documentsaquo; Documents pe
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Items with no checkouts"
-msgstr "Koha &rsaquo; Statistiques Rapport rDocuments jamais empruntéséservations &rsaquo; Toutes les réservations"
+msgstr ""
+"Koha &rsaquo; Statistiques Rapport rDocuments jamais empruntéséservations "
+"&rsaquo; Toutes les réservations"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Lost Items"
@@ -11186,7 +11371,9 @@ msgstr "Koha &rsaquo; Statistiques Outils &rDocuments perdussaquo; Documents per
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Most-Circulated Items"
-msgstr "Koha &rsaquo; Statistiques Outils &rDocument circulant le plussaquo; Documents perdus"
+msgstr ""
+"Koha &rsaquo; Statistiques Outils &rDocument circulant le plussaquo; "
+"Documents perdus"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Patrons statistics"
@@ -11194,11 +11381,15 @@ msgstr "Koha &rsaquo; Statistiques AutoritésAdhérents &rsaquo; Liste des Répo
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Patrons with No Checkouts"
-msgstr "Koha &rsaquo; Statistiques &rsaquo; Adhérents n'empruntant pasOutils &rsaquo; Documents perdus"
+msgstr ""
+"Koha &rsaquo; Statistiques &rsaquo; Adhérents n'empruntant pasOutils "
+"&rsaquo; Documents perdus"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Patrons with the most Checkouts"
-msgstr "Koha &rsaquo; Statistiques Outils &rAdhérents empruntant le plussaquo; Documents perdus"
+msgstr ""
+"Koha &rsaquo; Statistiques Outils &rAdhérents empruntant le plussaquo; "
+"Documents perdus"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl:2
 msgid "Koha &rsaquo; Reviews waiting for Approval"
@@ -11214,8 +11405,8 @@ msgstr "Koha &rsaquo; Résultats de la recherche"
 msgid "Koha &rsaquo; Search for supplier %s"
 msgstr "Koha &rsaquo; Recherche fournisseur %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:2
 msgid "Koha &rsaquo; Serials"
 msgstr "Koha &rsaquo; Périodiques"
 
@@ -11233,11 +11424,15 @@ msgstr "Koha &rsaquo; Périodiques &rsaquo;"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl:2
 #, c-format
 msgid "Koha &rsaquo; Serials &rsaquo; Alert subscribers for %s"
-msgstr "Koha &rsaquo; Périodiques &rsaquo; Alertes adhérents pour %sSelection fournisseur"
+msgstr ""
+"Koha &rsaquo; Périodiques &rsaquo; Alertes adhérents pour %sSelection "
+"fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:2
 msgid "Koha &rsaquo; Serials &rsaquo; Check Expiration"
-msgstr "Koha &rsaquo; Périodiques &rsaquo; Vérifier expirationExpiration des abonnements"
+msgstr ""
+"Koha &rsaquo; Périodiques &rsaquo; Vérifier expirationExpiration des "
+"abonnements"
 
 #. %1$s: TMPL_VAR name=bibliotitle
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:2
@@ -11261,11 +11456,15 @@ msgstr "Koha &rsaquo; Périodiques &rsaquo; Listes de circulation"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:2
 msgid "Koha &rsaquo; Serials &rsaquo; Edit Routing List"
-msgstr "Koha &rsaquo; Périodiques &rsaquo; Modifier la liste de circulationSelection fournisseur"
+msgstr ""
+"Koha &rsaquo; Périodiques &rsaquo; Modifier la liste de circulationSelection "
+"fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl:2
 msgid "Koha &rsaquo; Serials &rsaquo; Routing Slip Preview"
-msgstr "Koha &rsaquo; Périodiques &rsaquo; Prévisualisation de la liste de circulationSelection fournisseur"
+msgstr ""
+"Koha &rsaquo; Périodiques &rsaquo; Prévisualisation de la liste de "
+"circulationSelection fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl:2
 msgid "Koha &rsaquo; Serials &rsaquo; Search for Supplier"
@@ -11279,7 +11478,9 @@ msgstr "Koha &rsaquo; Périodiques &rsaquo; Selection fournisseur"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:2
 #, c-format
 msgid "Koha &rsaquo; Serials &rsaquo; Serial Collection information for %s"
-msgstr "Koha &rsaquo; Périodiques &rsaquo; Etat de collection de %sSelection fournisseur"
+msgstr ""
+"Koha &rsaquo; Périodiques &rsaquo; Etat de collection de %sSelection "
+"fournisseur"
 
 #. %1$s: TMPL_VAR name=bibliotitle
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:2
@@ -11300,7 +11501,9 @@ msgstr "Koha &rsaquo;  Périodiques &rsaquo; Abonnement pour %s"
 msgid ""
 "Koha &rsaquo; Serials &rsaquo; Subscription information for biblio #%s with "
 "title : %s"
-msgstr "Koha &rsaquo; Périodiques &rsaquo; Information d'abonnement pour notice N°%s titre : %s"
+msgstr ""
+"Koha &rsaquo; Périodiques &rsaquo; Information d'abonnement pour notice N°%s "
+"titre : %s"
 
 #. %1$s: TMPL_VAR name=subscriptionid
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl:2
@@ -11394,8 +11597,8 @@ msgstr "Koha &rsaquo; Bienvenue dans l'installateur Web de Koha"
 msgid "Koha &rsaquo; Z39.50 Search Results"
 msgstr "Koha &rsaquo; Résultats de la recherche Z3950"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:2
 msgid "Koha -- Authority details"
 msgstr "Koha -- Détails autorité"
 
@@ -11412,11 +11615,6 @@ msgid "Koha -- Labels"
 msgstr "Koha -- Etiquettes"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:82
-msgid "Koha -> MARC mapping"
-msgstr "Liens Koha => MARC"
-
-#
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tmpl:7
 msgid "Koha 2 MARC links"
 msgstr "Liens MARC %s"
@@ -11429,14 +11627,14 @@ msgstr "Installeur de Koha 3.0"
 msgid "Koha 3.0 members &amp; reserve modules."
 msgstr "Koha 3.0 lecteurs &amp; modules réservation."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:135
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:141
 msgid "Koha Field"
 msgstr "Champ Koha"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:61
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:59
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:41
 msgid "Koha administration"
 msgstr "Administration Koha"
 
@@ -11450,8 +11648,8 @@ msgstr ""
 "saisir dans certains sous-champs MARC à certaines valeurs pré-définies "
 "\"autorisées\".Ces valeurs autorisées sont définies ici."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:8
 msgid ""
 "Koha allows you to specify which MARC tags you want to use and which you "
@@ -11496,13 +11694,17 @@ msgstr ""
 msgid ""
 "Koha cannot display existing passwords. Below is a randomly generated "
 "suggestion"
-msgstr "Koha ne peut pas afficher un mot de passe déjà défini. Ci-dessous un mot de passe généré aléatoirement est proposé"
+msgstr ""
+"Koha ne peut pas afficher un mot de passe déjà défini. Ci-dessous un mot de "
+"passe généré aléatoirement est proposé"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:141
 msgid ""
 "Koha comes in 2 flavours : Zebra and NoZebra. You will now decide the "
 "version you need"
-msgstr "Koha est disponible en 2 versions : Zebra et NoZebra. Vous allez maintenant décider quelle version vous convient"
+msgstr ""
+"Koha est disponible en 2 versions : Zebra et NoZebra. Vous allez maintenant "
+"décider quelle version vous convient"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tmpl:10
 msgid ""
@@ -11515,7 +11717,7 @@ msgstr ""
 "dans votre catalogue.A cet endroit, vous pouvez indiquer d'autres serveurs "
 "pour la recherche."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:111
 msgid "Koha field:"
 msgstr "Champ Koha : "
 
@@ -11523,12 +11725,12 @@ msgstr "Champ Koha : "
 msgid "Koha internal"
 msgstr "Champ Koha"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:96
 msgid "Koha link"
 msgstr "Lien Koha"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:19
 msgid ""
 "Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does "
@@ -11557,6 +11759,7 @@ msgstr "Koha poste bibliothécaire"
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:57
 msgid "Koha to MARC mapping"
 msgstr "Liens Koha => MARC"
 
@@ -11572,8 +11775,8 @@ msgstr "LCCN : "
 msgid "Label Batches"
 msgstr "Tâches d'impression d'étiquettes"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:34
 msgid "Label Height:"
 msgstr "Hauteur de l'étiquette : "
 
@@ -11592,8 +11795,8 @@ msgstr "Numéro de l'étiquette"
 msgid "Label Templates"
 msgstr "Modèle d'étiquette"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:33
 msgid "Label Width:"
 msgstr "Largeur de l'étiquette : "
 
@@ -11601,11 +11804,11 @@ msgstr "Largeur de l'étiquette : "
 msgid "Label creator"
 msgstr "Créateur d'étiquettes et de code à barres"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:87
 msgid "Label for lib"
 msgstr "Texte pour bib"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:88
 msgid "Label for opac"
 msgstr "Texte pour OPAC"
 
@@ -11644,18 +11847,34 @@ msgstr "Langue"
 msgid "Large print"
 msgstr "Gros caractères"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:58
+msgid "Last Borrower 1:"
+msgstr "Dernier emprunteur 1 :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:59
+msgid "Last Borrower 2:"
+msgstr "Dernier emprunteur 2 :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:55
+msgid "Last borrowed:"
+msgstr "Emprunté pour la dernière fois le : "
+
 #. %1$s: TMPl_VAR name=startdate
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:89
 #, c-format
 msgid "Last renewal of subscription was <b>%s</b>"
 msgstr "Dernier renouvellement de l'abonnement le <b>%s</b>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:237
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:230
 msgid "Last seen"
 msgstr "Vu pour la dernière fois"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1152
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:303
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:54
+msgid "Last seen:"
+msgstr "Vu pour la dernière fois :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:302
 msgid "Last value"
 msgstr "Dernière valeur"
 
@@ -11669,19 +11888,19 @@ msgstr ""
 "Dernière valeur/commence avec : la dernière valeur calculée ou la 1ère "
 "(quand on ajoute un abonnement)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:299
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:297
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:254
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:256
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:122
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:241
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:339
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:338
 msgid "Late"
 msgstr "En retard"
 
@@ -11700,7 +11919,7 @@ msgstr ""
 msgid "Late issues"
 msgstr "Commandes en retard"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc:4
 msgid "Late orders"
 msgstr "Commandes en retard"
@@ -11714,8 +11933,8 @@ msgid "Layout"
 msgstr "Format"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:19
 msgid "Layout Name"
 msgstr "Nom du format"
 
@@ -11723,26 +11942,25 @@ msgstr "Nom du format"
 msgid "Layout:"
 msgstr "Format :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:3
 msgid "Leader builder"
 msgstr "Constructeur du label"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:38
 msgid "Left Page Margin:"
 msgstr "Marge gauche de la page : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:23
-#, fuzzy
 msgid "Left on Order"
-msgstr "Ajouter à une commande"
+msgstr "Commande en cours"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl:49
@@ -11763,10 +11981,10 @@ msgid "Legislation"
 msgstr "Législation"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:132
 msgid "Letter"
 msgstr "Lettre"
 
@@ -11779,9 +11997,9 @@ msgstr "Lettres"
 msgid "Level"
 msgstr "Niveau"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:176
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:169
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:170
 msgid "Lib"
 msgstr "Texte"
 
@@ -11789,12 +12007,12 @@ msgstr "Texte"
 msgid "LibLime (Joshua Ferraro)"
 msgstr "LibLime (Joshua Ferraro)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:321
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:321
 msgid "Librarian"
 msgstr "Bibliothécaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:113
 msgid "Librarian identity:"
 msgstr "Identité bibliothécaire : "
 
@@ -11804,57 +12022,62 @@ msgid "Librarian interface"
 msgstr "Interface bibliothécaire"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1187
 msgid "Librarian notes"
 msgstr "Note interne : "
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:362
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:361
 msgid "Librarian's note"
 msgstr "Note interne : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:820
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:819
 msgid "Librarian:"
 msgstr "Bibliothécaire : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:100
 msgid "Libraries"
 msgstr "Sites"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:20
+msgid "Libraries, Branches, &amp; Agency Categories"
+msgstr "Sites de la bibliothèque &amp et catégories"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:26
 msgid "Libraries, branches and agency categories"
 msgstr "Sites de la bibliothèque"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:20
+msgid "Libraries, branches, &amp; Agency categories"
+msgstr "Sites de la bibliothèque &amp; catégories"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:8
 msgid "Libraries, branches, agency categories"
 msgstr "Sites de la bibliothèque"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:434
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl:120
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:228
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:30
 msgid "Library"
 msgstr "Site"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:118
 msgid "Library IP"
 msgstr "Adresses IP du site"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:405
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:400
 msgid "Library Management"
 msgstr "Elements de gestion"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:119
 msgid "Library Printer"
 msgstr "Imprimante site"
@@ -11862,8 +12085,8 @@ msgstr "Imprimante site"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:109
 msgid "Library cannot be deleted because there are patrons using that library"
 msgstr ""
-"Le site La catégorie ne peut tre supprimée parce qadhérents u'il y a des sites qui "
-"l'utilisent."
+"Le site La catégorie ne peut tre supprimée parce qadhérents u'il y a des "
+"sites qui l'utilisent."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:106
 msgid "Library category added"
@@ -11878,7 +12101,8 @@ msgid "Library category modified"
 msgstr "Catégorie de site modifiée"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:46
 msgid "Library code"
 msgstr "Code du site"
 
@@ -11892,7 +12116,7 @@ msgid "Library last seen at"
 msgstr "Vu pour la dernière fois "
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:514
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:509
 msgid "Library note:"
 msgstr "Note interne :"
 
@@ -11903,7 +12127,7 @@ msgid "Library saved"
 msgstr "Site enregistré"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:460
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:455
 msgid "Library set-up"
 msgstr "Droit d'accès"
 
@@ -11927,10 +12151,10 @@ msgstr "Nom de la Bibliothèque --"
 msgid "Lift Debarment"
 msgstr "Réactiver adhérent"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:54
 msgid "Limit to"
 msgstr "Limiter à"
 
@@ -11942,63 +12166,65 @@ msgstr "Limite le type à "
 msgid "Line"
 msgstr "Ligne"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:88
 msgid "Link"
 msgstr "Lien"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:183
-msgid "List Item Price Includes GST"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:179
+msgid "List Item Price Includes GST:"
 msgstr "Liste des prix des documents incluant la TVA"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:33
 msgid "List Member:"
 msgstr "Inscrit à la liste : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:84
 msgid "List Prices are"
 msgstr "La liste des prix est en"
 
-#. %1$s: TMPL_VAR name=listprice
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:179
-#, c-format
-msgid "List Prices are%s"
-msgstr "La liste des prix est en %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:175
+msgid "List Prices are:"
+msgstr "La liste des prix est en :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:101
 msgid "LoC Classification"
 msgstr "Classification LoC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:253
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:217
 msgid "Loan length"
 msgstr "Durée du prêt"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:28
+msgid "Loan length:"
+msgstr "Durée du prêt :"
+
 #. LABEL
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:139
 msgid "Local History Materials"
 msgstr "Documents d'histoire locale"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:268
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:742
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:129
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:268
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:32
 msgid "Localisation"
 msgstr "Localisation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:234
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:266
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:60
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:172
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:200
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:227
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:178
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:283
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:200
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:172
 msgid "Location"
 msgstr "Localisation"
 
@@ -12014,8 +12240,8 @@ msgstr "Se déconnecter"
 msgid "Log in to Koha"
 msgstr "Connectez-vous à Koha"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:50
 msgid "Log viewer"
 msgstr "Visualiseur des logs"
 
@@ -12046,10 +12272,8 @@ msgstr "Information de connexion"
 msgid "Lois et decrets"
 msgstr "Lois et décrets"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=itemlostcount
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:348
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:110
 #, c-format
 msgid "Lost (%s)"
 msgstr "Perdu (%s)"
@@ -12062,16 +12286,20 @@ msgstr "Exemplaire perdu"
 msgid "Lost Items"
 msgstr "Exemplaires perdus"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:83
+msgid "Lost Status:"
+msgstr "Etat de l'exemplaire :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:54
 msgid "Lost: Patron's card is lost"
 msgstr "Perdue : la carte de l'adhérent semble perdue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:3
 msgid "MARC"
 msgstr "MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:61
 msgid "MARC Authorities framework"
 msgstr "Grille d'autorité Marc"
 
@@ -12079,13 +12307,13 @@ msgstr "Grille d'autorité Marc"
 msgid "MARC Bibliographic Framework Test"
 msgstr "Validation grilles de catalogage"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:55
 msgid "MARC Bibliographic framework"
 msgstr "Grille de catalogage MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:59
 msgid "MARC Bibliographic framework test"
 msgstr "Validation grilles de catalogage"
 
@@ -12097,12 +12325,64 @@ msgstr "Contrôle MARC"
 msgid "MARC Export"
 msgstr "Exportation MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/import/breeding.tmpl:8
-msgid "MARC Import"
-msgstr "Importation MARC"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:76
+msgid "MARC Framework for"
+msgstr "Grille Marc pour"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:6
+msgid "MARC Frameworks"
+msgstr "Grille de catalogage"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
+msgid "MARC Frameworks &rsaquo;"
+msgstr "Grille de catalogage &rsaquo;"
+
+#. %1$s: TMPL_VAR name=action
+#. %2$s: TMPL_VAR name=searchfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:3
+#, c-format
+msgid "MARC Frameworks &rsaquo; %s %s"
+msgstr "Grille d'autorité Marc pour &rsaquo; %s %s"
+
+#. %1$s: TMPL_VAR name=searchfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:4
+#, c-format
+msgid "MARC Frameworks &rsaquo; Confirm Deletion of Tag '%s'"
+msgstr "Structure des champs MARC &rsaquo; Confirmer la suppression du champ '%s'"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:5
+msgid "MARC Frameworks &rsaquo; Data Deleted"
+msgstr "Grille de catalogage &rsaquo; Entrée supprimée"
+
+#. %1$s: TMPL_VAR name=frameworktext
+#. %2$s: TMPL_VAR name=frameworkcode
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:2
+#, c-format
+msgid "MARC Frameworks &rsaquo; Delete Framework for %s (%s)?"
+msgstr "Grille de catalogage &rsaquo; Supprimer la grille pour %s (%s) ?"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/import/breeding.tmpl:8
+msgid "MARC Import"
+msgstr "Importation MARC"
+
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=tagfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:13
+#, c-format
+msgid "MARC Links %s"
+msgstr "Liens MARC %s"
+
+#. %1$s: TMPL_VAR name=action
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:3
+#, c-format
+msgid "MARC Links &rsaquo; %s"
+msgstr "Liens MARC &rsaquo; >%s"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:3
 msgid "MARC Subfield Structure"
 msgstr "Structure des sosu-champs MARC"
 
@@ -12116,45 +12396,29 @@ msgstr "Gestion de la structure des sous-champs &rsaquo; %s"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:3
 #, c-format
 msgid "MARC Subfield Structure &rsaquo; Confirm Deletion of Subfield %s"
-msgstr "Gestion de la structure des sous-champs &rsaquo; Confirmer la suppression du sous-champ %s ?"
+msgstr ""
+"Gestion de la structure des sous-champs &rsaquo; Confirmer la suppression du "
+"sous-champ %s ?"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:2
 msgid "MARC Subfield Structure &rsaquo; Edit MARC subfields constraints"
-msgstr "Gestion de la structure des sous-champs &rsaquo; Modifier les restrictions des sous-champs MARC"
+msgstr ""
+"Gestion de la structure des sous-champs &rsaquo; Modifier les restrictions "
+"des sous-champs MARC"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:3
 msgid "MARC Subfield Structure &rsaquo; Subfield Deleted"
 msgstr "Gestion de la structure des sous-champs &rsaquo; Sous-champ supprimé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:6
-msgid "MARC Tag Structure"
-msgstr "Structure des champs MARC"
-
-#. %1$s: TMPL_VAR name=action
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:3
-#, c-format
-msgid "MARC Tag Structure &rsaquo; %s"
-msgstr "Structure des champs MARC &rsaquo; %s"
-
-#. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:4
-#, c-format
-msgid "MARC Tag Structure &rsaquo; Confirm Deletion of Tag '%s'"
-msgstr "Structure des champs MARC &rsaquo; Confirmer la suppression du champ '%s'"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:5
-msgid "MARC Tag Structure &rsaquo; Data Deleted"
-msgstr "Structure des champs MARC &rsaquo; Donnée supprimée"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:17
 msgid "MARC acquisition system"
 msgstr "Acquisition de données MARC"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=biblionumber
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:56
 #, c-format
 msgid "MARC biblio : %s"
 msgstr "Notice MARC : %s"
@@ -12169,11 +12433,8 @@ msgstr ""
 "pas--elles ne seront simplement pas affichées sur les écrans de prêts et sur "
 "quelques écrans de résultats de recherche."
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=tagfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:135
 #, c-format
 msgid "MARC links %s"
 msgstr "Liens MARC %s"
@@ -12186,39 +12447,31 @@ msgstr "Structure MARC"
 
 #. %1$s: TMPL_VAR name=tagfield
 #. %2$s: TMPL_VAR name=frameworkcode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:140
 #, c-format
 msgid "MARC subfield structure admin for %s (framework %s)"
 msgstr "Gestion de la structure des sous-champs MARC pour %s (Grille %s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:68
-msgid "MARC tag Structure"
-msgstr "Structure des champs MARC"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:76
-msgid "MARC tag structure admin for"
-msgstr "Gestion de la structure des champs MARC pour"
-
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:7
 msgid "MARC tag structure administration"
 msgstr "Gestion de la structure des champs MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:186
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:128
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:130
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:184
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:184
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:184
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:128
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:130
 msgid "MARC-8"
 msgstr "MARC-8"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:54
 msgid "MARC21"
 msgstr "MARC21"
 
@@ -12231,19 +12484,19 @@ msgstr ""
 "MJ Ray et <b>Turo Technology LLP</b>, (contrôle qualité, installation et "
 "mise à jour, maintenance de la version 2.0)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:194
 msgid "Main address"
 msgstr "Adresse principale"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:62
 msgid "Main entry"
 msgstr "Vedette principale"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:52
 msgid "Main entry ($a only)"
 msgstr "Vedette principale (seulement $a)"
 
@@ -12252,48 +12505,51 @@ msgstr "Vedette principale (seulement $a)"
 msgid "Make Payment"
 msgstr "Paiement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:168
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:171
+#
+#. INPUT type=submit name=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:119
+msgid "Make Withdrawn"
+msgstr "Retirer exemplaire"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:175
 msgid "Male"
 msgstr "Masculin"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc:7
 msgid "Manage Orders"
 msgstr "Gérer les commandescommentaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc:10
-msgid "Manage Subscriptions"
-msgstr "Gérer les abonnements"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:19
 msgid ""
 "Manage global system preferences like MARC flavor, date format, "
 "administrator e-mail, and templates."
-msgstr "Change les préférences systèmes principales comme le format MARC, le format de la date, le gestionaire de mails, et les templates."
+msgstr ""
+"Change les préférences systèmes principales comme le format MARC, le format "
+"de la date, le gestionaire de mails, et les templates."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc:3
 msgid "Manage reviews"
 msgstr "Gérer les commentaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc:6
 msgid "Manage suggestions"
 msgstr "Suggestions en attente"
 
 #. %1$s: TMPL_VAR name=authorisedbyname
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:95
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:94
 #, c-format
 msgid "Managed By: %s"
 msgstr "Géré par %s"
 
 #. %1$s: TMPL_VAR name=authorisedbyname
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:35
 #, c-format
 msgid "Managed by %s"
 msgstr "Géré par %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:32
 msgid "Managed in tab"
 msgstr "Géré dans l'onglet"
 
@@ -12319,24 +12575,27 @@ msgstr ""
 "c'est plus logique, deuxièment, Koha ne saurait plus trop répéter des champs "
 "répétables autrement!!!"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:858
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:76
+msgid "Managed in tab:"
+msgstr "Géré dans l'onglet :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:856
 msgid "Management Notes"
 msgstr "Notes internes"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:120
 msgid "Management Notes:"
 msgstr "Gestion des notes :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:99
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:178
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:105
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:89
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:175
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:172
 msgid "Mandatory"
 msgstr "Obligatoire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:17
 msgid ""
 "Mandatory : wether the field is mandatory or not. If mandatory, the "
@@ -12345,11 +12604,12 @@ msgstr ""
 "Obligatoire : si le champ est obligatoire ou non. S'il l'est, le catalogueur "
 "ne peut valider une notice si ce champ est vide."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:193
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:114
 msgid "Mandatory,"
 msgstr "Obligatoire,"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:29
 msgid "Mandatory:"
 msgstr "Obligatoire : "
@@ -12359,14 +12619,14 @@ msgid "Manual Credit"
 msgstr "Crédit manuel"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1005
-msgid "Manual History :"
-msgstr "Historique manuel : "
+msgid "Manual History:"
+msgstr "Historique manuel :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:24
 msgid "Manual Invoice"
 msgstr "Facture manuelle"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:176
 msgid "Manual history :"
 msgstr "Historique manuel : "
 
@@ -12399,9 +12659,11 @@ msgstr "Cartes, Globes"
 msgid "Mar"
 msgstr "Mars"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:168
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:168
 msgid "March"
 msgstr "Mars"
 
@@ -12418,16 +12680,18 @@ msgid "Margin Left (Expressed in mm)"
 msgstr "Marge gauche (en mm)"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:75
 msgid "Mark seen"
 msgstr "Cocher vu"
 
+#. For the first occurrence,
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:170
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:504
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:506
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:170
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
 msgid "May"
 msgstr "Mai"
 
@@ -12443,12 +12707,12 @@ msgstr "Ecran Information sur l'adhérent"
 msgid "Member Search"
 msgstr "Recherche d'adhérent"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:184
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:225
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:227
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:128
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:6
 msgid "Members"
 msgstr "Adhérents"
 
@@ -12493,18 +12757,18 @@ msgstr "Mike Johnson"
 msgid "Mike Mylonas"
 msgstr "Mike Mylonas"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:301
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:95
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:299
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:158
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:160
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:259
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:261
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:129
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:243
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:342
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:95
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:341
 msgid "Missing"
 msgstr "Manquant"
 
@@ -12526,8 +12790,8 @@ msgstr "Liste des numéros attendus, en retard et manquants"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:326
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1183
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:361
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1179
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:360
 msgid "Missing issues"
 msgstr "Numéros manquants : "
 
@@ -12551,27 +12815,26 @@ msgstr "En retard depuis"
 msgid "Mobile:"
 msgstr "Mobile :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:33
 msgid "Modification Log"
 msgstr "Log des modifications"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:11
 msgid "Modification log"
 msgstr "Log des modifications"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:61
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:246
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:141
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:97
 msgid "Modify"
 msgstr "Modifier"
 
@@ -12580,13 +12843,16 @@ msgstr "Modifier"
 msgid "Modify City"
 msgstr "Modifier une commune"
 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=searchfield
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:71
-msgid "Modify Currency '"
-msgstr "Modifier une devise"
+#, c-format
+msgid "Modify Currency '%s'"
+msgstr "Modifier une devise '%s'"
 
 #. INPUT type=button name=guarantorsearch
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:179
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:184
 msgid "Modify Guarantor"
 msgstr "Modifier le garant"
 
@@ -12610,7 +12876,7 @@ msgstr "Modifier une commune"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:793
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:804
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:801
 msgid "Modify a subscription"
 msgstr "Modifier un abonnement"
 
@@ -12624,9 +12890,11 @@ msgstr "Modifier une préférence du système"
 msgid "Modify authorised value"
 msgstr "Modifier la valeur autorisée"
 
+#. For the first occurrence,
 #. %1$s: TMPL_VAR name=authid
 #. %2$s: TMPL_VAR name=authtypetext
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:373
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:382
 #, c-format
 msgid "Modify authority #%s (%s)"
 msgstr "Modifier autorité N°%s (%s)"
@@ -12636,7 +12904,7 @@ msgid "Modify authority type"
 msgstr "Modifier un type d'autorité"
 
 #. %1$s: TMPL_VAR name=categorycode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:97
 #, c-format
 msgid "Modify category %s"
 msgstr "Modifier une catégorie %s"
@@ -12644,7 +12912,7 @@ msgstr "Modifier une catégorie %s"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=categorycode
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:76
 #, c-format
 msgid "Modify category '%s'"
 msgstr "Modifier la catégorie %s"
@@ -12659,14 +12927,12 @@ msgstr "Modifier la devise"
 msgid "Modify framework text"
 msgstr "Modifier le texte de la grille"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:112
 msgid "Modify item type"
 msgstr "Modifier le type de document"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=itemtype
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:88
 #, c-format
 msgid "Modify item type '%s'"
 msgstr "Modifier le type de document '%s'"
@@ -12676,7 +12942,7 @@ msgid "Modify letter"
 msgstr "Modifier une lettre"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:31
 msgid "Modify library"
 msgstr "Modifier un site"
 
@@ -12693,7 +12959,7 @@ msgstr "Modifier site %s"
 #. %1$s: TMPL_VAR name=ordnum
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:85
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:84
 #, c-format
 msgid "Modify order details (line #%s)"
 msgstr "Modifier les détails de la commande (ligne #%s)"
@@ -12715,10 +12981,15 @@ msgid "Modify system preference '%s'"
 msgstr "Modifier une préférence système %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:84
 msgid "Modify tag"
 msgstr "Modifier le champ"
 
+#. %1$s: TMPL_VAR name=searchfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:83
+#, c-format
+msgid "Modify tag %s"
+msgstr "Modifier le champ '%s'"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tmpl:19
 msgid ""
 "Modify user flags allows an administrator to set which clerks, librarians, "
@@ -12744,32 +13015,32 @@ msgstr "Modifier un mot vide"
 msgid "Modify z39.50 Server %s"
 msgstr "Modifier le serveur Z39.50 %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:116
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:116
 msgid "Module"
 msgstr "Module"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:156
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:156
 msgid "Monday"
 msgstr "Lundi"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:478
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:233
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:219
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:149
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:221
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:101
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:256
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:259
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:143
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:219
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:149
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:196
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:233
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:478
 msgid "Month"
 msgstr "Mois"
 
@@ -12795,6 +13066,12 @@ msgstr ""
 "Films, Videos, Diapos, Transparents,\n"
 "Photos, cartes, Graphiques, Dessins"
 
+#. IMG
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:541
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:486
+msgid "Move Up"
+msgstr "Remonter"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl:114
 msgid "Move to trash theses patrons"
 msgstr "Supprimer ces adhérents"
@@ -12825,14 +13102,12 @@ msgstr "Version MySQL : "
 msgid "NEW"
 msgstr "NOUVEAU"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:110
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:253
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:243
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:288
 msgid "NO"
 msgstr "NON"
@@ -12842,10 +13117,13 @@ msgstr "NON"
 msgid ""
 "NOTE : if you change something in this table, ask your administrator to run "
 "misc/rebuildnonmarc.pl script."
-msgstr "NOTE : Si vous changez un lien entre un sous-champ MARC et un champ non-MARC, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl."
+msgstr ""
+"NOTE : Si vous changez un lien entre un sous-champ MARC et un champ non-"
+"MARC, demandez à votre administrateur de lancer le script misc/"
+"rebuildnonmarc.pl."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:165
 msgid ""
 "NOTE : if you change the link between a MARC subfield and a non-MARC field, "
 "ask your administrator to run misc/rebuildnonmarc.pl script."
@@ -12853,23 +13131,21 @@ msgstr ""
 "Si vous changez un lien entre un sous-champ MARC et un champ non-MARC, "
 "demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:80
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:190
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:240
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:177
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:233
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:179
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl:27
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:62
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:37
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:232
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:118
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:277
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:37
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl:27
 msgid "Name"
 msgstr "Nom"
 
@@ -12877,8 +13153,8 @@ msgstr "Nom"
 msgid "Name (Cat.)"
 msgstr "Nom (Cat.)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:46
 msgid "Name of this import:"
 msgstr "Nom de cette importation : "
 
@@ -12890,17 +13166,25 @@ msgstr "Nom ou ISSN : "
 msgid "Name or barcode not found. Please try an other"
 msgstr "Attention, il n'y a aucun adhérent de ce nom, prière d'en essayer un autre"
 
+#. %1$S: type=text name=borname
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:21
+#, c-format
+msgid "Name or cardnumber :%S Borrower categorycode :"
+msgstr "Nom ou numéro de carte adhérent : %S Catégorie d'adhérent :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl:19
 msgid "Name/Location"
 msgstr "Nom/Localisation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:223
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:237
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:131
 msgid "Name:"
 msgstr "Nom : "
 
 #. A
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:85
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:91
 msgid "Narrower terms"
 msgstr "Termes voisins"
 
@@ -12917,11 +13201,12 @@ msgstr "Négatif photo"
 msgid "Nelsonville Public Library"
 msgstr "Bibliothèque Publique de Nelsonville"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:30
 msgid "New"
 msgstr "Nouveau"
 
@@ -12929,13 +13214,21 @@ msgstr "Nouveau"
 msgid "New Card"
 msgstr "Nouvelle carte"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc:5
+msgid "New Order"
+msgstr "Nouvelle commande"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl:34
 msgid "New Password:"
 msgstr "Nouveau mot de passe : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:153
 msgid "New Record"
-msgstr "Nouvelle notice"
+msgstr "Nouvelle commande"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc:3
+msgid "New Supplier"
+msgstr "Nouveau fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl:32
 msgid "New Username:"
@@ -12943,21 +13236,25 @@ msgstr "Nouveau nom d'utilisateur :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:86
 msgid "New order"
 msgstr "Nouvelle commande"
 
 #. A
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:27
 msgid "New search"
 msgstr "Nouvelle recherche"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc:4
+msgid "New:"
+msgstr "Nouveau :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:4
 msgid "News"
 msgstr "Nouvelles"
 
@@ -12973,24 +13270,24 @@ msgstr "%s annonces récentesnouvelles"
 msgid "Next"
 msgstr "Suivant"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:204
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:228
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:201
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:285
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:285
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:229
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:191
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:202
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:33
 msgid "Next &gt;&gt;"
 msgstr "Suivant >>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:206
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:203
 msgid "Next Page"
 msgstr "Page suivante"
 
@@ -13017,29 +13314,28 @@ msgstr "Nicholas Rosasco,(rédacteur de la documentation)"
 msgid "Nicolas Morin (French Translation in 2.0)"
 msgstr "Nicolas Morin, (traduction française 2.0)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:182
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:186
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:188
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:189
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:159
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:217
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:296
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:183
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:185
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:208
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:185
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:209
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:563
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:158
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:558
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:102
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:178
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:182
 msgid "No"
 msgstr "Non"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:206
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:197
 msgid "No Agency Categories defined."
 msgstr "Pas de catégorie définie."
 
@@ -13055,8 +13351,8 @@ msgstr "Pas de traitement spécifié <a1>Sélectionnez les exemplaires à imprim
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=msg
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:106
 #, c-format
 msgid "No Item with barcode: %s"
 msgstr "Pas d'exemplaire avec code à barres : %s"
@@ -13072,12 +13368,12 @@ msgid ""
 "displayed."
 msgstr "Pas de lettre définie. Merci d'en définir une."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:23
 msgid "No Result found !"
 msgstr "Pas de réponse"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:123
 msgid "No Result found in catalogue."
 msgstr "Pas de réponse dans le catalogue"
 
@@ -13108,12 +13404,16 @@ msgstr "Pas de réservation trouvée."
 msgid "No holds"
 msgstr "Pas de réservationtrouvée"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:169
+msgid "No image:"
+msgstr "Pas d'image"
+
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
 msgid "No irregularities noticed"
 msgstr "Pas d irrégularités détectées"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:21
 msgid "No items found"
 msgstr "Pas d'exemplaire(s) trouvé(s)"
 
@@ -13153,7 +13453,7 @@ msgstr "Pas d'adhérent trouvétéléphone enregistré."
 msgid "No patron with this name, Please, try another"
 msgstr "Attention, il n'y a aucun adhérent de ce nom, prière d'en essayer un autre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:71
 msgid "No pending basket"
 msgstr "Pas de panier en instance"
 
@@ -13162,11 +13462,11 @@ msgstr "Pas de panier en instance"
 msgid "No phone stored."
 msgstr "Pas de téléphone enregistré."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:271
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:269
 msgid "No physical items for this record"
 msgstr "Nous n'avons pas d'exemplaire de ce document"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:193
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:184
 msgid "No printers defined."
 msgstr "Pas d'imprimante définie."
 
@@ -13188,18 +13488,18 @@ msgstr "Pas de réponse !"
 msgid "No result found for <b>%s</b>"
 msgstr "Pas de réponse pour <b>%s</b>"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:51
 msgid "No results found"
 msgstr "Pas de réponse"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:125
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:49
 msgid "No results found."
 msgstr "Pas de réponse"
 
@@ -13207,8 +13507,8 @@ msgstr "Pas de réponse"
 msgid "No results in Authorities"
 msgstr "Pas de résultats dans les autorités"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:25
 msgid "No results match your search for"
 msgstr "Pas de résultats correspondant à votre recherche pour"
 
@@ -13216,10 +13516,10 @@ msgstr "Pas de résultats correspondant à votre recherche pour"
 msgid "No reviews awaiting approval or deletion"
 msgstr "Aucun commentaire à approuver ou supprimer."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:166
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:168
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:166
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:168
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:166
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:168
 msgid "No specific type"
@@ -13233,7 +13533,7 @@ msgstr "Pas de statistiques à présenter"
 msgid "No suggestion has already been"
 msgstr "Aucune suggestion n'a déjà été"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:45
 msgid "No suggestions waiting"
 msgstr "Pas de suggestions en attente"
 
@@ -13255,9 +13555,10 @@ msgid "No {X}, Issue {Y}"
 msgstr "N° {X}, Fascicule {Y}"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:150
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:110
 msgid "No, Do Not Delete"
 msgstr "Non, ne pas supprimer"
 
@@ -13271,10 +13572,19 @@ msgstr "Non, ne pas supprimer"
 msgid "No, Do not Delete!"
 msgstr "Non, ne pas supprimer !"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:40
+msgid "No. of Items:"
+msgstr "N° d'exemplaires :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl:31
 msgid "No. of times checked out"
 msgstr "Nombre de prêts"
 
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:451
+msgid "No: Save as New Record"
+msgstr "Non : Enregistrer comme une nouvelle notice"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:149
 msgid "NoZebra version"
 msgstr "Version NoZebra"
@@ -13287,14 +13597,14 @@ msgstr "Personne"
 msgid "Non Fiction"
 msgstr "Documentaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:262
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:264
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:206
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:208
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:262
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:264
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:262
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:264
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:262
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:264
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:206
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:208
 msgid "Non-ISBD"
 msgstr "non-ISBD"
 
@@ -13302,32 +13612,32 @@ msgstr "non-ISBD"
 msgid "Non-musical recording"
 msgstr "Enregistrement non musical"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:137
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:200
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:159
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:193
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:219
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:98
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:60
 msgid "None"
 msgstr "Aucun"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1047
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1049
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1051
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:207
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:206
 msgid "None of the above"
 msgstr "Aucun de ci-dessus"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:2
 msgid "Normal"
 msgstr "Normal"
 
@@ -13357,23 +13667,27 @@ msgstr ""
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Northern"
 msgstr "Nord"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:168
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:170
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:269
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:271
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:244
 msgid "Not Available"
 msgstr "Indisponible"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:303
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:242
+msgid "Not For loan (itemtype)"
+msgstr "Type de document exclu du prêt"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:301
 msgid "Not Issued"
 msgstr "Pas en prêt"
 
@@ -13381,16 +13695,11 @@ msgstr "Pas en prêt"
 msgid "Not On Issue."
 msgstr "Pas en prêt."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:354
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:365
 msgid "Not Reserveable"
 msgstr "Non réservable"
 
-#. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:425
-msgid "Not a duplicate confirmed. Please click on Add biblio to save the record"
-msgstr "Vous avez confirmé que ce n'était pas un doublon. Cliquer sur \"Ajouter notice\" à nouveau pour enregistrer la saisie"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:218
 msgid "Not allowed"
 msgstr "Non autorisé"
 
@@ -13398,16 +13707,16 @@ msgstr "Non autorisé"
 msgid "Not defined yet"
 msgstr "Pas encore défini"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:273
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:237
 msgid "Not for Loan"
 msgstr "Exclu du prêt"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:176
 msgid "Not for loan"
 msgstr "Exclu du prêt"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:193
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:114
 msgid "Not mandatory,"
 msgstr "Facultatif,"
 
@@ -13419,8 +13728,8 @@ msgstr "Pas en prêt"
 msgid "Not on issue."
 msgstr "Pas en prêt"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:112
 msgid "Not repeatable,"
 msgstr "Non répétable"
 
@@ -13428,9 +13737,9 @@ msgstr "Non répétable"
 msgid "Not seen since:"
 msgstr "Pas vu depuis : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:289
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:287
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:71
 msgid "Note"
 msgstr "Note"
 
@@ -13471,13 +13780,16 @@ msgstr ""
 msgid ""
 "Note that, if you choose \"Zebra\", you won't have a working koha, you must "
 "set up zebra first (catalogue search won't work, the rest will)"
-msgstr "Notez que si vous choisissez \"Zebra\", vous n'aurez pas un Koha fonctionnel sans installer Zebra spécifiquement (la recherche dans le catalogue ne fonctionnera pas)"
+msgstr ""
+"Notez que si vous choisissez \"Zebra\", vous n'aurez pas un Koha fonctionnel "
+"sans installer Zebra spécifiquement (la recherche dans le catalogue ne "
+"fonctionnera pas)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:306
 msgid "Note: Subscription is about to expire next issue."
 msgstr "Attention : L'abonnement arrive à expiration au prochain numéro."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:44
 msgid "Note: in the last column, you can choose:"
 msgstr "Remarque : dans la dernière colonne, vous pouvez choisir : "
 
@@ -13488,44 +13800,40 @@ msgstr ""
 "Remarque : vous ne devriez pas avoir de raison de modifier les valeurs par "
 "défaut suivantes"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:274
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:122
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:284
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:206
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:854
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:852
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:273
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:124
 msgid "Notes"
 msgstr "Notes"
 
-#. For the first occurrence,
-#. %1$s: TMPL_VAR name=contnotes
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:165
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:189
-#, c-format
-msgid "Notes %s"
-msgstr "Notes %s"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:86
 msgid "Notes/Comments"
 msgstr "Remarques/Commentaires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:194
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:203
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:187
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:196
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:177
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:185
 msgid "Notes:"
 msgstr "Notes : "
 
@@ -13544,9 +13852,9 @@ msgstr "Aucune réponse"
 msgid "Notice/status triggers"
 msgstr "Déclencheur de notification"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:101
 msgid "Notices"
 msgstr "NotificationsNotes"
 
@@ -13571,9 +13879,11 @@ msgstr "Nouvelles"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:176
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:176
 msgid "November"
 msgstr "Novembre"
 
@@ -13641,28 +13951,28 @@ msgstr "Num/Exempl"
 msgid "Num/Patrons"
 msgstr "N°/Adhérent"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:137
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:202
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1012
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1014
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1016
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Number"
 msgstr "Numéro"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:184
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:183
 msgid "Number Pattern:"
 msgstr "Modèle de numérotation : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:41
 msgid "Number of Columns:"
 msgstr "Nombre de colonnes :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:42
 msgid "Number of Rows:"
 msgstr "Nombre de lignes : "
 
@@ -13671,7 +13981,7 @@ msgid "Number of issues since since the above date :"
 msgstr "Nombre de prêts depuis la date ci-dessus : "
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:245
 msgid "Number of issues:"
 msgstr "Nombre de numéros : "
 
@@ -13679,7 +13989,7 @@ msgstr "Nombre de numéros : "
 msgid "Number of months"
 msgstr "Nombre de mois"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:248
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:247
 msgid "Number of months:"
 msgstr "Nombre de mois : "
 
@@ -13691,19 +14001,19 @@ msgstr "Nombre de n°"
 msgid "Number of weeks"
 msgstr "Nombre de semaines"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:247
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:246
 msgid "Number of weeks:"
 msgstr "Nombre de semaines : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:185
 msgid "Number only"
 msgstr "Nombre seulement"
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:149
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1032
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1034
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1036
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:197
 msgid "Number, Issue"
 msgstr "Numéro, Fascicule"
 
@@ -13716,27 +14026,21 @@ msgstr "Nombre : "
 msgid "Numbered"
 msgstr "Numérotation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1009
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1007
 msgid "Numbering Pattern:"
 msgstr "Modèle de numérotation :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1100
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:250
 msgid "Numbering calculation"
 msgstr "Calcul de la numérotation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1097
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:251
 msgid "Numbering formula:"
 msgstr "Formule de numérotation : "
 
-#. %1$S: type=text name=numberingmethod
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1101
-#, c-format
-msgid "Numbering formula: %S"
-msgstr "Formule de numérotation : %S"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:65
 msgid "OD/Issues"
 msgstr "Retards/Prêts"
@@ -13746,13 +14050,52 @@ msgstr "Retards/Prêts"
 msgid "OFF"
 msgstr "Inactif"
 
-#. INPUT type=button
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:296
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:107
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:151
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:171
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:267
+#. INPUT type=submit name=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:606
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:307
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:427
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:307
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:307
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:605
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:134
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:183
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:237
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:222
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:137
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:160
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:60
@@ -13760,87 +14103,46 @@ msgstr "Inactif"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:129
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:142
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:175
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:149
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:166
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:55
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:109
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:258
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:159
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:127
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:126
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:259
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:141
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:174
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:183
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:237
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:307
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:251
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:427
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:606
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:605
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:307
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:307
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:129
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:142
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:59
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:273
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:275
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:236
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:280
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:188
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:282
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:240
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:254
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:261
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:297
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:62
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:13
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:42
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:12
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:282
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:240
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:273
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:275
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:280
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:236
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:294
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:88
 msgid "OK"
 msgstr "OK"
 
@@ -13854,7 +14156,7 @@ msgstr "OK, Aperçu du bordereau de circulation"
 msgid "ON"
 msgstr "Actif"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:527
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:522
 msgid "OPAC Login:"
 msgstr "Identifiant OPAC :"
 
@@ -13862,7 +14164,7 @@ msgstr "Identifiant OPAC :"
 msgid "OPAC and Koha News"
 msgstr "Annonces OPAC et KOHA"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:520
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:515
 msgid "OPAC login"
 msgstr "Identifiant OPAC "
 
@@ -13870,7 +14172,7 @@ msgstr "Identifiant OPAC "
 msgid "OPAC login:"
 msgstr "Identifiant OPAC : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:505
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:500
 msgid "OPAC note:"
 msgstr "Note à l'OPAC :"
 
@@ -13896,15 +14198,17 @@ msgstr "Objet"
 msgid "Oct"
 msgstr "Oct"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:175
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:175
 msgid "October"
 msgstr "Octobre"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:35
 msgid ""
 "Of course, if the ISBN already exists in the active DB, the biblio will be "
 "ignored."
@@ -13913,7 +14217,7 @@ msgstr ""
 "sera ignorée."
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:159
 msgid "Ok"
 msgstr "OK"
 
@@ -13927,29 +14231,25 @@ msgstr "Sur le document"
 
 #. %1$s: TMPL_VAR name=firstname
 #. %2$s: TMPL_VAR name=surname
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:239
 #, c-format
 msgid "On issue to <a1>%s %s</a>"
 msgstr "Prêté à : <a1>%s %s</a>"
 
 #. %1$s: TMPL_VAR name=cardnumber
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:56
 #, c-format
 msgid "On issue to <a1>%s</a>"
 msgstr "Prêté à : <a1>%s</a>"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=onloancount
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:346
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:108
 #, c-format
 msgid "On loan (%s),"
 msgstr "En prêt (%s)"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=orderedcount
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:349
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:111
 #, c-format
 msgid "On order (%s)"
 msgstr "En commande (%s)"
@@ -14018,10 +14318,10 @@ msgstr ""
 "la section Préférences Système du module Paramètres--FAITES-LE AVANT de "
 "créer les budgets)."
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc:1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc:1
 msgid "Online Help"
 msgstr "Aide en ligne"
 
@@ -14069,8 +14369,8 @@ msgstr "Aide en ligne &rsaquo; Périodiques &rsaquo; Numéros  et résumé"
 msgid "Online Help &rsaquo; Serials Subscription Detail"
 msgstr "Aide en ligne &rsaquo; Détails abonnement périodiques "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull-home.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl:2
 msgid "Online Help &rsaquo; Serials Subscriptions"
 msgstr "Aide en ligne &rsaquo; Abonnements périodiques"
 
@@ -14169,35 +14469,35 @@ msgstr "Aide en ligne - pas d'aide disponible"
 msgid "Only 1 MARC tag mapped to items"
 msgstr "1 seul champ MARC relié aux exemplaires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:441
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:442
 msgid "Only items currently available"
 msgstr "Seulement les documents actuellement disponibles"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:328
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:363
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:362
 msgid "Opac's note"
 msgstr "Note à l'OPAC : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1187
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1183
 msgid "Opac's notes"
 msgstr "Note à l'OPAC"
 
 #. %1$s: TMPL_VAR name=ohidden
 #. %2$s: TMPL_VAR name=ihidden
 #. %3$s: TMPL_VAR name=ehidden
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:33
 #, c-format
 msgid "Opac:%s Intranet:%s Editor:%s (see online help)"
 msgstr "Opac : %s Intranet : %s Editeur : %s (voir aide en ligne)"
 
 #. %1$s: TMPL_VAR name=creationdate
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:95
 #, c-format
 msgid "Open On: %s"
 msgstr "Ouvert le %s"
 
 #. %1$s: TMPL_VAR name=creationdate
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:36
 #, c-format
 msgid "Open on %s"
 msgstr "Ouvert le %s"
@@ -14207,12 +14507,12 @@ msgid "Options"
 msgstr "Options"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:59
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:21
 msgid "Order"
 msgstr "Commande"
 
@@ -14220,23 +14520,23 @@ msgstr "Commande"
 msgid "Order Date"
 msgstr "Date de la commande"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:46
 msgid "Order Details"
 msgstr "Détails de la commande"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:86
 msgid "Order by :"
 msgstr "Trié par :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:102
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:100
 msgid "Order cost"
 msgstr "Coût cmd"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:99
 msgid "Order qty"
 msgstr "Qté cmde"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:24
 msgid "Order receive"
 msgstr "Réception de commande"
 
@@ -14246,14 +14546,19 @@ msgid "Order search"
 msgstr "Recherche sur les commandes"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:166
 msgid "Ordering information"
 msgstr "Informations sur les commandes"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:105
 msgid "Ordering prices"
 msgstr "Prix de commande"
 
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:19
+msgid "Orders Search"
+msgstr "Recherche sur les commandes"
+
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=name
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:3
@@ -14263,17 +14568,17 @@ msgstr "Prix de commande"
 msgid "Orders not yet Received for %s"
 msgstr "Commandes en attente pour %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:207
 msgid "Org."
 msgstr "Coll."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:128
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:95
 msgid "Organisation"
 msgstr "Collectivité"
 
@@ -14289,24 +14594,24 @@ msgstr "Nom collectivité"
 msgid "Organisation phone:"
 msgstr "Téléphone collectivité : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:387
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:388
 msgid "Organisation(s):"
 msgstr "Collectivité(s) :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:380
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:381
 msgid "Organisations"
 msgstr "Collectivités"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:44
 msgid "Other"
 msgstr "Autres"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:163
 msgid "Other name:"
 msgstr "Autres noms :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:89
 msgid "Others Options:"
 msgstr "Autres options : "
 
@@ -14314,14 +14619,14 @@ msgstr "Autres options : "
 msgid "Others..."
 msgstr "Autres..."
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:273
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:232
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:268
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:108
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:227
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:271
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:227
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:181
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:273
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:232
 msgid "Output"
 msgstr "Affichage"
 
@@ -14329,7 +14634,7 @@ msgstr "Affichage"
 msgid "Output format"
 msgstr "Format de sortie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:193
 msgid "Overdue"
 msgstr "Retard"
 
@@ -14358,11 +14663,14 @@ msgstr ""
 "Pénalités de retard : elles sont calculées en fonction du type de document "
 "et du type d'adhérent. Ces sommes sont fixées dans cette page."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:113
 msgid "Overdue notice required"
 msgstr "Message de retard demandé"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:158
+msgid "Overdue notice required:"
+msgstr "Message de retard demandé"
+
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:44
 msgid "Overdue rules"
@@ -14379,9 +14687,9 @@ msgid "Overdue!"
 msgstr "Retard !"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:8
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:37
 msgid "Overdues"
 msgstr "Retards"
 
@@ -14399,10 +14707,6 @@ msgstr "Écraser la notice existante avec celle-ci"
 msgid "Owner:"
 msgstr "Propriétaire : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:44
-msgid "P&amp;P"
-msgstr "P&P"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:356
 msgid "P&eacute;riodicit&eacute;"
 msgstr "Périodiques"
@@ -14415,8 +14719,8 @@ msgstr "Périodicité"
 msgid "Page"
 msgstr "Pages"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:30
 msgid "Page Height:"
 msgstr "Hauteur de page : "
 
@@ -14426,11 +14730,12 @@ msgid "Page Type"
 msgstr "Type de page"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:29
 msgid "Page Width:"
 msgstr "Largeur de page : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:114
 msgid "Pages:"
 msgstr "Pages : "
@@ -14439,6 +14744,10 @@ msgstr "Pages : "
 msgid "Paid"
 msgstr "Payé"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:102
+msgid "Paid for:"
+msgstr "Payé pour :"
+
 #. %1$s: TMPL_VAR name=papertype_opt
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl:124
 #, c-format
@@ -14454,9 +14763,8 @@ msgstr "Papier"
 msgid "Parameter Deleted"
 msgstr "Paramètres supprimés"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc:7
 msgid "Parameters"
 msgstr "Paramètres"
 
@@ -14495,8 +14803,6 @@ msgstr "Colis : %s"
 msgid "Pascale Nalon (ENSMP) and Jean Yves Lemaire (Chatel Saint Germain)"
 msgstr "Pascale Nalon (ENSMP) et Jean Yves Lemaire (Chatel Saint Germain)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:151
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:214
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:253
 msgid "Password"
 msgstr "Mot de passe"
@@ -14507,8 +14813,10 @@ msgstr "Mot de passe"
 msgid "Password Updated"
 msgstr "Mot de passe mis à jour"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:214
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:536
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:531
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl:42
 msgid "Password:"
 msgstr "Mot de passe : "
@@ -14522,14 +14830,14 @@ msgstr "<b>Pate Eyler</b> (Kaitiaki de 2002 à 2004)"
 msgid "Patent document"
 msgstr "Brevet"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:50
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:283
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:45
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:283
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:64
 msgid "Patron"
 msgstr "Adhérent"
 
@@ -14538,29 +14846,28 @@ msgstr "Adhérent"
 msgid "Patron <a1>Sort</a>"
 msgstr "Adhérent <a1>trier</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:551
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:546
 msgid "Patron Account Flags"
 msgstr "Statut adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:80
 msgid "Patron Categories"
 msgstr "Catégories adhérent"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:182
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:246
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:249
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:182
 msgid "Patron Category"
 msgstr "Catégorie adhérent"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:179
 msgid "Patron Category Administration"
 msgstr "Gestion des catégories d'adhérents"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:10
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:9
 msgid "Patron Details"
 msgstr "Détails de l'adhérent"
 
@@ -14591,11 +14898,11 @@ msgstr "Recherche d'adhérent : "
 msgid "Patron activity"
 msgstr "Activité de l'adhérent "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:862
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:860
 msgid "Patron alert with"
 msgstr "Alerte adhérent "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:118
 msgid "Patron alert with:"
 msgstr "Alerte adhérent par : "
 
@@ -14603,14 +14910,14 @@ msgstr "Alerte adhérent par : "
 msgid "Patron card has expired or will expire soon."
 msgstr "La carte a expirée ou va bientôt expirer"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:38
 msgid "Patron categories"
 msgstr "Catégories adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:29
 msgid "Patron category"
 msgstr "Catégorie adhérent"
 
@@ -14639,8 +14946,8 @@ msgstr "Cet adhérent a %s document(s) en prêt."
 msgid "Patron has no pending holds."
 msgstr "Cet adhérent n'a pas de réservation en traitementa %s d'amendes."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:729
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:256
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:729
 msgid "Patron has nothing checked out."
 msgstr "Cet adhérent n'a pas de document en prêt."
 
@@ -14649,12 +14956,12 @@ msgid "Patron has nothing on hold."
 msgstr "Cet adhérent n'a pas de réservation"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:270
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:270
 msgid "Patron is restricted"
 msgstr "L'adhérent est suspendu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:70
 msgid "Patron is too young or too old for this category"
 msgstr "Adhérent trop jeune ou trop vieux pour cette catégorie"
 
@@ -14697,8 +15004,8 @@ msgstr "Adhérent champ sort2"
 msgid "Patron status"
 msgstr "Statut adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:7
 msgid "Patron types and categories"
 msgstr "Catégories adhérent"
 
@@ -14733,10 +15040,10 @@ msgstr "La carte d'adhérent est perdue"
 msgid "Patron's record has guaranteed accounts attached."
 msgstr "L'enregistrement de l'adhérent a des comptes-enfant rattachés."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:112
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:138
 msgid "Patron:"
 msgstr "Adhérent : "
 
@@ -14754,22 +15061,22 @@ msgstr "Adhérent : "
 msgid "Patron: <a1> %s, %s (%s) </a> , %s %s %s %s"
 msgstr "Adhérent <a1>%s, %s (%s)</a> %s %s %s %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:6
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:69
 msgid "Patrons"
 msgstr "Adhérents"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:36
 msgid "Patrons and circulation"
 msgstr "Adhérents et circulation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:31
 msgid "Patrons checking out the most"
 msgstr "Adhérents empruntant le plus"
 
@@ -14782,8 +15089,8 @@ msgstr "Statistiques sur les adhérents"
 msgid "Patrons who checked out the most items"
 msgstr "Adhérents ayant emprunté le plus de documents"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:39
 msgid "Patrons who haven't checked out"
 msgstr "Adhérents qui n'empruntent jamais"
 
@@ -14831,14 +15138,14 @@ msgstr "Imprimante"
 msgid "Pending holds as of %s"
 msgstr "Réservations orphelines à compter du %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:41
 msgid "Pending suggestions"
 msgstr "Suggestions en attente"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:27
 msgid "Perform a new search"
 msgstr "Nouvelle recherche"
 
@@ -14871,34 +15178,28 @@ msgstr "version PERL : "
 msgid "Ph: %s"
 msgstr "Tel.: %s"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:59
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:67
 msgid "Phone"
 msgstr "Téléphone"
 
-#. For the first occurrence,
-#. %1$s: TMPL_VAR name=phone
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:144
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:157
-#, c-format
-msgid "Phone %s"
-msgstr "Téléphone %s"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:275
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:303
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:281
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:309
 msgid "Phone (cell):"
 msgstr "Téléphone (portable) :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:285
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:291
 msgid "Phone (home):"
 msgstr "Téléphone (domicile) :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:294
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:300
 msgid "Phone (prof):"
 msgstr "Téléphone (travail) :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:153
 msgid "Phone:"
 msgstr "Téléphone : "
 
@@ -14912,14 +15213,9 @@ msgstr "Téléphone : %s"
 msgid "Physical Address"
 msgstr "Adresse physique"
 
-#. %1$s: TMPL_VAR name=address1
-#. %2$s: TMPL_VAR name=address2
-#. %3$s: TMPL_VAR name=address3
-#. %4$s: TMPL_VAR name=address4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:142
-#, c-format
-msgid "Physical Address %s%s%s%s"
-msgstr "Adresse physique %s %s %s %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:138
+msgid "Physical Address:"
+msgstr "Adresse physique :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:286
 msgid "Pick up Library"
@@ -14938,9 +15234,8 @@ msgid "Pierre"
 msgstr "Pierre"
 
 #
-#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:12
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:268
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:14
 msgid "Place Hold"
 msgstr "Réserver"
 
@@ -14960,6 +15255,7 @@ msgid "Place of Publication:"
 msgstr "Lieu d'édition : "
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:40
 msgid "Place:"
 msgstr "Emplacement : "
@@ -14978,16 +15274,16 @@ msgstr "Prévu pour"
 msgid "Planches"
 msgstr "Planches"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:316
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:315
 msgid "Planned date"
 msgstr "Date prévue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:32
 msgid "Planneddate"
 msgstr "Date prévue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:887
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:890
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:124
 msgid "Planning"
 msgstr "Calendrier"
 
@@ -15008,6 +15304,16 @@ msgstr "Confirmer le prêt"
 msgid "Please Specify a Title"
 msgstr "Précisez un titre SVP"
 
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+msgid "Please check for irregularity by clicking 'Irregularity?'"
+msgstr "Vous devez vérifier les irrégularités en cliquant sur 'Irrégularités?'"
+
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+msgid "Please choose a numbering pattern"
+msgstr "Vous devez choisir une formule de numérotation"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:50
 msgid "Please click Next to continue if this information is correct"
 msgstr "SVP, cliquez sur Suivant pour continuer si les informations sont valides"
@@ -15030,7 +15336,7 @@ msgstr "Merci de contacter votre administrateur système"
 msgid "Please correct these errors and <a1>start the installer</a> again."
 msgstr "Merci de corriger ces erreurs et de <a1>relancer l'installateur</a>."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:428
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:423
 msgid "Please create one"
 msgstr "Prière d'en créer un"
 
@@ -15076,17 +15382,17 @@ msgstr "Merci de retourner l'exemplaire au site d'origine : %s"
 msgid "Please return to %s"
 msgstr "Merci de retourner à %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:93
 msgid "Plugin"
 msgstr "Plugin"
 
 #. %1$s: TMPL_VAR name=value_builder
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:39
 #, c-format
 msgid "Plugin %s"
 msgstr "Plugin : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:128
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:124
 msgid "Plugin:"
 msgstr "Plugin : "
 
@@ -15094,15 +15400,15 @@ msgstr "Plugin : "
 msgid "Poesie"
 msgstr "Poésie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:455
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:457
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:456
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:458
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:197
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:199
 msgid "Popularity (Least to Most)"
 msgstr "Popularité (moins à plus)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:450
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:452
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:451
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:453
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:192
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:194
 msgid "Popularity (Most to Least)"
@@ -15118,8 +15424,8 @@ msgstr "Porcelaine"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:202
-msgid "Port"
-msgstr "Port"
+msgid "Port:"
+msgstr "Port :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:290
 msgid "Portraits"
@@ -15129,21 +15435,17 @@ msgstr "Portraits"
 msgid "Position"
 msgstr "Poste"
 
-#. %1$s: TMPL_VAR name=contpos
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:155
-#, c-format
-msgid "Position %s"
-msgstr "Poste %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:151
+msgid "Position:"
+msgstr "Poste :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:42
 msgid "Postal Address"
 msgstr "Adresse postale"
 
-#. %1$s: TMPL_VAR name=postal
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:140
-#, c-format
-msgid "Postal Address %s"
-msgstr "Adresse postale %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:136
+msgid "Postal Address:"
+msgstr "Adresse postale :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:233
 msgid "Pr&eacute;-scolaire"
@@ -15154,7 +15456,7 @@ msgstr "Pré-scolaire"
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:82
 msgid "Preferred publishers"
 msgstr "Editeurs référencés"
 
@@ -15168,7 +15470,7 @@ msgstr "Aperçu de la liste de circulation"
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:203
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:200
 msgid "Previous Page"
 msgstr "Page précédente"
 
@@ -15176,13 +15478,14 @@ msgstr "Page précédente"
 msgid "Previous checkouts"
 msgstr "Prêts précédents"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:197
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:197
 msgid "Price"
 msgstr "Prix"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc:10
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:46
 msgid "Print"
 msgstr "Imprimer"
 
@@ -15201,17 +15504,13 @@ msgstr "Imprimer un reçu pour %s"
 msgid "Print Type"
 msgstr "Type d'impression"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:135
-msgid "Printer"
-msgstr "Imprimante"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:125
 msgid "Printer Added"
 msgstr "Imprimante ajoutée"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:172
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:164
 msgid "Printer Administration"
 msgstr "Configuration imprimante"
 
@@ -15220,23 +15519,27 @@ msgstr "Configuration imprimante"
 msgid "Printer Configuration"
 msgstr "Configuration imprimante"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:157
 msgid "Printer Deleted"
 msgstr "Imprimante supprimée"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:104
-msgid "Printer Name"
-msgstr "Nom de l'imprimante"
+msgid "Printer Name:"
+msgstr "Nom de l'imprimante :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:4
 msgid "Printer Search:"
 msgstr "Recherche imprimante :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:135
+msgid "Printer:"
+msgstr "Imprimante :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:69
 msgid "Printers"
 msgstr "Imprimantes"
 
@@ -15264,7 +15567,7 @@ msgstr "Imprimantes &rsaquo; Imprimante ajoutée"
 msgid "Printers &rsaquo; Printer Deleted"
 msgstr "Imprimantes &rsaquo; Imprimante supprimée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:102
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:70
 msgid "Printers (UNIX paths)."
 msgstr "Imprimantes (chemin UNIX)"
 
@@ -15281,24 +15584,24 @@ msgstr "Priorité <a1>trier</a>"
 msgid "Priority:"
 msgstr "Priorité :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:182
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:234
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:236
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:44
 msgid "Private"
 msgstr "Privé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:206
 msgid "Prof."
 msgstr "Prof."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:19
 msgid "Professional"
 msgstr "Professionnel"
 
@@ -15315,11 +15618,11 @@ msgid "Programmed texts"
 msgstr "Textes de programmes"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:229
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:183
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:268
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:45
 msgid "Public"
 msgstr "Publique"
 
@@ -15345,7 +15648,7 @@ msgstr "Année de publication"
 msgid "Publication year:"
 msgstr "Année de publication :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:317
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:316
 msgid "Published date"
 msgstr "Publié le"
 
@@ -15355,23 +15658,23 @@ msgstr "Publié le"
 msgid "Published on"
 msgstr "Édité le"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:29
 msgid "Publisheddate"
 msgstr "Publié le"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:50
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:143
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:51
 msgid "Publisher"
 msgstr "Editeur"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=publishercode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:112
 #, c-format
 msgid "Publisher :%s"
 msgstr "Editeur : %s"
@@ -15380,25 +15683,24 @@ msgstr "Editeur : %s"
 msgid "Publisher Location"
 msgstr "Lieu de publication"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:90
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:8
 msgid "Publisher:"
 msgstr "Editeur : "
 
-#. %1$s: TMPL_VAR name=specialty
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:177
-#, c-format
-msgid "Publishers and Imprints %s"
-msgstr "Editeurs et imprimeurs %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:173
+msgid "Publishers and Imprints:"
+msgstr "Editeurs et imprimeurs :"
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:41
 msgid "QTY ordered"
 msgstr "Quantité commandée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:44
 msgid "QTY received"
 msgstr "Quantité reçue"
 
@@ -15406,12 +15708,12 @@ msgstr "Quantité reçue"
 msgid "Qty"
 msgstr "QTé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:55
 msgid "Qty."
 msgstr "QTé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:200
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:199
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -15428,9 +15730,7 @@ msgstr "Quantité reçue"
 msgid "Quantity ordered"
 msgstr "Quantité commandée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:139
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:172
 msgid "Queue"
 msgstr "File d'attente"
 
@@ -15440,6 +15740,11 @@ msgstr "File d'attente"
 msgid "Queue for this item : <b> %s </b>"
 msgstr "Queue pour ce exemplaire : <b>%s</b>"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:139
+msgid "Queue:"
+msgstr "File d'attente :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:359
 msgid "Quotidien"
 msgstr "Quotidien"
@@ -15448,19 +15753,18 @@ msgstr "Quotidien"
 msgid "R&eacute;gularit&eacute;"
 msgstr "Toute régularité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:53
 msgid "RRP"
 msgstr "RRP"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:222
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:255
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:59
 msgid "Rank"
 msgstr "Rang"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:161
-msgid "Rank (display order)"
-msgstr "Rang (ordre d'affichage)"
+msgid "Rank (display order):"
+msgstr "Rang (ordre d'affichage) :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:40
 msgid "Rank/Biblioitemnumbers"
@@ -15470,24 +15774,31 @@ msgstr "Rang/Numéro de notice"
 msgid "Rank/Patrons"
 msgstr "Lecteur"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:222
+msgid "Rank:"
+msgstr "Rang :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:325
 msgid "Rapport technique"
 msgstr "Rapport technique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:141
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:135
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:58
 msgid "Rate"
 msgstr "Taux"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:108
+msgid "Rate:"
+msgstr "Taux :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:188
 msgid "Re-sort results"
 msgstr "Trier les réponses"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:30
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc:32
 msgid "Reading Record"
 msgstr "Liste des lecturespour %s %s"
 
@@ -15533,7 +15844,7 @@ msgstr "Récapitulatif de réception pour : %s"
 msgid "Receive"
 msgstr "RecevoirReçu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc:8
 msgid "Receive Parcel"
 msgstr "Réceptionner un colis"
 
@@ -15547,7 +15858,7 @@ msgid "Receive list"
 msgstr "Liste de réception"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:37
 msgid "Receive order"
 msgstr "Réceptionner colis"
 
@@ -15572,6 +15883,15 @@ msgid "Received by: %s"
 msgstr "Réceptionné par : %s"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1175
+msgid "Received issues"
+msgstr "Numéros reçus"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:119
+msgid "Recieve"
+msgstr "Recevoir"
+
+#
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull-home.tmpl:13
 msgid ""
 "Recieve any item and/or manage what appears in subscription summary (in OPAC "
@@ -15581,15 +15901,14 @@ msgstr ""
 "l'abonnement (à l'OPAC et dans l'interface bibliothècaire)"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:102
 msgid "Recieved cost"
 msgstr "Coût reçufactur"
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:324
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1179
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:360
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:359
 msgid "Recieved issues"
 msgstr "Numéros reçus : "
 
@@ -15598,11 +15917,6 @@ msgstr "Numéros reçus : "
 msgid "Recieved on"
 msgstr "Livré le"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:103
-msgid "Recieved qty"
-msgstr "Qté recue"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tmpl:14
 msgid ""
 "Records are downloaded to the workstation that requests the export and are "
@@ -15649,14 +15963,14 @@ msgstr "Rejeter"
 msgid "Rejected suggestion"
 msgstr "Suggestions rejetées"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:290
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:292
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:234
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:236
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:290
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:292
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:290
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:292
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:290
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:292
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:234
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:236
 msgid "Related record not required"
 msgstr "Notice lien non requise"
 
@@ -15669,7 +15983,7 @@ msgid "Remember due date for this patron"
 msgstr "Conserver la date de retour pour cet emprunteur"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:880
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:879
 msgid ""
 "Remember you <b>must</b> have created a biblio <b>before</b> creating a "
 "subscription"
@@ -15677,17 +15991,21 @@ msgstr ""
 "N'oubliez pas que vous <b>devez</b> avoir créé une notice biblio<b>avant</b> "
 "de créer un abonnement"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:155
+msgid "Remote image:"
+msgstr "Image distante :"
+
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:142
 msgid "Remove"
 msgstr "Valider"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:162
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:164
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:198
 msgid "Renew"
 msgstr "Renouvellement"
 
@@ -15727,15 +16045,19 @@ msgstr "Renouveler le(s) document(s) coché(s)"
 msgid "Renew?"
 msgstr "Renouvellement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:274
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:238
 msgid "Renewable"
 msgstr "Renouvelable"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:210
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:218
 msgid "Renewals"
 msgstr "Renouvellements"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:185
+msgid "Renewals:"
+msgstr "Renouvellements :"
+
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl:28
 msgid ""
@@ -15751,21 +16073,29 @@ msgstr ""
 "être gérée par la/le bibliothécaire qui commande les livres, comme n'importe "
 "quelle autre commande (= budget et fournisseur sont définis ici)."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:218
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:255
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:219
 msgid "Rental charge"
 msgstr "Coût du prêt"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:77
 msgid "Rental charge is not a number"
 msgstr "Le prix de location n'est pas un nombre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:177
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:104
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:189
+msgid "Rental charge:"
+msgstr "Coût du prêt :"
+
+#. A
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:527
+msgid "Repeat this Tag"
+msgstr "Répéter ce champ"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:171
 msgid "Repeatable"
 msgstr "Répétable"
 
@@ -15773,11 +16103,12 @@ msgstr "Répétable"
 msgid "Repeatable holiday"
 msgstr "Jour férié répétable"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:112
 msgid "Repeatable,"
 msgstr "Répétable,"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:28
 msgid "Repeatable:"
 msgstr "Répétable : "
@@ -15786,12 +16117,13 @@ msgstr "Répétable : "
 msgid "Repertoire"
 msgstr "Répertoire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:224
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:227
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:223
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:226
 msgid "Replacement Cost"
 msgstr "Coût de remplacement"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:65
 msgid "Replacement Price:"
 msgstr "Prix de remplacement : "
@@ -15800,12 +16132,12 @@ msgstr "Prix de remplacement : "
 msgid "Report tag"
 msgstr "Champ de report"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:13
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:38
 msgid "Reports"
 msgstr "Bilans et statistiques"
 
@@ -15826,11 +16158,7 @@ msgstr "Demander un renouvellement"
 msgid "Requested"
 msgstr "Réservés"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:46
-msgid "Requests"
-msgstr "Réservations"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:194
 msgid "Reservation Fee"
 msgstr "Frais de réservation"
 
@@ -15842,11 +16170,14 @@ msgstr "Echec de la réservation"
 msgid "Reserve Found"
 msgstr "Réservation trouvée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:122
 msgid "Reserve fee"
 msgstr "Droits de réservation"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:159
+msgid "Reserve fee:"
+msgstr "Droits de réservation :"
+
 #. %1$s: TMPL_VAR name=name
 #. %2$s: TMPL_VAR name=borrowernumber
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:23
@@ -15858,7 +16189,7 @@ msgstr "Réservation trouvée pour %s (<a1>%s</a>)."
 msgid "Reserved by"
 msgstr "Réservé par"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:357
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:368
 msgid "Reserves"
 msgstr "Réservations"
 
@@ -15876,11 +16207,16 @@ msgstr "Import réservoir"
 
 #
 #. INPUT type=reset
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:60
 msgid "Reset"
 msgstr "Recharger"
 
+#. INPUT type=submit name=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:117
+msgid "Restore"
+msgstr "Restorer"
+
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:56
 #, c-format
@@ -15900,11 +16236,11 @@ msgstr "Réponses"
 #. %1$s: TMPL_VAR name=from
 #. %2$s: TMPL_VAR name=to
 #. %3$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:47
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:95
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:47
 #, c-format
 msgid "Results %s to %s of %s"
 msgstr "Réponses %s à  %s sur %s"
@@ -15946,9 +16282,9 @@ msgid "Results per page :"
 msgstr "Résultats par page : "
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:199
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:199
 msgid "Return"
 msgstr "Retour"
 
@@ -15958,34 +16294,35 @@ msgid "Return Date"
 msgstr "Date de retour"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:34
 msgid "Return date"
 msgstr "Date de retour"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:116
-msgid "Return to MARC Tag Structure"
-msgstr "Retour structure MARC"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:117
+msgid "Return to MARC Frameworks"
+msgstr "Retourner aux grilles de catalogage"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:191
 msgid "Return to Marc Structure"
 msgstr "Retour structure MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:83
+#. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:20
 msgid "Return to Patron Record"
 msgstr "Retour à la fiche d'adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:224
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:216
 msgid "Return to fund list"
 msgstr "Retour à la liste"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:151
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:176
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:151
 msgid "Returns"
 msgstr "Retours"
 
@@ -16007,7 +16344,7 @@ msgstr "Accueil commentaires"
 msgid "Road Type"
 msgstr "Type de voie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:4
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:4
 msgid "Road Type Search:"
 msgstr "Rechercher le type de voie :"
 
@@ -16022,20 +16359,23 @@ msgstr "Types de voie &rsaquo; Confirmer la suppression du type de voie"
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:105
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:112
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:127
 msgid "Road type"
 msgstr "Type de voie"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:97
+msgid "Road type id :"
+msgstr "Identifiant type de voie :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:101
-msgid "Road type id"
-msgstr "Identifiant type de voie"
+msgid "Road type:"
+msgstr "Type de voie :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:42
 msgid "Road types"
 msgstr "Types de voie"
 
@@ -16046,11 +16386,11 @@ msgstr "Roger Buck"
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Rollover at:"
 msgstr "Retour à : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:224
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:223
 msgid "Rollover:"
 msgstr "Retour : "
 
@@ -16058,7 +16398,7 @@ msgstr "Retour : "
 msgid "Ron Wickersham"
 msgstr "Ron Wickersham"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:131
 msgid "Routing List"
 msgstr "Liste de Circulation"
 
@@ -16066,11 +16406,11 @@ msgstr "Liste de Circulation"
 msgid "Routing list"
 msgstr "Liste de circulation"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:72
 msgid "Row"
 msgstr "Ligne"
 
@@ -16094,7 +16434,7 @@ msgstr "SAN-Ouest Provence"
 msgid "SAN-Ouest Provence (Bruno Toumi &amp; Arnaud Laurin)"
 msgstr "SAN-Ouest Provence (Bruno Toumi &amp; Arnaud Laurin)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:64
 msgid "SUBTOTALS"
 msgstr "SOUS-TOTAUX"
 
@@ -16111,52 +16451,52 @@ msgstr "Sans illustrations"
 msgid "Sans periodicite"
 msgstr "Sans périodicité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:161
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:161
 msgid "Saturday"
 msgstr "Samedi"
 
-#. INPUT type=submit name=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:61
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:125
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:203
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:298
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:59
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:326
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:210
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:249
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:326
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:395
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:551
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:119
 msgid "Save"
 msgstr "Valider"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:448
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:470
 msgid "Save Bibliographic Record"
 msgstr "Ajouter notice bibliographique"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:75
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:237
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:121
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:581
+#. INPUT type=button
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:202
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:69
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:575
 msgid "Save Changes"
 msgstr "Valider les modifications"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:72
 msgid "Save Exchange Rate"
 msgstr "Valider le taux de change"
 
@@ -16167,14 +16507,14 @@ msgid "Save Settings"
 msgstr "Valider les réglages"
 
 #. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:253
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:300
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:330
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:253
 msgid "Save changes"
 msgstr "Valider les modifications"
 
 #. INPUT type=button
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1194
 msgid "Save subscription"
 msgstr "Enregistrer abonnement"
 
@@ -16197,33 +16537,35 @@ msgid "Scan a barcode to check in:"
 msgstr "Scanner un code à barre pour le retour"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:25
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:150
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:154
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:520
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:5
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:521
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl:12
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:116
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:12
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:8
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:151
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:28
 msgid "Search Cities"
 msgstr "Recherche commune"
 
@@ -16243,7 +16585,7 @@ msgstr "Recherche des notices existantes"
 msgid "Search For:"
 msgstr "Recherche sur : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:95
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:93
 msgid "Search ISBN or Title:"
 msgstr "Cherche ISBN ou titre :"
 
@@ -16251,6 +16593,10 @@ msgstr "Cherche ISBN ou titre :"
 msgid "Search Notices"
 msgstr "Rechercher notifications"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:28
+msgid "Search Patron Categories"
+msgstr "Chercher catégories d'adhérent"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:33
 msgid "Search Patrons"
 msgstr "Recherche adhérents"
@@ -16264,7 +16610,7 @@ msgstr "Rechercher imprimantesinternet"
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:28
 msgid "Search Road Types"
 msgstr "Rechercher types de voie"
 
@@ -16285,8 +16631,8 @@ msgstr "Rechercher périodiques :"
 msgid "Search Suggestions"
 msgstr "Rechercher suggestions"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:18
 msgid ""
 "Search also : a list of field that Koha will also search on when the user do "
@@ -16295,9 +16641,9 @@ msgstr ""
 "Rechercher aussi : une liste de champs où Koha cherchera aussi quand on fera "
 "une recherche sur le sous-champ"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:30
-msgid "Search also:"
-msgstr "Rechercher aussi : "
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:4
+msgid "Search by Patron Category Name:"
+msgstr "Recherche par catégorie d'adhérent :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:18
 msgid "Search by name or barcode:"
@@ -16307,11 +16653,15 @@ msgstr "Recherche par nom ou code-barre :"
 msgid "Search for"
 msgstr "Recherche sur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:830
+msgid "Search for Biblio"
+msgstr "Rechercher la notice"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:63
 msgid "Search for Serial Routing List"
 msgstr "Recherche d'une liste de circulation de périodique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:153
 msgid "Search for Tag"
 msgstr "Rechercher le champ"
 
@@ -16321,9 +16671,13 @@ msgstr "Rechercher le champ"
 msgid "Search for Value :%S"
 msgstr "Terme de recherche : %S"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:823
+msgid "Search for a Supplier"
+msgstr "Rechercher fournisseur"
+
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull-home.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl:8
 msgid ""
 "Search for a subscription by using the filter button (with a ISSN or a "
 "title). If you enter a title, you can use the wildcard % : entering <b>%Times"
@@ -16351,35 +16705,39 @@ msgstr "Rechercher dans le calendrier le jour que vous voulez définir comme fé
 msgid "Search internet"
 msgstr "Recherche internet"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:38
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:42
 msgid "Search on"
 msgstr "Rechercher"
 
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:114
 #, c-format
 msgid "Search on %s"
 msgstr "Rechercher %s"
 
 #. IMG
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:127
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:194
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:225
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:256
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:287
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:318
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:349
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:380
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:411
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:207
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:237
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:297
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:327
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:357
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:387
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:144
 msgid "Search on <!-- TMPL_VAR name=\"marc_value\" -->"
 msgstr "Autorité numéro <!-- TMPL_VAR name=\"authid\" -->"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:10
+msgid "Search orders:"
+msgstr "Recherche commande :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl:24
 msgid "Search results"
@@ -16389,19 +16747,23 @@ msgstr "Résultats de la recherche"
 msgid "Search supplier for serial subscription"
 msgstr "Recherche fournisseur pour un abonnement à un périodique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:21
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:4
+msgid "Search suppliers:"
+msgstr "Rechercher fournisseurs :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:30
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:30
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:35
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:30
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:29
 msgid "Search the Catalog"
 msgstr "Recherche catalogue"
 
@@ -16410,8 +16772,8 @@ msgid "Search the Catalogue"
 msgstr "Recherche dans le catalogue"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:4
-msgid "Search the catalog:"
-msgstr "Recherche dans le catalogue : "
+msgid "Search the catalog and the reservoir:"
+msgstr "Recherche dans le catalogue et le réservoir :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl:19
 msgid "Search value:"
@@ -16422,12 +16784,12 @@ msgid "Search z390.50 Servers"
 msgstr "Rechercher serveurs Z39.50"
 
 # Recherche:&nbsp;
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:37
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:86
 msgid "Search:&nbsp;"
 msgstr "Chercher"
 
@@ -16439,7 +16801,7 @@ msgid "Searched for %s, %s borrower(s) found:"
 msgstr "Recherche de %s, %s adhérents trouvés :"
 
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:142
 #, c-format
 msgid "Searching: %s"
 msgstr "Recherche : %s"
@@ -16447,14 +16809,14 @@ msgstr "Recherche : %s"
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Season"
 msgstr "Saison"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1037
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1039
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1041
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:204
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:203
 msgid "Seasonal only"
 msgstr "Seulement saisonnier"
 
@@ -16466,16 +16828,12 @@ msgstr "Sebastiaan Durand"
 msgid "Second"
 msgstr "Deuxième"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:118
-msgid "See Also:"
-msgstr "Voir aussi : "
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:173
 msgid "See any subscription attached to this biblio"
 msgstr "Voir les abonnements attachés à ce titre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:49
 msgid "Seen"
 msgstr "Vu"
 
@@ -16484,18 +16842,17 @@ msgstr "Vu"
 msgid "Sel. &amp; close"
 msgstr "Sélect. & Fermer"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:45
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:221
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:121
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl:27
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:221
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -16516,7 +16873,7 @@ msgstr "Sélectionnez un mois :"
 msgid "Select Records to Export"
 msgstr "Sélectionnez les notices à exporter :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:124
 msgid "Select a Category type"
 msgstr "Sélectionnez un type de catégorie"
 
@@ -16545,13 +16902,13 @@ msgstr "Sélection d'un site : "
 msgid "Select a branch:"
 msgstr "Sélectionnez un site :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:243
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:249
 msgid "Select a city:"
 msgstr "Sélectionnez une commune :"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:32
 msgid ""
 "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."
@@ -16559,8 +16916,8 @@ msgstr ""
 "Sélectionner un fichier à importer dans le réservoir.Il sera analysé, et "
 "pour chaque ISBN trouvé, une nouvelle notice sera créée dans le réservoir."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:32
 msgid "Select a library :"
 msgstr "Sélection d'un site : "
 
@@ -16576,7 +16933,7 @@ msgstr "Sélectionnez un lecteur :"
 msgid "Select a supplier"
 msgstr "Sélectionnez un fournisseur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:154
 msgid "Select an authority framework"
 msgstr "Sélectionner une grille d'autorité"
 
@@ -16592,8 +16949,8 @@ msgstr "Sélectionnez des adhérents ou entrer les noms à la main"
 msgid "Select how many columns and rows are in your page type."
 msgstr "Entrez le nombre de colonnes et de lignes dans votre page"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:19
 msgid "Select items you want to check"
 msgstr "Sélectionnez les exemplaires que vous souhaitez vérifier"
 
@@ -16609,8 +16966,8 @@ msgstr "Sélectionner les abonnements qui vont expirer"
 msgid "Select remote databases:"
 msgstr "Retirer des bases de données : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:40
 msgid "Select the file to import:"
 msgstr "Sélectionnez le fichier à importer : "
 
@@ -16638,18 +16995,20 @@ msgstr "Envoyer la lettre"
 msgid "Sep"
 msgstr "Sept"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:174
+#. For the first occurrence,
+#. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:174
 msgid "September"
 msgstr "Septembre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:130
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:164
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:166
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:205
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:207
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl:28
 msgid "Serial"
 msgstr "Périodique"
 
@@ -16674,7 +17033,7 @@ msgid "Serial collection"
 msgstr "Etat de collection"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:312
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:311
 msgid "Serial issues"
 msgstr "Parutions du périodique"
 
@@ -16693,10 +17052,10 @@ msgid "Serial search results"
 msgstr "Résultats de recherche de périodiques"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:34
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:12
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:12
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:34
 msgid "Serials"
 msgstr "Périodiques"
 
@@ -16717,27 +17076,27 @@ msgstr "Aide de ajout et modification d'abonnement"
 msgid "Serials subscription detail help"
 msgstr "Aide de détail des abonnements périodiques"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull-home.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/bull-home.tmpl:7
 msgid "Serials subscription help"
 msgstr "Aide de abonnement périodiques"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:60
 msgid "Serials subscriptions"
 msgstr "Abonnements périodiques"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:19
 msgid "Serials updated :"
 msgstr "Abonnement(s) mis à jour :"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:23
 msgid "Serialseq"
 msgstr "Numérotation périodique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:177
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:176
 msgid "Series"
 msgstr "Collections"
 
@@ -16753,8 +17112,8 @@ msgstr "Collections %s"
 msgid "Series Title"
 msgstr "Titre de collection"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl:25
 msgid "Series Title:"
 msgstr "Titre de collection : "
 
@@ -16805,8 +17164,14 @@ msgstr "Définir permissions"
 msgid "Set Privileges for %s, %s"
 msgstr "Déterminer les habilitations de %s, %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1144
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:288
+#. INPUT type=submit name=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:100
+msgid "Set Status"
+msgstr "Positionner statut"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1139
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:287
 msgid "Set back to"
 msgstr "Retourner à"
 
@@ -16834,8 +17199,9 @@ msgstr ""
 "utiliser. Ces paramètres aideront à centrer les codes barres sur les "
 "étiquettes."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:24
 msgid "Set library"
 msgstr "Définir un site"
 
@@ -16849,7 +17215,9 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:31
 #, c-format
 msgid "Set reserve to waiting and transfer book to %s:"
-msgstr "Mettre la réservation à \"mis de coté\" et transférer le livre à <b>%s </b> : "
+msgstr ""
+"Mettre la réservation à \"mis de coté\" et transférer le livre à <b>%s </"
+"b> : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl:28
 msgid "Set result order by"
@@ -16884,20 +17252,20 @@ msgstr "Sexe : "
 msgid "Shelf name"
 msgstr "Nom de l'étagère"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:179
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:230
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:36
 msgid "Shelf name:"
 msgstr "Nom de l'étagère :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:22
 msgid "Shopping Basket"
 msgstr "Panier d'achat"
 
 #. %1$s: TMPL_VAR name=basketno
 #. %2$s: TMPL_VAR name=name
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:30
 #, c-format
 msgid "Shopping Basket %s for <a1>%s</a>"
 msgstr "Panier de commande %s pour <a1>%s</a>"
@@ -16919,15 +17287,22 @@ msgid "Show Biblio"
 msgstr "Voir notice"
 
 #. IMG
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:69
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:179
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:265
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:285
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:469
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:488
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:277
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:895
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1059
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:184
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:111
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:81
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:157
@@ -16937,22 +17312,17 @@ msgstr "Voir notice"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:204
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:176
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:178
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:207
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:108
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:155
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:55
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:137
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:464
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:483
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:69
 msgid "Show Calendar"
 msgstr "Voir calendrier"
 
@@ -16980,6 +17350,10 @@ msgstr "Voir tous les titres commençant par : "
 msgid "Show all subjects beginning with:"
 msgstr "Voir tous les sujets commençant par : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:43
+msgid "Show any items currently issued:"
+msgstr "Vois tous les documents en prêt :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:145
 msgid "Show budgets"
 msgstr "Voir les budgets"
@@ -17001,11 +17375,15 @@ msgstr "Voir les 50 derniers prêts"
 msgid "Since <a1>sort</a>"
 msgstr "Depuis <a1>trier</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:192
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:249
 msgid "Site"
 msgstr "Site"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:192
+msgid "Site:"
+msgstr "Site :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:116
 msgid "Size:"
 msgstr "Taille : "
@@ -17026,14 +17404,18 @@ msgstr "Désolé, ce code à barres est déjà utilisé"
 msgid "Sorry, there is no help available for this topic"
 msgstr "Désolé, aucune aide pour ce sujet"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:437
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:432
 msgid "Sort 1:"
 msgstr "Critère 1 :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:450
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:445
 msgid "Sort 2:"
 msgstr "Critère 2 :"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:46
+msgid "Sort By"
+msgstr "Trié par"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:64
 msgid "Sort by"
 msgstr "Tri par : "
@@ -17042,12 +17424,12 @@ msgstr "Tri par : "
 msgid "Sort by :"
 msgstr "Trié par : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:446
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:447
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:56
 msgid "Sort by:"
 msgstr "Tri par : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:282
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:280
 msgid "Sort field 1"
 msgstr "Champ de tri 1"
 
@@ -17055,7 +17437,7 @@ msgstr "Champ de tri 1"
 msgid "Sort field 1:"
 msgstr "Champ de tri 1 : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:290
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:288
 msgid "Sort field 2"
 msgstr "Champ de tri 2"
 
@@ -17063,15 +17445,15 @@ msgstr "Champ de tri 2"
 msgid "Sort field 2:"
 msgstr "Champ de tri 2 : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:255
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:242
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:209
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:255
 msgid "Sort1"
 msgstr "Critère 1"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:263
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:250
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:217
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:263
 msgid "Sort2"
 msgstr "Critère 2"
 
@@ -17109,7 +17491,7 @@ msgstr "Spécifier une date de retour : "
 msgid "Specimens"
 msgstr "Specimens"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:17
 msgid "Spent"
 msgstr "Dépensé"
@@ -17122,7 +17504,7 @@ msgstr "discours, livres sur CD et cassette"
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Spring"
 msgstr "Printemps"
 
@@ -17132,7 +17514,7 @@ msgstr "Printemps"
 msgid "Standard Number"
 msgstr "Numéro normalisé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:353
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:352
 msgid "Start Date :"
 msgstr "Date de début : "
 
@@ -17147,51 +17529,51 @@ msgstr ""
 "vous voulez. Toutefois, quatre codes ont un sens particulier pour Koha : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:353
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:339
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl:23
 msgid "Start date"
 msgstr "Date de début"
 
 #. %1$s: TMPL_VAR name=dateformat
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:261
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:258
 #, c-format
-msgid "Start date (%s)"
-msgstr "Date de début (%s)"
+msgid "Start date (%s):"
+msgstr "Date de début (%s) :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl:32
 msgid "Start date:"
 msgstr "Date de début : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:239
 msgid "Start printing from Label number:"
 msgstr "Commencer l'impression à l'étiquette numéro : "
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:87
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:91
 msgid "Start search"
 msgstr "Rechercher"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:22
 msgid "Start, receive, or modify any order"
 msgstr "Créer, réceptionner, modifier une commande"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:322
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1167
 msgid "Starting date:"
 msgstr "Date de début : "
 
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:210
 msgid "Starting with:"
 msgstr "Commence par : "
 
@@ -17204,20 +17586,20 @@ msgstr "Etat de collection"
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:20
 msgid "Statistics wizards"
 msgstr "Assistant de bilan"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:235
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:288
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:286
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:118
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:204
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:118
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:318
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:317
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:70
 msgid "Status"
 msgstr "Etat"
@@ -17286,15 +17668,15 @@ msgstr "mots vies &rsaquo supprimer le mot vide '%s' ?"
 msgid "Stop word administration page"
 msgstr "Page de Gestion des mots vides"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:67
 msgid "Stopwords"
 msgstr "Mots vides"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:201
 msgid "Street number:"
 msgstr "Numéro dans la voie :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:205
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:211
 msgid "Street type:"
 msgstr "Type de voie :"
 
@@ -17302,7 +17684,7 @@ msgstr "Type de voie :"
 msgid "Sub-Class"
 msgstr "Sous-classification"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:111
 msgid "SubTotal"
 msgstr "Sous-total"
 
@@ -17310,36 +17692,29 @@ msgstr "Sous-total"
 msgid "Subclass"
 msgstr "sous-classe"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:137
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:91
 msgid "Subfield"
 msgstr "Sous-champ"
 
-#. %1$S: type=text name=tagsubfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:100
-#, c-format
-msgid "Subfield code: %S"
-msgstr "Sous-champ %S"
-
-#. %1$s: TMPL_VAR name=subfieldcode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:98
-#, c-format
-msgid "Subfield code: %s"
-msgstr "Sous-champ %s"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:70
+msgid "Subfield code:"
+msgstr "Sous-champ :"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=tagsubfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:57
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:134
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:56
 #, c-format
 msgid "Subfield: %s"
 msgstr "Sous-champ : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:180
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:173
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:212
 msgid "Subfields"
 msgstr "Sous-champs"
 
@@ -17374,47 +17749,54 @@ msgstr "Résultats de recherche sujet"
 msgid "Subject:"
 msgstr "Sujet : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:174
 msgid "Subjects:"
 msgstr "Sujets : "
 
-#. INPUT type=button
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:215
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:339
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:84
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:244
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:251
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:10
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:9
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:23
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc:25
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:327
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl:84
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl:207
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:244
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:197
 msgid "Submit"
 msgstr "Valider"
 
@@ -17430,7 +17812,7 @@ msgstr "Abonnement périodique<!-- TMPL_VAR name=\"subscriptionid\" -->"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=subscriptionid
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:108
 #, c-format
 msgid "Subscription #%s"
 msgstr "Abonnement N°%s"
@@ -17475,7 +17857,7 @@ msgstr ""
 msgid "Subscription has expired."
 msgstr "L'abonnement a expiré"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:112
 msgid "Subscription information"
 msgstr "Informations sur l'abonnement"
 
@@ -17498,18 +17880,18 @@ msgid "Subscription information for biblio #%s with title : %s"
 msgstr "Information d'abonnement pour notice N°%s titre : %s"
 
 #. %1$s: TMPL_VAR name=subscriptionid
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:817
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:816
 #, c-format
 msgid "Subscription information for subscription #%s"
 msgstr "État de collection pour %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:110
-msgid "Subscription is by its end. It should be renewed now."
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:109
+msgid "Subscription is near its end. It should be renewed now."
 msgstr "L'abonnement va expirer. Il faut le renouveller."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1083
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1081
 msgid "Subscription length"
 msgstr "Durée d'abonnement"
 
@@ -17533,17 +17915,17 @@ msgstr "Abonnement renouvelé"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:315
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:350
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:349
 msgid "Subscription summary"
 msgstr "Récapitulatif de l'abonnement"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc:7
 msgid "Subscription(s)"
 msgstr "Abonnement(s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:56
 msgid "Subtitle"
 msgstr "Sous-titre"
 
@@ -17551,8 +17933,8 @@ msgstr "Sous-titre"
 msgid "Subtitle:"
 msgstr "Sous-titre : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:26
 msgid "Subtotal"
 msgstr "Sous-total"
 
@@ -17579,15 +17961,15 @@ msgstr "Modification réussie %s est maintenant %s"
 msgid "Suggested"
 msgstr "Suggéré"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:23
 msgid "Suggested by"
 msgstr "Suggéré par"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:137
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:22
 msgid "Suggestion"
 msgstr "Suggestion"
 
@@ -17607,17 +17989,16 @@ msgstr "Rechercher suggestions"
 msgid "Sujet d'examen"
 msgstr "Sujet d'examen"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:42
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:226
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:85
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl:85
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:42
 msgid "Summary"
 msgstr "Abrégé"
 
@@ -17629,17 +18010,21 @@ msgstr "Abrégé"
 msgid "Summary for %s %s (%s)"
 msgstr "Résumé pour :  %s %s (%s)"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:193
+msgid "Summary:"
+msgstr "Abrégé :"
+
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Summer"
 msgstr "Été"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:162
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:81
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:162
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -17647,37 +18032,42 @@ msgstr "Dimanche"
 msgid "Sundry"
 msgstr "Divers"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:229
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:229
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:160
 msgid "Supplier"
 msgstr "Fournisseur"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:18
+msgid "Supplier Search"
+msgstr "Recherche fournisseur"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl:20
 msgid "Supplier Search Results"
 msgstr "Résultat de recherche fournisseur"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:171
-msgid "Supplier is"
-msgstr "Le fournisseur est"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:167
+msgid "Supplier is:"
+msgstr "Le fournisseur est :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl:24
 msgid "Supplier name :"
 msgstr "Nom du fournisseur : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:215
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:218
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:214
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:217
 msgid "Supplier price"
 msgstr "Prix fournisseur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:824
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:822
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:32
 msgid "Supplier:"
 msgstr "Fournisseur : "
 
@@ -17685,16 +18075,16 @@ msgstr "Fournisseur : "
 msgid "Support composite"
 msgstr "Support composite"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc:9
 msgid "Surname"
 msgstr "Nom de famille"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:113
 msgid "Surname:"
 msgstr "Nom de famille :"
 
@@ -17718,14 +18108,9 @@ msgstr "Synthèse bibliographique"
 msgid "Synthetique (plastique, vinyle...)"
 msgstr "Synthétique (plastique, vinyle...)"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:15
-msgid "System Administration"
-msgstr "Administration du système"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:15
 msgid "System Preferences"
 msgstr "Préférences système"
 
@@ -17733,9 +18118,9 @@ msgstr "Préférences système"
 msgid "System dpi"
 msgstr "Système DPI"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:63
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:43
 msgid "System preferences"
 msgstr "Préférences système"
 
@@ -17748,46 +18133,46 @@ msgstr "Gestion des préférences système"
 msgid "System preferences administration"
 msgstr "Gestion des préférences système"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:122
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:137
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:27
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:34
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:55
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:126
 msgid "TOTAL"
 msgstr "TOTAL"
 
 #. %1$s: TMPL_VAR name=currency
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:131
 #, c-format
 msgid "TOTAL (%s)"
 msgstr "TOTAL (%s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:110
 msgid "Tab:"
 msgstr "Onglet : %s,"
 
 #. %1$s: TMPL_VAR name=tab
 #. %2$s: TMPL_VAR name=tagsubfield
 #. %3$s: TMPL_VAR name=liblibrarian
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:197
 #, c-format
 msgid "Tab:%s | $%s %s"
 msgstr "Onglet : %s | $%s %s"
 
 #. %1$s: TMPL_VAR name=tab
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:165
 #, c-format
 msgid "Tab:%s,"
 msgstr "Onglet : %s,"
@@ -17800,19 +18185,25 @@ msgstr "Table numérique"
 msgid "Tables Genealogique"
 msgstr "Tables généalogiques"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:89
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:175
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:169
 msgid "Tag"
 msgstr "Champ"
 
 #. %1$s: TMPL_VAR name=tagfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:42
 #, c-format
-msgid "Tag %s"
-msgstr "Champ : %s"
+msgid "Tag %s Subfield Constraints"
+msgstr "Champ %s, sous-champ"
+
+#. %1$s: TMPL_VAR name=tagfield
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:31
+#, c-format
+msgid "Tag %s Subfield Structure"
+msgstr "Champ %s, Structure des souq-champs"
 
 #. %1$s: TMPL_VAR name=tagfield
 #. %2$s: TMPL_VAR name=tagsubfield
@@ -17821,7 +18212,7 @@ msgstr "Champ : %s"
 msgid "Tag %s, Subfield %s"
 msgstr "Champ %s, sous-champ %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:115
 msgid "Tag Deleted"
 msgstr "Champ supprimé"
 
@@ -17829,8 +18220,12 @@ msgstr "Champ supprimé"
 msgid "Tag reported"
 msgstr "Champ reporté"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:118
+msgid "Tag:"
+msgstr "Champ :"
+
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:102
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:103
 #, c-format
 msgid "Tag: %s"
 msgstr "Champ : %s"
@@ -17846,14 +18241,14 @@ msgstr "Code du template"
 
 #. For the first occurrence,
 #. %1$S: type=text name=tmpl_code
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:25
 #, c-format
 msgid "Template Code: %S"
 msgstr "Code du modèle : %S"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:26
 msgid "Template Description:"
 msgstr "Description du modèle : "
 
@@ -17864,8 +18259,8 @@ msgid "Template ID: %s"
 msgstr "Identifiant du modèle : %s"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:22
 msgid "Template Settings"
 msgstr "Calibrage du modèle"
 
@@ -17878,7 +18273,7 @@ msgid "Templates"
 msgstr "Modèles"
 
 #. A
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl:88
 msgid "Term"
 msgstr "Terme"
 
@@ -17894,17 +18289,13 @@ msgstr "Test"
 msgid "Test only :"
 msgstr "Test seulement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:92
 msgid "Text"
 msgstr "Texte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:103
-msgid "Text for OPAC"
-msgstr "Texte pour l'OPAC"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:21
 msgid ""
 "Text for OPAC : what appears before the field in the OPAC. If empty, the "
@@ -17913,16 +18304,13 @@ msgstr ""
 "Texte pour l'OPAC : c'est ce qui apparaît avant le champ à l'OPAC.S'il est "
 "vide, c'est le texte pour les bibliothécaires qui est utilisé  à la place"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:31
 msgid "Text for OPAC:"
 msgstr "Texte à l'OPAC : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:102
-msgid "Text for librarian"
-msgstr "Texte pour le bibliothécaire"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:20
 msgid ""
 "Text for librarian : what appears before the subfield in the librarian "
@@ -17931,15 +18319,16 @@ msgstr ""
 "Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous- "
 "champ dans l'intranet"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:30
 msgid "Text for librarian:"
 msgstr "Texte pour bibliothécaire : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:91
 msgid "Text for librarians"
 msgstr "Texte pour les bibliothécaires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:92
 msgid "Text for opac"
 msgstr "Texte à l'OPAC"
 
@@ -17966,10 +18355,10 @@ msgstr ""
 "indicateurs AVANT et jusqu'à 3 indicateurs APRES chaque sous-champ"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:277
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:276
 msgid ""
 "The 2 following fields are available for your own usage. They can be useful "
-"for stat purposes"
+"for statistical purposes"
 msgstr ""
 "Les deux champs suivants sont disponibles pour votre usage propre. Ils "
 "peuvent servir à des usages statistiques."
@@ -18008,7 +18397,7 @@ msgstr "La définition UNIMARC (partielle) pour l'ISBD est"
 msgid "The barcode was not found"
 msgstr "Le code à barres est inconnu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:134
 msgid ""
 "The biblio.biblionumber and biblioitems.biblioitemnumber fields be mapped to "
 "a MARC subfield,"
@@ -18036,7 +18425,7 @@ msgid ""
 msgstr "Le bouton \"effacer\" efface tous les champs dans le formulaire."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:87
 msgid ""
 "The column <b>Koha field</b> shows that the subfield is linked with a Koha "
 "field. Koha can manage a MARC interface, and a Koha interface. This link "
@@ -18048,7 +18437,7 @@ msgstr ""
 "façon vous pouvez passer du mode MARC au mode non-MARC facilement."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:142
 msgid ""
 "The column Koha field shows that the subfield is linked with a Koha field. "
 "Koha can manage a MARC interface, or a Koha interface. This link ensures "
@@ -18098,7 +18487,7 @@ msgstr ""
 "Les erreurs suivantes se sont produites lors de l'importation de la "
 "structure de la base de données : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:62
 msgid "The following fields are wrong. Please fix it/them"
 msgstr "Le(s) champ(s) suivant(s) es(son)t incorrect(s). Prière de le(s) corriger"
 
@@ -18229,6 +18618,14 @@ msgstr ""
 "abonnement, le 1er numéro est calculé automatiquement.Lorsque vous voulez/ "
 "avez besoin,vous pouvez définir les numéros qui ont un nouveau statut : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:24
+msgid ""
+"The rules are applied from most specific to less specific, the 1st who is "
+"filled :"
+msgstr ""
+"Les règles sont appliquées de la plus spécifique à la plus générale. La "
+"première qui est saisie :"
+
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tmpl:12
 msgid ""
@@ -18253,12 +18650,12 @@ msgstr ""
 "sera reporté dans le 600, 700, 701...selon ce qui aura été coché dans "
 "l'éditeur MARC."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:283
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:281
 msgid "The three latest issues related to this subscription:"
 msgstr "Les trois derniers numéros parus de cet abonnement : "
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:73
 msgid ""
 "The total at the bottom of the page should be within a few cents of the "
 "total for the invoice."
@@ -18276,7 +18673,7 @@ msgstr "Théatre, pièce télévisée"
 msgid "There is more than 1 MARC tag related to items tab (10) : %s"
 msgstr "Il y a plus d'un champ MARC relié à l'onglet des exemplaires (onglet 10) : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:427
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:422
 msgid "There is no category type to add"
 msgstr "Il n'y a pas de catégorie. pour ajouter"
 
@@ -18284,12 +18681,12 @@ msgstr "Il n'y a pas de catégorie. pour ajouter"
 msgid "There is no overdue for today"
 msgstr "Il n'y a pas de retards pour votre site aujourd'hui"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:92
 msgid "Thesaurus"
 msgstr "Thésaurus"
 
 #. %1$s: TMPL_VAR name=frameworkcode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:38
 #, c-format
 msgid "Thesaurus %s"
 msgstr "Thésaurus %s"
@@ -18332,23 +18729,23 @@ msgid "This borrower has %s overdue(s) items"
 msgstr "Cet adhérent a %s document(s) en retard"
 
 #. %1$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:150
 #, c-format
 msgid "This category is used %s times. Deletion not possible"
 msgstr "Cet enregistrement est utilisé %s fois. Suppression impossible"
 
 #. %1$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:141
 #, c-format
 msgid "This currency is used %s times. Deletion not possible"
 msgstr "Cet enregistrement est utilisé %s fois. Suppression impossible"
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:17
 msgid "This error means that the link was broken and that the page doesn't exist"
 msgstr "Cette erreur signifie que le lien a été rompu et que la page n'existe plus"
 
@@ -18413,7 +18810,7 @@ msgstr ""
 "C'est un lien terme-à-terme.Autrement dit un sous champ MARC ne peut être "
 "lié à une et une seule colonne d'une table Koha."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:278
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:276
 msgid "This is a serial subscription"
 msgstr "Ceci est un abonnement de périodique"
 
@@ -18563,13 +18960,13 @@ msgid "This record is used %s times"
 msgstr "Cette notice est utilisée %s fois"
 
 #. %1$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:244
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:208
 #, c-format
 msgid "This record is used %s times. Deletion is not possible."
 msgstr "Cette notice est utilisé %s fois. Suppression impossible"
 
 #. %1$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:118
 #, c-format
 msgid "This record is used %s times. Impossible to delete it"
 msgstr "Cette notice est utilisée %s fois. Suppression impossible"
@@ -18583,8 +18980,8 @@ msgid "This screen shows the information associated with a given patron."
 msgstr "Cette page affiche les informations concernant un adhérent donné."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:141
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:86
 msgid ""
 "This screen shows the subfields associated with the selected tag. You can "
 "edit subfields or add a new one by clicking on edit."
@@ -18620,10 +19017,10 @@ msgstr ""
 "Cela changera la vedette-sujet dans toutes les notices où ce sujet est "
 "utilisé."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:159
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -18631,71 +19028,72 @@ msgstr "Jeudi"
 msgid "Tirage photographique"
 msgstr "Tirage photographique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:27
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:125
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:128
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:265
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:59
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:136
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:127
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:154
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:641
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:740
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:250
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl:50
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:45
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:193
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:266
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:80
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:161
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:121
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:193
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:266
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:641
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:740
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:250
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:20
 msgid "Title"
 msgstr "Titre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:505
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:507
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:506
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:508
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:247
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:249
 msgid "Title (A-Z)"
 msgstr "Titre (A-Z)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:510
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:512
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:511
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:513
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:252
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:254
 msgid "Title (Z-A)"
@@ -18720,15 +19118,20 @@ msgstr "Titre <a1>trier</a>"
 msgid "Title Phrase"
 msgstr "Expression titre"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:53
+msgid "Title desc"
+msgstr "Titre desc"
+
 #. %1$s: TMPL_VAR name=title
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl:25
 #, c-format
 msgid "Title%s"
 msgstr "Titre %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc:5
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc:13
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:103
 msgid "Title:"
 msgstr "Civilité : "
 
@@ -18744,20 +19147,20 @@ msgstr "Titre : %s"
 msgid "Title: *"
 msgstr "Titre : *"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:69
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:183
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:203
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:206
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:107
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:183
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:69
 msgid "To"
 msgstr "à"
 
@@ -18796,7 +19199,7 @@ msgstr ""
 "Koha)."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:127
 msgid ""
 "To close off a shopping basket click on \"view shopping baskets\" or search "
 "above, and the click on \"confirm basket\"."
@@ -18804,21 +19207,21 @@ msgstr ""
 "Pour fermer un panier de commande cliquez sur \"voir les paniers de commande "
 "\"ou cherchez au dessus, et cliquez alors sur \"valider le panier\"."
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:268
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:271
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:230
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:274
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:230
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:276
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:235
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:89
 msgid "To file"
 msgstr "Enregistrer"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:125
 msgid ""
 "To order an item you need to establish whether a biblio already exists for "
 "it, and either add an item, or set up a new biblio then add the item."
@@ -18828,7 +19231,7 @@ msgstr ""
 "notice et d'y ajouter l'exemplaire."
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:425
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:415
 msgid ""
 "To perform a z39.50 search, you must enter at least one of the following: \\n"
 "\\n ISBN\\n ISSN\\n Title\\n Author\\n"
@@ -18837,11 +19240,11 @@ msgstr ""
 "titre ou l'auteur."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:18
 #, c-format
 msgid "To report this error, you can <a1>email the Koha Administrator</a>."
 msgstr ""
@@ -18849,20 +19252,20 @@ msgstr ""
 "l'administrateur</a>"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:274
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:266
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:269
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:109
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:272
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl:182
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:274
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:233
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:86
 msgid "To screen into the browser"
 msgstr "A afficher dans le navigateur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:126
 msgid ""
 "To start a new shopping basket with a new supplier return to this page and "
 "just start a new supplier search."
@@ -18870,7 +19273,7 @@ msgstr ""
 "Pour débuter un nouveau panier d'achat chez un autre fournisseur retournez à "
 "cette page et commencez simplement une nouvelle recherche de fournisseur."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:124
 msgid ""
 "To start an acquisition, whether an order, local purchase or donation first "
 "search on the supplier, you will be asked to check their details, and enter "
@@ -18911,10 +19314,10 @@ msgstr "Trop de prêts en cours (prétés / maximum : %s)"
 msgid "Too many holds"
 msgstr "Trop de réservations"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:47
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/header.inc:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:47
 msgid "Tools"
 msgstr "Outils"
 
@@ -18938,31 +19341,37 @@ msgstr "Les %s documents circulant le plus"
 msgid "Top List On Catalogue Checkouts"
 msgstr "Le palmarès des documents les plus empruntés"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc:10
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl:29
 msgid "Top Lists"
 msgstr "Les plus"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:37
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:37
 msgid "Top Page Margin:"
 msgstr "Marge de haut de page : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:107
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:255
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:253
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl:256
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl:47
 msgid "Total"
 msgstr "Total"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl:52
 msgid "Total Due"
 msgstr "Total dû"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:124
+msgid "Total Issues:"
+msgstr "Nombre de prêts :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:24
 msgid "Total cost"
 msgstr "Coût total"
@@ -19041,8 +19450,9 @@ msgstr "Toutes les deux semaines"
 msgid "Traite"
 msgstr "Traité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:122
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:37
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:122
 msgid "Transfer"
 msgstr "Transfert"
 
@@ -19065,9 +19475,9 @@ msgstr "Transféré à : %s"
 msgid "Transfered Items"
 msgstr "Exemplaires transférés"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:66
 msgid "Transfers"
 msgstr "Transferts"
 
@@ -19078,7 +19488,7 @@ msgid "Transfers made TO your library on : %s"
 msgstr "Transferts en cours VERS votre site le : %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:35
 msgid "Transfers to do"
 msgstr "Transferts à effectuer"
 
@@ -19089,7 +19499,7 @@ msgid "Transfers to do %s"
 msgstr "Transferts à effectuer %s"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:36
 msgid "Transfers to receive"
 msgstr "Transfert à recevoir"
 
@@ -19128,24 +19538,22 @@ msgid "Trois fois par semaine"
 msgstr "Trois fois par semaine"
 
 #. INPUT type=checkbox name=select_display
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:160
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:161
 msgid "True"
 msgstr "Vrai"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:157
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:157
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:143
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:181
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:188
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl:28
 msgid "Type"
 msgstr "Type"
 
@@ -19157,25 +19565,28 @@ msgstr "Type de publication"
 msgid "Type vid&eacute;o"
 msgstr "Type vidéo"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:142
 msgid "Type:"
 msgstr "Type :"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:172
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:54
 msgid "UNIMARC"
 msgstr "UNIMARC"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:24
 msgid "URL : if checked, the subfield is an URL, and can be clicked"
 msgstr "URL si coché, indique que le champ est une URL valide et peut-être cliquée"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:209
 msgid "URL:"
 msgstr "URL : "
 
@@ -19208,8 +19619,8 @@ msgstr "Prix unitaire"
 msgid "Unit cost"
 msgstr "Coût unitaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl:51
 msgid "Units:"
 msgstr "Unités : "
 
@@ -19219,7 +19630,7 @@ msgstr "Université ORT Uruguay (Ernesto Silva, Andres Tarallo)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:927
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:929
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:136
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:135
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -19244,7 +19655,7 @@ msgid "Unseen since"
 msgstr "Pas vu depuis"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:240
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:230
 msgid "Update"
 msgstr "Valider"
 
@@ -19259,9 +19670,7 @@ msgstr "Mettre à jour le mot de passe pour %s %s"
 msgid "Update report :"
 msgstr "Rapport de mise à jour :"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=name
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:34
 #, c-format
 msgid "Update: %s"
@@ -19275,7 +19684,7 @@ msgstr "Mise à jour réussie"
 msgid "Updating Mysql database"
 msgstr "Mise à jour base mySQL"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:191
 msgid "Upper Age Limit"
 msgstr "Limite d'âge supérieure"
 
@@ -19298,11 +19707,14 @@ msgstr ""
 "d'âge supérieure \"18.\"S'il n'y a pas d'âge limite supérieure, fixez cette "
 "valeur à 99 (la plus grande valeur autorisée)."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:111
 msgid "Upperage limit"
 msgstr "Limite d'âge supérieure"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:156
+msgid "Upperage limit:"
+msgstr "Limite d'âge supérieure :"
+
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:79
 msgid "Use a barcode file"
@@ -19332,18 +19744,18 @@ msgstr ""
 "le code"
 
 #
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl:19
 msgid "Use top menu bar to navigate to another part of Koha."
 msgstr "Utilisez la barre de menu principale pour naviguer à nouveau dans Koha."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:120
 msgid ""
 "Use your reload button [ctrl + r] to get the most recent figures. Committed "
 "figures are approximate only, as exchange rates will affect the amount "
@@ -19362,9 +19774,9 @@ msgid "Used X times"
 msgstr "Utilisé X fois"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:58
 msgid "Used in"
 msgstr "Utilisé"
 
@@ -19372,12 +19784,15 @@ msgstr "Utilisé"
 msgid "User"
 msgstr "Identifiant utilisateur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:145
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:210
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:252
 msgid "Userid"
 msgstr "Identifiant utilisateur"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:210
+msgid "Userid:"
+msgstr "Identifiant :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl:39
 msgid "Username:"
@@ -19420,10 +19835,10 @@ msgstr "Type de la Variable : "
 msgid "Verre"
 msgstr "Verre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:62
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:60
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:64
 msgid "View"
 msgstr "Voir"
 
@@ -19443,13 +19858,13 @@ msgstr "Visualiser le catalogue par type de document"
 msgid "View subscription details"
 msgstr "Voir les détails de l'abonnement"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:45
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:42
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc:2
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:45
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc:42
 msgid "Virtual Shelves"
 msgstr "Étagères virtuelles"
 
@@ -19483,9 +19898,9 @@ msgstr "Vol {X}, N° {Y}"
 msgid "Vol {X}, No {Y}, Issue {Z}"
 msgstr "Vol {X}, N° {Y}, Fascicule {Z}"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:232
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Volume"
 msgstr "Volume"
 
@@ -19498,26 +19913,27 @@ msgid "Volume Info (for serials)"
 msgstr "Infos sur le volume (pour les périodiques)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1027
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1029
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1031
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:194
 msgid "Volume, Issue"
 msgstr "Volume, Fascicule"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1022
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1024
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1026
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:191
 msgid "Volume, Number"
 msgstr "Volume, Numéro"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1017
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1019
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1021
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:189
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:188
 msgid "Volume, Number, Issue"
 msgstr "Volume, Numéro, Fascicule"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:108
 msgid "Volume:"
 msgstr "Volume : "
@@ -19531,14 +19947,14 @@ msgstr ""
 "Attendez que la maintenance soit terminée, ou <a1>envoyez un email à "
 "l'administrateur Koha</a>."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:295
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:293
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:333
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:332
 msgid "Waited"
 msgstr "Attendu"
 
@@ -19549,10 +19965,9 @@ msgstr ""
 "L'état du prochain numéro attendu ne peut-être changé. <a1>Renouveler</"
 "a>votre abonnement"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:50
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:296
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl:50
 msgid "Waiting"
 msgstr "mis de coté"
 
@@ -19576,7 +19991,7 @@ msgstr "Mise en garde"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:142
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:877
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:876
 msgid "Warning:"
 msgstr "Attention : "
 
@@ -19614,32 +20029,32 @@ msgstr "Installateur Web &rsaquo;  Etape 2"
 msgid "Web Installer &rsaquo; Step 3"
 msgstr "Installateur Web &rsaquo;  Etape 3"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:144
+msgid "Web site:"
+msgstr "Site Web :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:50
 msgid "Website"
 msgstr "Site Web"
 
-#. %1$s: TMPL_VAR name=url
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:148
-#, c-format
-msgid "Website %s"
-msgstr "Site Web %s"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:98
 msgid "Website URL:"
 msgstr "URL du site Web : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:158
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl:69
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:158
 msgid "Wednesday"
 msgstr "Mercredi"
 
+#. For the first occurrence,
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:103
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
 msgid "Week"
 msgstr "Semaine"
 
@@ -19663,10 +20078,12 @@ msgstr "Que voulez-vous faire des adhérents supprimés ?"
 msgid ""
 "Whatever you choose now, you can always change your mind and setup the other "
 "version."
-msgstr "Quoi que vous choisissiez maintenant, vous pouvez toujours changer d'avis et mettre en place l'autre version"
+msgstr ""
+"Quoi que vous choisissiez maintenant, vous pouvez toujours changer d'avis et "
+"mettre en place l'autre version"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1132
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:279
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:278
 msgid "When more than"
 msgstr "Quand supérieur à"
 
@@ -19700,7 +20117,11 @@ msgid ""
 "authorized-value category. When the user ask for adding of modifying a "
 "biblio, the subfield is not entered through a free field, but though a list "
 "of authorized values"
-msgstr "Lorsque vous déterminez la structure des sous-champs MARC, vous pouvez lier un sous-champ à une catégorie de valeurs autorisées. Lorsque le bibliothécaire créée une notice, le sous champ n'est plus une zone de saisie libre, mais une liste déroulante."
+msgstr ""
+"Lorsque vous déterminez la structure des sous-champs MARC, vous pouvez lier "
+"un sous-champ à une catégorie de valeurs autorisées. Lorsque le "
+"bibliothécaire créée une notice, le sous champ n'est plus une zone de saisie "
+"libre, mais une liste déroulante."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:122
 msgid ""
@@ -19714,12 +20135,12 @@ msgstr ""
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
 msgid "Winter"
 msgstr "Hiver"
 
 #. %1$s: TMPL_VAR name=framework
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:61
 #, c-format
 msgid "With Framework :%s"
 msgstr "Avec la grille : %s"
@@ -19729,14 +20150,17 @@ msgid "With selected items :"
 msgstr "Supprimer les documents cochés : "
 
 #
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=wthdrawncount
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:347
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:109
 #, c-format
 msgid "Withdrawn (%s),"
 msgstr "Exemplaire retiré (%s),"
 
+#
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:108
+msgid "Withdrawn:"
+msgstr "Exemplaire retiré :"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:922
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:924
 msgid "Without Periodicity"
@@ -19746,7 +20170,7 @@ msgstr "Sans périodicité"
 msgid "Without issues since"
 msgstr "Pas d'emprunt depuis"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:129
 msgid "Without regularity"
 msgstr "Irrégulier"
 
@@ -19757,7 +20181,7 @@ msgstr "Irrégulier"
 msgid "Word"
 msgstr "Mot"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:68
 msgid "Words ignored during search"
 msgstr "Mots ignorés dans la recherche"
 
@@ -19778,64 +20202,62 @@ msgstr "Un système simple de nouvelles  pour les interfaces OPAC et professionn
 msgid "Writeoff"
 msgstr "Pertes et profits"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:107
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:250
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl:109
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:240
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl:284
 msgid "YES"
 msgstr "OUI"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:553
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:234
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:220
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:222
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:261
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:264
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:144
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:220
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:150
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:197
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl:234
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:553
 msgid "Year"
 msgstr "Année"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1042
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1044
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1046
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:201
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:200
 msgid "Year/Number"
 msgstr "Année/Nombre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:99
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:182
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:186
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:188
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:189
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:120
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:159
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:217
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:291
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:183
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:255
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:185
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:208
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:185
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:209
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:556
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:158
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:551
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:178
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:182
 msgid "Yes"
 msgstr "Oui"
 
 #. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl:107
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl:148
 msgid "Yes, Delete"
 msgstr "Oui, supprimer"
@@ -19846,18 +20268,23 @@ msgid "Yes, Delete this Framework!"
 msgstr "Oui, supprimer cette grille!"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:65
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:63
 msgid "Yes, Delete this Subfield"
 msgstr "Oui, supprimer ce sous-champ"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:108
 msgid "Yes, Delete this Tag"
 msgstr "Oui, supprimer ce champ"
 
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:448
+msgid "Yes: Edit existing items"
+msgstr "Oui, éditer exemplaire(s)"
+
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:182
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl:181
 #, c-format
 msgid "You Searched for %s"
 msgstr "Vous recherchiez %s"
@@ -19869,7 +20296,7 @@ msgid "You Searched for <b>%s</b>"
 msgstr "Vous recherchiez <b>%s</b>"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:881
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:880
 msgid "You also must have selected a supplier if you want to ask for late issues"
 msgstr ""
 " Vous devez sélectionner un fournisseur si vous souhaitez réclamer les "
@@ -19935,8 +20362,8 @@ msgstr "Vous pouvez définir autant de types d'autorités que vous le souhaitez.
 msgid "You can define as many itemtypes as you want."
 msgstr "Vous pouvez définir autant de types de document que vous souhaitez."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:9
 msgid ""
 "You can define as the marc tag structure for each biblio framework you have "
@@ -19946,8 +20373,8 @@ msgstr ""
 "catalogage que vous avez spécifiée."
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl:34
 msgid ""
 "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!"
@@ -19976,7 +20403,9 @@ msgstr "Vous n'avez indiqué aucun critère de recherche."
 msgid ""
 "You don't have defined a patron category, or the patron categories don't "
 "need overdue notices."
-msgstr "Vous n'avez pas défini de catégorie de lecteur, ou bien aucune catégorie ne nécessite de notification de retard."
+msgstr ""
+"Vous n'avez pas défini de catégorie de lecteur, ou bien aucune catégorie ne "
+"nécessite de notification de retard."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/import/breeding.tmpl:25
 msgid ""
@@ -19990,7 +20419,7 @@ msgstr ""
 "enregistrement."
 
 #. %1$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:162
 #, c-format
 msgid ""
 "You have %s error(s) in your MARC configuration. Please fix them before "
@@ -20004,29 +20433,32 @@ msgstr ""
 msgid "You have entered a User ID that already exists. Please choose another one."
 msgstr " Vous avez saisi un Identifiant qui existe déjà. Merci d'en choisir un autre."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:24
 #, c-format
-msgid "You must <a1>define a budget</a> in parameters"
+msgid "You must <a1>define a budget</a> in Administration"
 msgstr "Vous devez définir <a1>un budget</a> dans les paramètres"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:19
 msgid "You must create a new group for your item to be added to"
 msgstr "Vous devez créer un nouveau groupe pour y ajouter votre exemplaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:212
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:488
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:404
 msgid "You must either :"
 msgstr "Vous devez soit : "
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl:13
+msgid "You must enter a term to search on"
+msgstr "Vous devez saisir un terme de recherche sur"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl:15
 msgid "You must give the item a barcode"
 msgstr "Vous devez attribuer un code à barres à l'exemplaire"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:174
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:245
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl:168
 #, c-format
 msgid "You searched for %s"
 msgstr "Vous recherchiez %s"
@@ -20040,8 +20472,8 @@ msgstr "Vous recherchiez <b>%s</b>"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=supplier
 #. %2$s: TMPL_VAR name=count
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:19
 #, c-format
 msgid "You searched on <b>supplier %s,</b> %s results found"
 msgstr "Vous recherchiez le <b>fournisseur %s,</b> %s résultat(s) trouvé(s)"
@@ -20081,11 +20513,6 @@ msgstr ""
 "Votre version de Perl semble obsolète. Merci d'installer une version plus "
 "récente de Perl (au moins 5.006001)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:119
-msgid "Z39.50 Server"
-msgstr "Serveur Z39.50"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:181
 msgid "Z39.50 Server Added"
 msgstr "Serveur Z39.50 ajouté"
@@ -20098,13 +20525,18 @@ msgstr "Serveur Z39.50 supprimé"
 msgid "Z39.50 Server Search:"
 msgstr "Rechercher serveur Z39.50"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:119
+msgid "Z39.50 Server:"
+msgstr "Serveur Z39.50 :"
+
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:242
 msgid "Z39.50 Servers Admininistration"
 msgstr "Gestion des serveurs Z39.50"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl:71
 msgid "Z39.50 servers"
 msgstr "Serveurs Z39.50"
 
@@ -20133,8 +20565,8 @@ msgstr "Version Zebra : "
 msgid "Zip Code"
 msgstr "Code postal"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:233
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:363
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:364
 msgid "Zipcode:"
 msgstr "Code postal :"
 
@@ -20149,11 +20581,11 @@ msgid "[ ? ]"
 msgstr "[ ? ]"
 
 #. A
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:84
 msgid "[ Manage Bookfunds ]"
 msgstr "[Gérer les postes budgétaires]"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl:84
 msgid "[ Manage ]"
 msgstr "[ Géré par ]"
 
@@ -20164,16 +20596,16 @@ msgid "[%s]"
 msgstr "[%s]"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:522
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:523
 msgid "[Fewer Options]"
 msgstr "[Moins d'options]"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:524
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:525
 msgid "[More options]"
 msgstr "Plus d'options"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:526
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:527
 msgid "[New search]"
 msgstr "[Nouvelle recherche]"
 
@@ -20186,110 +20618,110 @@ msgstr ""
 "[xxxFFFSyyy] où xxx représentent 3 caractères AVANT le champ, FFF le numéro "
 "de champ, S le code du sous champ, YYY pour 3 caractères APRES le champ."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:427
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:422
 msgid "a Child"
 msgstr "un enfant"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:427
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:422
 msgid "a professionnal"
 msgstr "un professionnel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:267
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:269
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:211
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:213
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:267
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:269
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:269
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:267
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:269
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:213
 msgid "a- AACR 2"
 msgstr "a- AACR 2"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:171
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:173
 msgid "a- Archival"
 msgstr "a- Archive"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:404
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:406
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:503
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:505
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:404
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:406
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:502
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:504
 msgid "a- Autobiography"
 msgstr "a- autobiographie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:184
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:281
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:283
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:184
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:280
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:282
 msgid "a- Autonomous or semi-autonomous component"
 msgstr "a- composant autonome ou semi-autonome"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:20
 msgid "a- Increase in encoding level"
 msgstr "a- Increase in encoding level"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:16
 msgid "a- Language material"
-msgstr ""
+msgstr "a- Language material"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:53
 msgid "a- Language material (monography)"
 msgstr "a- Language material (monography)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:216
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:218
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:215
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:217
 msgid "a- Microfilm"
 msgstr "a- microfilm"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:124
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:230
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:227
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:229
 msgid "a- Microopaque"
 msgstr "a- microopaque"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:125
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:125
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:125
 msgid "a- Monographic component part"
 msgstr "a- Partie composante d'une monographie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:50
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:154
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:156
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:155
 msgid "a- Preschool"
@@ -20300,20 +20732,20 @@ msgstr "a- Preschool"
 msgid "a- Regular print"
 msgstr "a- Impression normale"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:130
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:130
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:130
 msgid "a- Serial component part"
 msgstr "a- Partie composante d'un périodique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:189
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:133
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:189
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:189
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:191
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:189
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:135
 msgid "a- UCS/Unicode"
 msgstr "a- UCS/Unicode"
 
@@ -20332,8 +20764,8 @@ msgstr "Actif"
 msgid "add"
 msgstr "ajouter"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:36
 msgid "adult"
 msgstr "Adulte"
 
@@ -20341,7 +20773,7 @@ msgstr "Adulte"
 msgid "adulte, haut niveau"
 msgstr "adulte, haut niveau"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:214
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:406
 msgid "again)"
 msgstr "encore)"
 
@@ -20350,23 +20782,23 @@ msgid "all"
 msgstr "tout"
 
 #. %1$s: TMPL_VAR name=marc_value
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:256
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl:237
 #, c-format
 msgid "alt=\"Search on %s\" />"
 msgstr "alt=\"Rechercher sur %s\" />"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:427
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:422
 msgid "an Adult"
 msgstr "un adulte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:427
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:422
 msgid "an Institution"
 msgstr "une institution"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:70
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:23
 msgid "and"
 msgstr "et"
 
@@ -20384,10 +20816,26 @@ msgstr "armoiries"
 msgid "at <i>%s</i>"
 msgstr "à <i>%s</i>"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:127
+msgid "at least 1 branch defined"
+msgstr "Au moins un site existe"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:122
+msgid "at least 1 branch must be defined"
+msgstr "Vous devez créer au moins 1 site"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:115
+msgid "at least 1 item type defined"
+msgstr "Au moins un type de document existe"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:110
+msgid "at least 1 item type must be defined"
+msgstr "Vous devez créer au moins un type de document"
+
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=author
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:111
 #, c-format
 msgid "author :%s"
 msgstr "auteur : %s"
@@ -20415,10 +20863,10 @@ msgstr "Autres"
 msgid "b- B.C. Date"
 msgstr "b- Avant J.C."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:410
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:411
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:509
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:510
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:410
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:411
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:508
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:509
 msgid "b- Individual biography"
@@ -20434,26 +20882,26 @@ msgstr "b- Gros caractères"
 msgid "b- Manuscript language material"
 msgstr "b- Manuscrit"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:118
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:120
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:222
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:224
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:120
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:221
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:223
 msgid "b- Microfiche"
 msgstr "b- microfiche"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:160
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:161
 msgid "b- Primary"
 msgstr "b- primaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:128
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:128
 msgid "b- Serial component part"
 msgstr "b- Partie composante d'un périodique"
@@ -20485,7 +20933,7 @@ msgstr "être relié au même champ,"
 msgid "biblio %s"
 msgstr "notice %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:133
 msgid "biblio and biblionumber"
 msgstr "biblio et biblionumber"
 
@@ -20499,7 +20947,7 @@ msgstr ""
 msgid "biblioitems.itemtype defined"
 msgstr "Biblioitems.itemtype défini"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:139
 msgid "biblionumber and biblioitemnumber mapped correctly"
 msgstr "Biblionumber et biblioitemnumber correctement construits"
 
@@ -20508,15 +20956,25 @@ msgstr "Biblionumber et biblioitemnumber correctement construits"
 msgid "borrower"
 msgstr "adhérent"
 
-#. P
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl:208
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:88
 msgid "branch"
 msgstr "Site"
 
-#. P
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:37
+msgid "branch :"
+msgstr "Site :"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:121
+msgid "branch not defined"
+msgstr "Site non défini"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:73
+msgid "branch selected not allowed."
+msgstr "Le site choisi n'est pas autorisé"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:81
 msgid "budget"
 msgstr "budget"
 
@@ -20527,12 +20985,12 @@ msgstr "par"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=author
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl:139
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl:3
 #, c-format
 msgid "by %s"
 msgstr "par %s"
@@ -20553,37 +21011,37 @@ msgid "c- Braille"
 msgstr "c- Braille"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:133
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:135
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:135
 msgid "c- Collection"
 msgstr "c- Collection"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:415
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:514
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:415
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:513
 msgid "c- Collective biography"
 msgstr "c- biographie collective"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:416
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:515
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:416
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:514
 msgid "c- Collective biographyl"
 msgstr "c- biographie collective"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:324
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:421
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:324
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:420
 msgid "c- Comic strips"
 msgstr "c- bande dessinée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:326
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:423
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:326
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:422
 msgid "c- Comic stripts"
 msgstr "c- bande dessinée"
@@ -20595,43 +21053,43 @@ msgstr "c- bande dessinée"
 msgid "c- Cooperative cataloging program"
 msgstr "c- catalogage collectif"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:26
 msgid "c- Corrected or revised"
 msgstr "c- Corrigé ou révisé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:62
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:166
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:167
 msgid "c- Elementary and junior high"
 msgstr "c- élémentaire ou junior"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:190
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:192
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:287
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:289
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:192
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:286
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:288
 msgid "c- Multilocal"
 msgstr "c- multilocal"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:58
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:58
 msgid "c- Notated music"
 msgstr "c- musique annotée"
 
@@ -20664,8 +21122,8 @@ msgstr "Caractères"
 msgid "check this transfer"
 msgstr "Vérifier ce transfert"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:36
 msgid "child"
 msgstr "enfant"
 
@@ -20679,12 +21137,12 @@ msgid "class"
 msgstr "classe"
 
 #. %1$s: TMPL_VAR name=closedate
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:58
 #, c-format
 msgid "closed on %s <a1>View</a>"
 msgstr "fermé le %s <a1>Visualiser</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl:24
 msgid "coming from"
 msgstr "venant de"
@@ -20694,7 +21152,7 @@ msgstr "venant de"
 msgid "configuration file."
 msgstr "Fichier de configuration."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:214
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl:406
 msgid "confirm it's not a duplicate (and click on"
 msgstr "Confirmer que ce n'est pas un doublon (et cliquer sur"
 
@@ -20702,15 +21160,15 @@ msgstr "Confirmer que ce n'est pas un doublon (et cliquer sur"
 msgid "considered lost"
 msgstr "considéré comme perdu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:78
 msgid "contains"
 msgstr "contient"
 
@@ -20729,10 +21187,10 @@ msgstr "nombre"
 msgid "d&eacute;selectionner tout"
 msgstr "d&eacute;selectionner tout"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:420
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:421
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:519
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:520
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:420
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:421
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:518
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:519
 msgid "d- Contains bibliographic information"
@@ -20743,32 +21201,32 @@ msgstr "d- contient des informations bibliographiques"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:549
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:551
 msgid "d- Dashed-on information omitted"
-msgstr ""
+msgstr "d- Dashed-on information omitted"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:31
 msgid "d- Deleted"
 msgstr "d- supprimé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:330
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:332
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:427
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:429
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:330
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:332
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:426
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:428
 msgid "d- Dramas"
 msgstr "d- drame"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:130
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:234
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:236
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:235
 msgid "d- Large Print"
@@ -20779,14 +21237,14 @@ msgstr "d- gros caractères"
 msgid "d- Loose-leaf"
 msgstr "d- paysage"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:61
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:61
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:63
 msgid "d- Manuscript notated music"
 msgstr "d- musique manuscrite"
 
@@ -20797,10 +21255,10 @@ msgstr "d- musique manuscrite"
 msgid "d- Other"
 msgstr "d- autre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:172
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:173
 msgid "d- Secondary (senior high)"
@@ -20813,17 +21271,17 @@ msgstr "d- universitaire"
 msgid "d- Serial item ceased publication (Dead status)"
 msgstr "d- Périodique mort"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:140
 msgid "d- Subunit"
 msgstr "d- sous-partie"
 
 #. INPUT type=checkbox name=limit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:441
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl:442
 msgid "datedue:0000-00-00"
 msgstr "Date de retour : 0000-00-00"
 
@@ -20843,6 +21301,14 @@ msgstr "Grille MARC par défaut"
 msgid "default branch"
 msgstr "Site par défaut"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:29
+msgid "default branch, default category"
+msgstr "Site par défaut, catégorie par défaut"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:28
+msgid "default branch, same category"
+msgstr "Site par défaut, même catégorie"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:17
 msgid "default fining rules"
 msgstr "règles de retard par défaut"
@@ -20859,18 +21325,10 @@ msgstr "règles de prêt par défaut"
 msgid "default overdue actions"
 msgstr "des règles de retard par défaut"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:112
-msgid "default value"
-msgstr "Valeurs par défaut"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:308
 msgid "del"
 msgstr "sup"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:168
-msgid "delete"
-msgstr "Supprimer"
-
 #. A
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl:58
@@ -20895,7 +21353,7 @@ msgstr "caractères"
 msgid "display detail for this librarian."
 msgstr "afficher les détails pour ce bibliothécaire"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:80
 msgid "display more constraints"
 msgstr "Éditeur des restrictions"
 
@@ -20912,30 +21370,30 @@ msgstr "ne propose pas de serveur z3950 public"
 msgid "doesn't have enough privilege on database"
 msgstr "n'a pas assez de privilèges sur la base de données"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:109
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:120
 msgid "don't include GST"
 msgstr "ne comprend pas la TVA"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:178
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:177
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:179
 msgid "e- Adult"
 msgstr "e- adulte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:68
 msgid "e- Cartographic material"
 msgstr "e- Document cartographique"
 
@@ -20946,19 +21404,15 @@ msgstr "e- Document cartographique"
 msgid "e- Detailed date"
 msgstr "e- date exacte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:337
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:339
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:434
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:436
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:337
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:339
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:433
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:435
 msgid "e- Essays"
 msgstr "e- essais"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl:167
-msgid "edit"
-msgstr "Modifier"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:22
 msgid "eg 1,7,7 = 1 [USD,EUR,etc] fine after 7 days, every 7 days"
 msgstr "= 1 [Eur, USD] d'amende, au bout de 7 jours, par tranche de 7 jours"
@@ -20976,64 +21430,56 @@ msgstr "encyclopédie"
 msgid "enfant"
 msgstr "enfant"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:21
-msgid "eq 21,5 enables 5 issues for 21 days"
-msgstr "autorise 5 prêts pour 21 jours"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl:250
 msgid "everybody"
 msgstr "tout le monde"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:31
-msgid "everywhere"
-msgstr "Partout"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:18
 msgid "exists."
 msgstr "existe."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:73
 msgid "f - Manuscript cartographic material"
 msgstr "f- document cartographique manuscrit"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:240
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:242
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:136
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:241
 msgid "f- Braille"
 msgstr "f- braille"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:196
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:198
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:293
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:295
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:198
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:292
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:294
 msgid "f- Federal/national"
 msgstr "f- fédéral/national"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:344
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:346
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:441
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:443
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:344
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:346
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:440
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:442
 msgid "f- Novels"
 msgstr "f- Nouvelles"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:80
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:184
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:183
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:185
 msgid "f- Specialized"
@@ -21051,14 +21497,9 @@ msgstr "fiction ou vulg. adulte"
 msgid "fiction, roman"
 msgstr "fiction, roman"
 
-#. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-msgid "field marked with * are mandatory"
-msgstr "Les champs notés avec un * sont obligatoires"
-
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl:40
 msgid "filter"
 msgstr "Sélectionner"
 
@@ -21081,7 +21522,7 @@ msgstr "pour"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=name
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:22
 #, c-format
 msgid "for %s"
 msgstr "pour %s"
@@ -21112,7 +21553,7 @@ msgstr "format."
 msgid "formes vari&eacute;es ou autres formes litteraires"
 msgstr "formes variées ou autres formes litteraires"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:145
 msgid "framework values"
 msgstr "valeurs de \"framework\""
 
@@ -21124,28 +21565,28 @@ msgstr "à partir de la notice numéro"
 msgid "from itemcallnumber"
 msgstr "à partir de la cote"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:204
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:204
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:204
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:204
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:148
 msgid "full level"
 msgstr "niveau complet"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:78
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:78
 msgid "g - Projected medium"
 msgstr "g- média projeté"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:189
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:191
 msgid "g- General"
@@ -21166,16 +21607,16 @@ msgstr "aller à <!-- TMPL_VAR name=\"bibliotitle\" -->"
 msgid "gone no adress"
 msgstr "parti sans laisser d'adresse"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:142
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:218
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:146
 msgid "group by"
 msgstr "regroupé par"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:351
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:353
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:448
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:450
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:351
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:353
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:447
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:449
 msgid "h- Humor,satires,etc."
@@ -21185,11 +21626,11 @@ msgstr "h- Humour, satire"
 msgid "has all required privileges on database"
 msgstr "a tous les privilèges nécessaires sur la base"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:94
 msgid "has never been checked out."
 msgstr "n'a jamais été emprunté."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:86
 msgid "hidden"
 msgstr "caché"
 
@@ -21217,8 +21658,8 @@ msgstr ""
 "caché : signifie que le champ est géré, mais PAS affiché à l'opac.C'est en "
 "général pour les champs internes"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:120
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:116
 msgid "hidden,"
 msgstr "caché"
 
@@ -21232,13 +21673,13 @@ msgstr "Site de localisation(holdingbranch)  déterminé"
 
 #. A
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:47
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:33
 msgid "holds to retrieve off the shelf"
 msgstr "Réservations à mettre de coté"
 
 #. A
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:48
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:34
 msgid "holds waiting for patron pickup"
 msgstr "Réservations mis de coté pour : %s"
 
@@ -21254,25 +21695,25 @@ msgstr "Site d'origine (homebranch) non paramétré"
 msgid "homebranch defined"
 msgstr "Site d'origine (homebranch) déterminé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:81
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:81
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:83
 msgid "i - Nonmusical sound recording"
 msgstr "i- enregistrement non musical"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:272
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:274
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:216
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:218
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:272
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:274
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:272
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:274
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:272
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:274
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:218
 msgid "i- ISBD"
 msgstr "i- ISBD"
 
@@ -21283,40 +21724,40 @@ msgstr "i- ISBD"
 msgid "i- Inclusive dates of collection"
 msgstr "i- dates de collection"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:143
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:145
 msgid "i- Integrating resource"
 msgstr "i- Ressource intégrée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:203
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:205
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:300
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:302
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:203
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:205
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:299
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:301
 msgid "i- International intergovernmental"
 msgstr "i- international ou intergouvernemental"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:357
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:359
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:454
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:456
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:357
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:359
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:453
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:455
 msgid "i- Letters"
 msgstr "i- lettres"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:95
 msgid "identity"
 msgstr "Identité personnelle"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:270
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:279
+#. IMG
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:280
 msgid "image"
 msgstr "Image"
 
@@ -21333,32 +21774,32 @@ msgstr "à %s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=LibraryName
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl:25
 #, c-format
 msgid "in %s Catalog."
 msgstr "Dans le catalogue %s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=publicationyear
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:107
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:164
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl:37
 #, c-format
 msgid "in <i>%s</i>"
 msgstr "en <i>%s</i>"
 
 #. %1$s: TMPL_VAR name=publicationyear
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:145
 #, c-format
 msgid "in:%s"
 msgstr "en : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:105
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:108
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl:119
 msgid "include GST"
 msgstr "TVA inclusebudgetée"
 
@@ -21370,7 +21811,7 @@ msgstr "inconnu"
 msgid "index"
 msgstr "index"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1133
 msgid "inner counter"
 msgstr "compteur interne"
 
@@ -21391,8 +21832,8 @@ msgstr "en"
 msgid "invoice, %s"
 msgstr "Facture,  %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:122
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:118
 msgid "is an url,"
 msgstr "est une URL"
 
@@ -21404,15 +21845,15 @@ msgstr "est opérationnel dès que Koha est installé"
 msgid "is complex to configure and administrate"
 msgstr "est complexe à configurer et administrer"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:53
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:65
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:80
 msgid "is exactly"
 msgstr "est exactement"
 
@@ -21421,11 +21862,17 @@ msgid ""
 "is highly scalable (can support easily more than 300 000 items on a public "
 "library with an OPAC widely accessed on the web : see http://catalog.ccfls."
 "org/cgi-bin/koha/opac-main.pl or http://www.mediathequeouestprovence.fr/)"
-msgstr "tient très bien la charge (peut supporter sans peine plus de 300 000 documents d'une lecture publique avec un OPAC accessible sur le web comme  http://catalog.ccfls.org/cgi-bin/koha/opac-main.pl ou http://www.mediathequeouestprovence.fr/)"
+msgstr ""
+"tient très bien la charge (peut supporter sans peine plus de 300 000 "
+"documents d'une lecture publique avec un OPAC accessible sur le web comme  "
+"http://catalog.ccfls.org/cgi-bin/koha/opac-main.pl ou http://www."
+"mediathequeouestprovence.fr/)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl:152
 msgid "is probably not that speedy for catalogue with more than 100 000 items"
-msgstr "n'est probablement pas aussi rapide pour les catalogues avec plus de 100 000 documents"
+msgstr ""
+"n'est probablement pas aussi rapide pour les catalogues avec plus de 100 000 "
+"documents"
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl:128
@@ -21482,6 +21929,10 @@ msgstr ""
 msgid "item fields"
 msgstr "Champs exemplaires"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:109
+msgid "item type not defined"
+msgstr "Type de document non défini"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl:132
 msgid "itemcallnumber"
 msgstr "cote de l'exemplaire"
@@ -21494,8 +21945,8 @@ msgstr "N° "
 msgid "itemnum : the field itemnumber is mapped to a field in tab -1"
 msgstr "Itemnumber : le champ itemnumber est relié à un champ dans l'onglet -1"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:31
 msgid "items beginning at offset"
 msgstr "exemplaires débutant à l'offset"
 
@@ -21507,30 +21958,30 @@ msgstr "type de document"
 msgid "itemtype NOT mapped"
 msgstr "Type de document non paramétré"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:88
 msgid "j - Musical sound recording"
 msgstr "j- Enregistrement musical"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:196
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:195
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:197
 msgid "j- Juvenile"
 msgstr "j- jeunesse"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:363
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:365
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:460
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:462
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:363
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:365
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:459
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:461
 msgid "j- Short stories"
@@ -21540,14 +21991,14 @@ msgstr "j- histoires courtes"
 msgid "jeune adulte"
 msgstr "jeune adulte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:93
 msgid "k - Two-dimensional nonprojectable graphic"
 msgstr "k- image non projetable 2D"
 
@@ -21563,23 +22014,23 @@ msgstr "k- collections"
 msgid "koha.mrc"
 msgstr "koha.mrc"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl:36
 msgid "koha.xml"
 msgstr "koha.xml"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:210
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:212
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:307
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:309
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:212
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:306
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:308
 msgid "l- Local"
 msgstr "l- local"
 
 #. %1$s: TMPL_VAR name=lastreneweddate
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl:73
 #, c-format
 msgid "last on: %s"
 msgstr "dernier prêt le : %s"
@@ -21589,18 +22040,6 @@ msgstr "dernier prêt le : %s"
 msgid "letter"
 msgstr "lettre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:32
-msgid "library * and itemtype *, same patron category"
-msgstr "Même site, même type de document et catégorie d'adhérent *"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:34
-msgid "library * and patron category *, itemtype *"
-msgstr "Même site et même catégorie d'adhérent et type de document*"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:33
-msgid "library * and patron category *, same itemtype"
-msgstr "Même site et même catégorie d'adhérent et type de document*"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:52
 msgid ""
 "link : If you enter a field/subfield here (200b), a little glass appears "
@@ -21625,7 +22064,7 @@ msgstr "hôte local"
 msgid "location selected"
 msgstr "Localisation sélectionnée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:64
 msgid "login/password already exist"
 msgstr "Identifiant/mot de passe existant déjà"
 
@@ -21633,30 +22072,30 @@ msgstr "Identifiant/mot de passe existant déjà"
 msgid "lost"
 msgstr "carte perdue"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:98
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:98
 msgid "m - Computer file"
 msgstr "m- Fichier informatique"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:369
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:371
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:466
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:468
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:369
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:371
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:465
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:467
 msgid "m- Mixed forms"
 msgstr "m- mélanges"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:150
 msgid "m- Monograph/item"
@@ -21669,10 +22108,10 @@ msgstr "m- monographie"
 msgid "m- Multiple dates"
 msgstr "m- dates multiples"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:217
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:219
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:314
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:316
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:217
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:219
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:313
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:315
 msgid "m- Multistate"
@@ -21754,7 +22193,7 @@ msgstr ""
 msgid "member %s"
 msgstr "adhérent %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:62
 msgid "modify"
 msgstr "modifier"
 
@@ -21782,34 +22221,24 @@ msgstr "doit avoir les droits USAGE, INSERT, UPDATE, DELETE, DROP et CREATE sur"
 msgid "n- Dates unknown"
 msgstr "u- dates inconnues"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:34
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:34
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:36
 msgid "n- New"
 msgstr "n- Nouveau"
 
-#. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-msgid "need to check for irregularity by clicking 'Irregularity?'"
-msgstr "Vous devez vérifier les irrégularités en cliquant sur 'Irrégularités?'"
-
-#. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
-msgid "need to choose a numbering pattern"
-msgstr "Vous devez choisir une formule de numérotation"
-
 #. INPUT type=image
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:145
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:223
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:141
 msgid "next"
 msgstr "suivant"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:154
 msgid "no NULL value in frameworkcode"
 msgstr "Pas de valeur NULL dans le \"frameworkcode\""
 
@@ -21837,31 +22266,31 @@ msgstr "Pas de '%s' format"
 msgid "not seen since"
 msgstr "pas vu depuis"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:103
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:103
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:101
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:103
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:101
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:103
 msgid "o - Kit"
 msgstr "o- Kit"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:568
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:567
 msgid "o- Completely romainzed/printed cards romanized"
-msgstr ""
+msgstr "o- Completely romainzed/printed cards romanized"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:570
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:569
 msgid "o- Completely romanized/printed cards romanized"
-msgstr ""
+msgstr "o- Completely romanized/printed cards romanized"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:223
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:225
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:320
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:322
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:223
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:225
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:319
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:321
 msgid "o- Government publication - level undetermined"
@@ -21919,8 +22348,8 @@ msgstr "sur le(s) serveur(s)"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:273
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1121
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl:272
 msgid "once every"
 msgstr "Toutes les"
 
@@ -21984,7 +22413,7 @@ msgstr "options >>"
 msgid "or"
 msgstr "ou"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:95
 msgid "or select a pending orders"
 msgstr "ou, selectionner une commande en attente"
 
@@ -21993,8 +22422,8 @@ msgstr "ou, selectionner une commande en attente"
 msgid "order this one !"
 msgstr "commander celui-ci !"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:36
 msgid "organisation"
 msgstr "collectivité"
 
@@ -22011,21 +22440,21 @@ msgstr "règles de retard pour %s"
 msgid "p- Distribution/production date"
 msgstr "p- date de production ou distribution"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:41
 msgid "p- Increase in encoding level from prepublication"
 msgstr "p- Increase in encoding level from prepublication"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:375
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:377
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:472
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:474
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:375
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:377
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:471
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:473
 msgid "p- Poetry"
@@ -22036,10 +22465,10 @@ msgstr "p- poésie"
 #. %2$s: TMPL_VAR name=firstname
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:37
 #, c-format
 msgid "patron %s %s"
 msgstr "adhérent %s %s"
@@ -22063,8 +22492,8 @@ msgstr "Prévu le"
 msgid "plans"
 msgstr "plans"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:27
 msgid ""
 "plugin : means the value is calculated or managed by a plugin. Plugins can "
@@ -22080,8 +22509,8 @@ msgstr ""
 "une aide considérable pour le catalogueur!"
 
 #. INPUT type=image
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:140
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:219
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:136
 msgid "previous"
 msgstr "précédent"
 
@@ -22093,8 +22522,8 @@ msgstr "prix"
 msgid "private"
 msgstr "privé"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl:36
 msgid "professional"
 msgstr "professionnel"
 
@@ -22127,14 +22556,14 @@ msgstr "q- date question"
 msgid "quarter"
 msgstr "trimestre"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:108
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:108
 msgid "r - Three-dimensional artifact or naturally occurring object"
 msgstr "r- artefact 3D"
 
@@ -22143,25 +22572,25 @@ msgstr "r- artefact 3D"
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:561
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:563
 msgid "r- Completely romanized/printed cards in script"
-msgstr ""
+msgstr "r- Completely romanized/printed cards in script"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:142
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:246
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:248
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:245
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:247
 msgid "r- Regular print reproduction"
 msgstr "r- Impression normale"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:295
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:297
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:239
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:295
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:297
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:295
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:297
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:295
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:297
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:241
 msgid "r- Related record required"
 msgstr "r- notice lien requise"
 
@@ -22177,19 +22606,15 @@ msgid "rather than"
 msgstr "plutôt que"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:168
-msgid "records in various format. Choose one)"
+msgid "records in various format. Choose one):"
 msgstr "notices dans divers formats. En choisir un)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl:191
 msgid "rejected."
 msgstr "rejeté."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl:181
-msgid "remote image"
-msgstr "retirer l'image"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl:16
 msgid ""
 "repeatable : wether it can be repeated or not. If it can be repeated, "
@@ -22218,19 +22643,19 @@ msgid "s&eacute;lection au moyen d'une liste de descripteurs"
 msgstr "s&eacute;lection au moyen d'une liste de descripteurs"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:252
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:251
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:253
 msgid "s- Electronic"
 msgstr "s- électroniquec- Collection"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:153
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:155
 msgid "s- Serial"
@@ -22250,44 +22675,34 @@ msgstr "s- résumé"
 msgid "s- Single date"
 msgstr "s- date simple"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:381
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:383
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:478
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:480
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:381
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:383
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:477
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:479
 msgid "s- Speeches"
 msgstr "s- discours"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:229
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:326
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:229
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:325
 msgid "s- State, provincial,territorial,dependent,etc."
 msgstr "s- etat, province, territoire,etc"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:231
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:328
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:231
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:327
 msgid "s- State,provincial,territorial,dependent,etc."
 msgstr "s- etat, province, territoire,etc"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:31
-msgid "same itemtype and patron category, library *"
-msgstr "Même type de document, catégorie d'adhérent et site *"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:29
-msgid "same library and same itemtype, patron category *"
-msgstr "Même site, même type de document et catégorie d'adhérent *"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:29
-msgid "same library and same patron category, itemtype *"
-msgstr "Même site et même catégorie d'adhérent et type de document*"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:27
+msgid "same branch, default category"
+msgstr "Même site, catégorie par défaut"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:30
-msgid "same patron and same itemtype, patron category *"
-msgstr "Même site, même type de document et catégorie d'adhérent *"
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl:26
+msgid "same branch, same category"
+msgstr "Même site, même catégorie"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl:75
 msgid "saved"
@@ -22302,15 +22717,11 @@ msgstr "scolaire"
 msgid "second overdue"
 msgstr "seconde réclamation"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:125
-msgid "select * from marc_biblio where frameworkcode is NULL"
-msgstr "select * from marc_biblio where frameworkcode is NULL"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:147
 msgid "select * from marc_subfield_structure where frameworkcode is NULL"
 msgstr "select * from marc_subfield_structure where frameworkcode is NULL"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:124
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:148
 msgid "select * from marc_tag_structure where frameworkcode is NULL"
 msgstr "select * from marc_tag_structure where frameworkcode is NULL"
 
@@ -22327,6 +22738,7 @@ msgid "set back to"
 msgstr "Retourner à"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl:43
 msgid "show"
 msgstr "afficher"
 
@@ -22334,9 +22746,9 @@ msgstr "afficher"
 msgid "some directions to help you choose:"
 msgstr "Quelques indications pour vous aider à choisir :"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:52
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl:79
 msgid "start by"
 msgstr "commence par"
 
@@ -22357,13 +22769,13 @@ msgstr "statistiques"
 msgid "subclass"
 msgstr "sous-classe"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:110
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:163
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl:108
 msgid "subfield ignored"
 msgstr "sous-champ ignoré"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl:187
 msgid "subfields"
 msgstr "sous-champs"
 
@@ -22372,7 +22784,7 @@ msgid "subscription"
 msgstr "abonnement"
 
 #. A
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl:99
 msgid "subscription detail"
 msgstr "Détail de l'abonnement"
 
@@ -22381,14 +22793,14 @@ msgstr "Détail de l'abonnement"
 msgid "subscription routing list"
 msgstr "liste de circulation de l'abonnement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:113
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:111
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:111
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:113
 msgid "t - Manuscript language material"
 msgstr "t- Manuscrit"
 
@@ -22404,8 +22816,9 @@ msgstr "t- date de publication ou de copyright"
 msgid "t- Text"
 msgstr "t- Texte"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:116
-msgid "tag"
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:415
+msgid "tag "
 msgstr "Champ"
 
 #. For the first occurrence,
@@ -22429,11 +22842,11 @@ msgid "text/html; charset=iso-8859-1"
 msgstr "text/html; charset=iso-8859-1"
 
 #. META http-equiv=Content-Type
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:6
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc:1
+#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc:1
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc:1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc:1
 msgid "text/html; charset=utf-8"
 msgstr "text/html; charset=utf-8"
 
@@ -22477,7 +22890,7 @@ msgstr ""
 msgid "the records this subject is applied to."
 msgstr "Les notices dans lesquelles ce sujet est utilisé."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl:146
 msgid "there is a null value in a frameworkcode. Check the following tables"
 msgstr "Il y a une valeur NULL dans frameworkcode. Vérifier les tables suivantes"
 
@@ -22536,24 +22949,24 @@ msgstr "Tout support"
 
 #. A
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:49
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:35
 msgid "transfers to do from your library"
 msgstr "Transferts à faire depuis votre site"
 
 #. A
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc:7
-#: ../../koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc:51
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl:36
 msgid "transfers to receive at your library"
 msgstr "Transferts en cours vers votre site"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:244
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:246
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:188
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:244
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:244
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:246
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:244
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:190
 msgid "u - Unknown"
 msgstr "u- Inconnu"
 
@@ -22564,31 +22977,31 @@ msgstr "u- Inconnu"
 msgid "u- Serial item status unknown"
 msgstr "u- périodique d'état inconnu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:277
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:279
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:221
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:223
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:387
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:389
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:484
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:486
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:598
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:600
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:483
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:485
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:597
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:599
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:277
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:279
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:387
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:389
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:277
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:279
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:277
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:279
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:221
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:223
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:483
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:485
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:597
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:599
 msgid "u- Unknown"
 msgstr "u- Inconnu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:235
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:237
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:332
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:334
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:235
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:237
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:331
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:333
 msgid "u- Unknown if item is government publication"
@@ -22599,7 +23012,7 @@ msgstr "u- ne sait pas s'il s'agit d'une publication gouvernementale"
 msgid "u- Unspecified"
 msgstr "u- Indéfini&nb"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:865
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:863
 msgid "un-activated"
 msgstr "pas activé"
 
@@ -22607,7 +23020,7 @@ msgstr "pas activé"
 msgid "user"
 msgstr "utilisateur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:179
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl:176
 msgid "value"
 msgstr "valeur"
 
@@ -22718,51 +23131,57 @@ msgstr "Années d'activité"
 msgid "yesterday"
 msgstr "hier"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:249
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:193
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:249
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:249
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:249
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:193
 msgid "z- Not applicable"
 msgstr "z- non applicable"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:251
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:195
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl:251
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl:195
 msgid "z- Not applicableFull level"
 msgstr "z- non applicable, niveau complet"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:338
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:340
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:243
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl:58
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:338
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:340
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:337
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:339
 msgid "z- Other"
 msgstr "z- autres"
 
 #. INPUT type=button
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:452
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:474
 msgid "z39.50 Search"
 msgstr "Recherche Z39.50"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:89
-msgid "z39.50 Server Added"
-msgstr "Serveur Z39.50 ajouté"
-
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:6
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:90
-msgid "z39.50 Server Deleted"
-msgstr "Serveur Z39.50 supprimé"
-
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:86
 msgid "z39.50 Servers"
 msgstr "Serveurs Z39.50"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:3
+msgid "z39.50 Servers &rsaquo;"
+msgstr "Serveurs Z39.50 &rsaquo;"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:4
+msgid "z39.50 Servers &rsaquo; Confirm Deletion"
+msgstr "Serveurs z3950 &rsaquo; Confirmer la suppression"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:5
+msgid "z39.50 Servers &rsaquo; z39.50 Server Added"
+msgstr "Serveurs z3950 &rsaquo; serveur ajouté"
+
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl:6
+msgid "z39.50 Servers &rsaquo; z39.50 Server Deleted"
+msgstr "Serveurs z3950 &rsaquo; Serveur supprimé"
+
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:787
 msgid "{X}/{Y}"
@@ -22774,51 +23193,51 @@ msgid "{Y} {X}"
 msgstr "{Y} {X}"
 
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:197
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:172
 #, c-format
 msgid "| Auth value:%s,"
 msgstr "| Valeur autorisée : %s,"
 
 #. %1$s: TMPL_VAR name=authtypecode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:173
 #, c-format
 msgid "| Authority:%s,"
 msgstr "| Autorité : %s,"
 
 #. %1$s: TMPL_VAR name=kohafield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:166
 #, c-format
 msgid "| Koha field: %s,"
 msgstr "| Champ Koha : %s,"
 
 #. %1$s: TMPL_VAR name=link
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:200
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:175
 #, c-format
 msgid "| Link:%s,"
 msgstr "| Lien : %s,"
 
 #. %1$s: TMPL_VAR name=value_builder
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:199
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:174
 #, c-format
 msgid "| Plugin:%s,"
 msgstr "| Plugin : %s,"
 
 #. %1$s: TMPL_VAR name=seealso
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:194
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl:169
 #, c-format
 msgid "| See Also: %s,"
 msgstr "| Voir aussi : %s,"
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:386
+#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:388
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:172
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:174
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:289
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl:291
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:143
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:145
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:386
-#: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl:388
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:142
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl:385