From 049e6755a8ad19a6ffa47f0a24e0807859d2b9a6 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Wed, 11 Feb 2004 08:57:16 +0000
Subject: [PATCH] synch'ing 2.0.0 branch (RC4 tag) and head

---
 .../default/en/acqui.simple/addbiblio.tmpl    | 148 ++++-
 .../default/en/acqui.simple/addbooks.tmpl     |   8 +-
 .../default/en/acqui.simple/additem.tmpl      |   2 +-
 .../default/en/acqui.simple/isbnsearch.tmpl   |   4 +-
 .../default/en/acqui/acqui-home.tmpl          |  11 +-
 .../default/en/acqui/acquire.tmpl             |   8 +-
 .../default/en/acqui/basket.tmpl              |  16 +-
 .../default/en/acqui/newbasket2.tmpl          |   2 +-
 .../default/en/acqui/newbiblio.tmpl           |  21 +-
 .../intranet-tmpl/default/en/acqui/order.tmpl |   6 +-
 .../default/en/acqui/recieve.tmpl             |   2 +-
 .../default/en/acqui/recieveorder.tmpl        |   2 +-
 .../default/en/acqui/supplier.tmpl            |  16 +-
 koha-tmpl/intranet-tmpl/default/en/auth.tmpl  |   2 +-
 .../default/en/catalogue/MARCdetail.tmpl      |   6 +-
 .../default/en/catalogue/catalogue-home.tmpl  |  12 +-
 .../en/catalogue/cmsdsearchresults.tmpl       |   2 +-
 .../default/en/catalogue/detail-opac.tmpl     |   4 +-
 .../default/en/catalogue/detail.tmpl          |  66 +-
 .../default/en/catalogue/detailprint.tmpl     |  52 ++
 .../default/en/catalogue/moredetail.tmpl      |   6 +-
 .../default/en/catalogue/searchresults.tmpl   |   2 +-
 .../default/en/catalogue/subject.tmpl         |  50 +-
 .../default/en/circ/circulation.tmpl          |  36 +-
 .../intranet-tmpl/default/en/default.tmpl     |   2 +-
 .../default/en/includes/cat-top.inc           |   7 +-
 .../default/en/includes/common-style.css      |  11 +-
 .../default/en/includes/issues-top.inc        |   2 +-
 .../default/en/marcimport/AcceptItemCopy.tmpl |   2 +-
 .../en/marcimport/marcimportdetail.tmpl       |   2 +-
 .../default/en/member-flags.tmpl              |   2 +-
 .../default/en/members/imemberentry.tmpl      |   2 +-
 .../default/en/members/jmemberentry.tmpl      |   2 +-
 .../default/en/members/member-password.tmpl   |   2 +-
 .../default/en/members/member.tmpl            |   2 +-
 .../default/en/members/memberentry.tmpl       |  36 +-
 .../default/en/members/members-home.tmpl      |  16 +-
 .../default/en/members/moremember.tmpl        |  38 +-
 .../default/en/members/readingrec.tmpl        |   2 +-
 .../intranet-tmpl/default/en/modbibitem.tmpl  |   4 +-
 .../intranet-tmpl/default/en/newimember.tmpl  |   2 +-
 .../intranet-tmpl/default/en/newjmember.tmpl  |   2 +-
 .../intranet-tmpl/default/en/newmember.tmpl   |  20 +-
 .../intranet-tmpl/default/en/opac-main.tmpl   | 268 ++++----
 .../default/en/parameters/admin-home.tmpl     |  15 +-
 .../default/en/parameters/aqbudget.tmpl       |   4 +-
 .../en/parameters/authorised_values.tmpl      |   3 +-
 .../default/en/parameters/branches.tmpl       |   5 +-
 .../default/en/parameters/categorie.tmpl      |  35 +-
 .../default/en/parameters/categoryitem.tmpl   |   4 +-
 .../default/en/parameters/charges.tmpl        |   5 +-
 .../default/en/parameters/checkmarc.tmpl      |   2 +-
 .../default/en/parameters/currency.tmpl       |   6 +-
 .../default/en/parameters/itemtypes.tmpl      |  18 +-
 .../default/en/parameters/koha2marclinks.tmpl |   2 +-
 .../parameters/marc_subfields_structure.tmpl  |  13 +-
 .../default/en/parameters/printers.tmpl       |   2 +-
 .../en/parameters/systempreferences.tmpl      |   4 +-
 .../default/en/parameters/thesaurus.tmpl      |  16 +-
 .../default/en/parameters/z3950servers.tmpl   |   4 +-
 .../default/en/reports/reports-home.tmpl      |   3 +-
 .../intranet-tmpl/default/en/request.tmpl     |  16 +-
 .../default/en/search.marc/search.tmpl        |  18 +-
 .../intranet-tmpl/default/en/shelves.tmpl     | 169 +++--
 .../default/en/thesaurus_popup.tmpl           |   3 +
 .../en/value_builder/unimarc_field_105.tmpl   |  48 ++
 koha-tmpl/intranet-tmpl/default/fr/about.tmpl | 102 +++
 .../fr/acqui.simple/addbiblio-nomarc.tmpl     |  55 ++
 .../default/fr/acqui.simple/addbiblio.tmpl    | 475 ++++++++------
 .../default/fr/acqui.simple/addbooks.tmpl     |  44 +-
 .../fr/acqui.simple/additem-nomarc.tmpl       | 210 ++++++
 .../default/fr/acqui.simple/additem.tmpl      |  86 +--
 .../default/fr/acqui.simple/isbnsearch.tmpl   | 133 ++--
 .../default/fr/acqui.simple/marcimport.tmpl   |  60 ++
 .../default/fr/acqui/acqui-home.tmpl          | 123 ++--
 .../default/fr/acqui/acquire.tmpl             | 126 ++--
 .../default/fr/acqui/basket.tmpl              |  66 +-
 .../default/fr/acqui/newbasket.tmpl           |  40 +-
 .../default/fr/acqui/newbasket2.tmpl          |  88 +--
 .../default/fr/acqui/newbiblio.tmpl           | 126 ++--
 .../intranet-tmpl/default/fr/acqui/order.tmpl |  52 +-
 .../default/fr/acqui/recieve.tmpl             |  65 +-
 .../default/fr/acqui/recieveorder.tmpl        |  18 +-
 .../default/fr/acqui/supplier.tmpl            | 129 ++--
 koha-tmpl/intranet-tmpl/default/fr/auth.tmpl  |  49 ++
 .../intranet-tmpl/default/fr/bookcount.tmpl   |  86 ++-
 .../intranet-tmpl/default/fr/boraccount.tmpl  |  44 +-
 .../default/fr/catalogue/MARCdetail.tmpl      | 224 ++++---
 .../default/fr/catalogue/catalogue-home.tmpl  |  89 +--
 .../fr/catalogue/cmsdsearchresults.tmpl       |  21 +-
 .../default/fr/catalogue/detail-opac.tmpl     |  82 ++-
 .../default/fr/catalogue/detail.tmpl          | 190 +++---
 .../default/fr/catalogue/detailprint.tmpl     |  52 ++
 .../default/fr/catalogue/moredetail.tmpl      | 116 ++--
 .../default/fr/catalogue/searchresults.tmpl   | 203 +++---
 .../default/fr/catalogue/subject.tmpl         |  76 ++-
 .../intranet-tmpl/default/fr/charges.tmpl     |  63 +-
 .../default/fr/circ/branchtransfers.tmpl      | 211 +++---
 .../default/fr/circ/circulation.tmpl          | 383 +++++------
 .../default/fr/circ/returns.tmpl              | 315 ++++-----
 .../default/fr/circ/selectbranchprinter.tmpl  |  42 ++
 .../intranet-tmpl/default/fr/default.tmpl     |  39 +-
 .../intranet-tmpl/default/fr/export/marc.tmpl |  15 +
 .../default/fr/import/breeding.tmpl           |  51 +-
 .../default/fr/includes/about-bottom.inc      |   7 +-
 .../default/fr/includes/about-top.inc         |  24 +-
 .../fr/includes/acquisitions-bottom.inc       |  12 +-
 .../default/fr/includes/acquisitions-top.inc  |  16 +-
 .../default/fr/includes/cat-bottom.inc        |   7 +-
 .../default/fr/includes/cat-top.inc           |  25 +-
 .../fr/includes/circulation-bottom.inc        |   8 +-
 .../default/fr/includes/circulation-top.inc   |  19 +-
 .../default/fr/includes/common-style.css      |  15 +-
 .../default/fr/includes/issues-bottom.inc     |   6 +-
 .../default/fr/includes/issues-top.inc        | 607 +++++++++---------
 .../default/fr/includes/members-bottom.inc    |  10 +-
 .../default/fr/includes/members-top.inc       |  91 +++
 .../default/fr/includes/opac-bottom.inc       |   5 +-
 .../default/fr/includes/opac-top.inc          |  38 +-
 .../default/fr/includes/parameters-bottom.inc |   7 +-
 .../default/fr/includes/parameters-top.inc    |  22 +-
 .../default/fr/includes/reports-bottom.inc    |   7 +-
 .../default/fr/includes/reports-top.inc       |  18 +-
 .../default/fr/intranet-main.tmpl             | 281 ++++----
 .../intranet-tmpl/default/fr/mancredit.tmpl   |  54 +-
 .../intranet-tmpl/default/fr/maninvoice.tmpl  |  62 +-
 .../fr/marcimport/AcceptBiblioitem.tmpl       |  59 ++
 .../default/fr/marcimport/AcceptItemCopy.tmpl |  27 +
 .../fr/marcimport/AcceptMarcUpload.tmpl       |  41 ++
 .../fr/marcimport/ListFileRecords.tmpl        |  53 ++
 .../default/fr/marcimport/mainmenu.tmpl       |   7 +
 .../fr/marcimport/marcimportdetail.tmpl       |  61 ++
 .../default/fr/marcimport/uploadmarc.tmpl     |  42 ++
 .../default/fr/member-flags.tmpl              |  28 +
 .../default/fr/members/imemberentry.tmpl      |  76 +--
 .../default/fr/members/jmemberentry.tmpl      |  92 +--
 .../default/fr/members/member-password.tmpl   |  28 +-
 .../default/fr/members/member.tmpl            |  70 +-
 .../default/fr/members/memberentry.tmpl       | 262 ++++----
 .../default/fr/members/members-home.tmpl      |  56 +-
 .../default/fr/members/moremember.tmpl        | 267 ++++----
 .../intranet-tmpl/default/fr/members/pay.tmpl |  67 +-
 .../default/fr/members/readingrec.tmpl        |  57 +-
 .../intranet-tmpl/default/fr/modbib.tmpl      |  46 +-
 .../intranet-tmpl/default/fr/modbibitem.tmpl  |  78 +--
 .../intranet-tmpl/default/fr/moditem.tmpl     |  46 ++
 .../intranet-tmpl/default/fr/modwebsites.tmpl |  51 ++
 .../intranet-tmpl/default/fr/newimember.tmpl  | 192 +++++-
 .../intranet-tmpl/default/fr/newjmember.tmpl  |  85 +++
 .../intranet-tmpl/default/fr/newmember.tmpl   | 170 ++---
 .../intranet-tmpl/default/fr/opac-main.tmpl   | 267 ++++----
 .../intranet-tmpl/default/fr/overdue.tmpl     |  70 +-
 .../default/fr/parameters/admin-home.tmpl     | 119 ++--
 .../default/fr/parameters/aqbookfund.tmpl     | 143 ++---
 .../default/fr/parameters/aqbudget.tmpl       | 174 +++--
 .../fr/parameters/authorised_values.tmpl      | 131 ++--
 .../default/fr/parameters/branches.tmpl       | 336 +++++-----
 .../default/fr/parameters/categorie.tmpl      | 242 +++----
 .../default/fr/parameters/categoryitem.tmpl   | 305 +++++++++
 .../default/fr/parameters/charges.tmpl        |  32 +-
 .../default/fr/parameters/checkmarc.tmpl      | 135 ++--
 .../default/fr/parameters/currency.tmpl       | 126 ++--
 .../default/fr/parameters/itemtypes.tmpl      | 146 +++--
 .../default/fr/parameters/koha2marclinks.tmpl | 140 ++--
 .../parameters/marc_subfields_structure.tmpl  | 191 +++---
 .../fr/parameters/marctagstructure.tmpl       | 163 ++---
 .../default/fr/parameters/printers.tmpl       | 125 ++--
 .../default/fr/parameters/stopwords.tmpl      | 122 ++--
 .../fr/parameters/systempreferences.tmpl      | 139 ++--
 .../default/fr/parameters/thesaurus.tmpl      | 248 ++++---
 .../default/fr/parameters/z3950servers.tmpl   | 214 +++---
 .../intranet-tmpl/default/fr/reports.tmpl     |   8 +
 .../default/fr/reports/reports-home.tmpl      |  15 +-
 .../intranet-tmpl/default/fr/request.tmpl     | 181 +++---
 .../default/fr/reservereport.tmpl             |  29 +
 .../default/fr/search.marc/result.tmpl        | 102 +--
 .../default/fr/search.marc/search.tmpl        |  73 ++-
 .../default/fr/searchheader.tmpl              |   6 +-
 .../intranet-tmpl/default/fr/shelves.tmpl     | 139 ++++
 koha-tmpl/intranet-tmpl/default/fr/stats.tmpl |  33 +
 .../default/fr/thesaurus_popup.tmpl           |  46 +-
 .../default/fr/updatebiblio.tmpl              |  18 +
 .../default/fr/user/userpage.tmpl             | 161 ++---
 .../fr/value_builder/unimarc_field_100.tmpl   |  99 ++-
 .../fr/value_builder/unimarc_field_105.tmpl   |  48 ++
 .../fr/value_builder/unimarc_field_225a.tmpl  |  23 +
 .../fr/value_builder/unimarc_field_60X.tmpl   |  46 +-
 .../fr/value_builder/unimarc_field_700-4.tmpl |  70 +-
 .../unimarc_field_700_701_702.tmpl            |  65 ++
 .../default/fr/z3950/searchresult.tmpl        |  44 ++
 .../opac-tmpl/css/en/images/front-arrow.gif   | Bin 0 -> 294 bytes
 .../css/en/images/front-background-med.gif    | Bin 0 -> 10810 bytes
 .../css/en/images/front-background-small.gif  | Bin 0 -> 1426 bytes
 .../opac-tmpl/css/en/includes/opac-bottom.inc |  14 +
 .../opac-tmpl/css/en/includes/opac-top.inc    |  21 +
 koha-tmpl/opac-tmpl/css/en/includes/opac.css  | 276 ++++++++
 koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl     |  17 +
 koha-tmpl/opac-tmpl/css/en/opac-account.tmpl  |  40 ++
 koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl     |  38 ++
 koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl   |  79 +++
 koha-tmpl/opac-tmpl/css/en/opac-main.tmpl     |  50 ++
 .../opac-tmpl/css/en/opac-moredetail.tmpl     | 106 +++
 koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl  |  85 +++
 koha-tmpl/opac-tmpl/css/en/opac-search.tmpl   |  35 +
 .../opac-tmpl/css/en/opac-searchresults.tmpl  | 150 +++++
 koha-tmpl/opac-tmpl/css/en/opac-user.tmpl     |  99 +++
 .../opac-tmpl/css/en/opac-userupdate.tmpl     |  22 +
 koha-tmpl/opac-tmpl/css/en/subject.tmpl       |  42 ++
 .../opac-tmpl/css/fr/images/front-arrow.gif   | Bin 0 -> 294 bytes
 .../css/fr/images/front-background-med.gif    | Bin 0 -> 10810 bytes
 .../css/fr/images/front-background-small.gif  | Bin 0 -> 1426 bytes
 .../opac-tmpl/css/fr/includes/opac-bottom.inc |  14 +
 .../opac-tmpl/css/fr/includes/opac-top.inc    |  21 +
 koha-tmpl/opac-tmpl/css/fr/includes/opac.css  | 276 ++++++++
 koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl     |  17 +
 koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl  |  40 ++
 koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl     |  38 ++
 koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl   |  79 +++
 koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl     |  50 ++
 .../opac-tmpl/css/fr/opac-moredetail.tmpl     | 106 +++
 koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl  |  85 +++
 koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl   |  35 +
 .../opac-tmpl/css/fr/opac-searchresults.tmpl  | 150 +++++
 koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl     |  99 +++
 .../opac-tmpl/css/fr/opac-userupdate.tmpl     |  22 +
 koha-tmpl/opac-tmpl/css/fr/subject.tmpl       |  42 ++
 .../opac-tmpl/default/en/opac-detail.tmpl     |  51 +-
 koha-tmpl/opac-tmpl/default/en/opac-main.tmpl |   6 +-
 .../default/en/opac-searchresults.tmpl        |   6 +-
 229 files changed, 10228 insertions(+), 5711 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/about.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem-nomarc.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/auth.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/catalogue/detailprint.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptBiblioitem.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptItemCopy.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptMarcUpload.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/marcimport/ListFileRecords.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/marcimport/mainmenu.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/marcimport/marcimportdetail.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/marcimport/uploadmarc.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/member-flags.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/moditem.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/modwebsites.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/newjmember.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reservereport.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/shelves.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/stats.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_105.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_225a.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/fr/z3950/searchresult.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/images/front-arrow.gif
 create mode 100644 koha-tmpl/opac-tmpl/css/en/images/front-background-med.gif
 create mode 100644 koha-tmpl/opac-tmpl/css/en/images/front-background-small.gif
 create mode 100644 koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc
 create mode 100644 koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc
 create mode 100644 koha-tmpl/opac-tmpl/css/en/includes/opac.css
 create mode 100644 koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-account.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/subject.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/images/front-arrow.gif
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/images/front-background-med.gif
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/images/front-background-small.gif
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/includes/opac.css
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/fr/subject.tmpl

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
index da6212090f..45076eea5a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
 <!--STYLE TYPE="text/css" MEDIA=screen>
 	table {	font-family:Arial;
@@ -16,21 +16,25 @@
 	<td>
 	<table width=100% border=0 colspacing=0 cellpadding=0>
 	<tr>
-		<td width=9% align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(1)"><div id="link1">1</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(2)"><div id="link2">2</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(3)"><div id="link3">3</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(4)"><div id="link4">4</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(5)"><div id="link5">5</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(6)"><div id="link6">6</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(7)"><div id="link7">7</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(8)"><div id="link8">8</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(9)"><div id="link9">9</div></a></td>
-		<td width=10% align="center"><input type="hidden" name="op" value="addbiblio">
+		<td width="8" align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(1)"><div id="link1">1</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(2)"><div id="link2">2</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(3)"><div id="link3">3</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(4)"><div id="link4">4</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(5)"><div id="link5">5</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(6)"><div id="link6">6</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(7)"><div id="link7">7</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(8)"><div id="link8">8</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(9)"><div id="link9">9</div></a></td>
+		<td width="20" align="center"><input type="hidden" name="op" value="addbiblio">
 												<input type="hidden" name="addfield_field">
 												<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="oldbiblionumber" -->">
-												<input type="button" value="Add biblio" onClick='Check(this.form)' accesskey="w">
-												<a href="javascript:PopupZ3950()">z3950 search</a>
+												<!-- TMPL_IF name="bibid" -->
+													<input type="button" value="Save" onClick='Check(this.form)' accesskey="w" class="button">
+												<!-- TMPL_ELSE -->
+													<input type="button" value="Add biblio" onClick='Check(this.form)' accesskey="w" class="button">
+												<!-- /TMPL_IF -->
+												<a href="javascript:PopupZ3950()" class="button">z3950 search</a>
 		</td>
 	</tr>
 	</table>
@@ -59,6 +63,17 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				&nbsp;
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(1)">
+					<div id="link1"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
+
 		</table>
 		</DIV>
 
@@ -84,6 +99,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(0)">
+					<div id="link0"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(2)">
+					<div id="link2"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -109,6 +136,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(1)">
+					<div id="link1"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(3)">
+					<div id="link3"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -134,6 +173,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(2)">
+					<div id="link2"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(4)">
+					<div id="link4"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -159,6 +210,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(3)">
+					<div id="link3"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(5)">
+					<div id="link5"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -184,6 +247,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(4)">
+					<div id="link4"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(6)">
+					<div id="link6"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -209,6 +284,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(5)">
+					<div id="link5"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(7)">
+					<div id="link7"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -234,6 +321,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(6)">
+					<div id="link6"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(8)">
+					<div id="link8"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -259,6 +358,18 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(7)">
+					<div id="link7"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(9)">
+					<div id="link9"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
@@ -284,6 +395,11 @@
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+			<td width=9% align="center">
+				<a href="javascript:active(8)">
+					<div id="link8"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
 		</table>
 		</DIV>
 
@@ -327,7 +443,7 @@ function active(numlayer)
 {
 	for (i=0; i < 10 ; i++ ) {
 		ong = i+"XX";
-			link = "link"+i;
+		link = "link"+i;
 		if (numlayer==i) {
 			document.getElementById(ong).style.visibility="visible";
 			document.getElementById(link).style.backgroundColor="#11AA11";
@@ -395,7 +511,7 @@ function Check(f) {
 }
 function Dopop(link,i) {
 	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
+	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
 }
 
 function PopupZ3950() {
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
index b560f36a9e..bfeb779bfb 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl
@@ -21,7 +21,7 @@
 		<tr valign="top">
 			<td width="5%">ISBN:</td>
 			<td width="20%"><input type="text" name="isbn" /></td>
-			<td width="10%" rowspan=2 valign="middle"><input type="submit" value="Go" /></td>
+			<td width="10%" rowspan=2 valign="middle"><input type="submit" value="Go" class="button"/></td>
 			<td rowspan=2>If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.<br/>
 					If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.<br/>
 					Otherwise, a biblio can be added from scratch.</td>
@@ -31,9 +31,9 @@
 		</tr>
 		<tr><td>&nbsp;</td>
 		<!-- TMPL_IF NAME="NOTMARC" -->
-			<td colspan=2><a href=addbiblio-nomarc.pl>Create Empty biblio</a></td></tr>
+			<td colspan=2><a href="addbiblio-nomarc.pl" class="button">Create Empty biblio</a></td></tr>
 		<!-- TMPL_ELSE -->
-			<td colspan=2><a href=addbiblio.pl>Create Empty biblio</a></td></tr>
+			<td colspan=2><a href="addbiblio.pl" class="button">Create Empty biblio</a></td></tr>
 		<!-- /TMPL_IF -->
 	</table>
 </form>
@@ -51,7 +51,7 @@
 	<tr>
 		<td>Keyword:</td>
 		<td><input type="text" name="keyword" /></td>
-		<td><input type="submit" value="Go" /></td>
+		<td><input type="submit" value="Go" class="button"/></td>
 	</tr>
 	</table>
 </FORM>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
index 6d8384fd40..accc4f7bac 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <STYLE TYPE="text/css" MEDIA=screen>
 	table {	font-family:Arial;
 	font-weight:normal;
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl
index f7962d8d95..df0b399f6d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl
@@ -4,7 +4,7 @@
 You searched on <b><!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->title <!-- TMPL_VAR name="title" --><!-- /TMPL_IF --></b><br />
 <!-- TMPL_IF name="total" -->
 <!-- TMPL_VAR NAME=total --> results found<br />
-Results <!-- TMPL_VAR name="showoffset" --> to <!-- TMPL_VAR name="total" --> displayed
+Results <i><!-- TMPL_VAR name="showoffset" --></i> to <i><!-- TMPL_VAR name="total" --></i> displayed
 <!-- /TMPL_IF -->
 <p />
 <!-- Row of numbers corresponding to search result pages -->
@@ -45,7 +45,7 @@ Results <!-- TMPL_VAR name="showoffset" --> to <!-- TMPL_VAR name="total" --> di
 			<td><!-- TMPL_VAR name="author" --></td>
 			<td><!-- TMPL_VAR name="copyrightdate" --></td>
 			<!-- TMPL_IF NAME="NOTMARC" -->
-			  <td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Add Items</a></td>
+			  <td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Add items</a></td>
 			<!-- TMPL_ELSE -->
 			  <td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->">Edit...</a></td>
 			<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
index 8eb4dc35e0..94f395f697 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
@@ -69,7 +69,7 @@
 		<table cellspacing=0 cellpadding=2 border=1>
 			<tr>
 				<td><b>Budgets</B></TD>
-				<TD><b>Total</B></TD>
+				<TD><b> Total</B></TD>
 				<TD><b>Spent</B></TD>
 				<TD><b>Comtd</B></TD>
 				<TD><b>Avail</B></TD>
@@ -84,15 +84,16 @@
 				</TR>
 			<!-- /TMPL_LOOP -->
 			<tr>
-				<td><b>Total</b></TD>
+				<td><b> Total</b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="total" --></b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="totspent" --></b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="totcomtd" --></b></TD>
 				<TD align=right><b><!-- TMPL_VAR name="totavail" --></b></TD>
 			</TR>
-		</table><br>
-		Use your reload button [ctrl + r] to get the most recent figures.
-		Committed figures are approximate only, as exchange rates will affect the amount actually paid.
+		</table>
+		<p>
+		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
+		</p>
 	</TD>
 </TR>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
index 516034f3a1..2ca5695b02 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
@@ -5,7 +5,7 @@ Invoice: <!-- TMPL_VAR name="invoice" --><br>
 Received By: <!-- TMPL_VAR name="user" --><br>
 <!-- TMPL_VAR name="date" -->
 </div>
-<h1>Receipt Summary for: <!-- TMPL_VAR name="name" --> Invoice, <!-- TMPL_VAR name="invoice" --></h1>
+<h1>Receipt Summary for: <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
 <CENTER>
 
 
@@ -83,16 +83,16 @@ Received By: <!-- TMPL_VAR name="user" --><br>
 				<input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
 				<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
 				<!-- TMPL_IF name="catview" -->
-					<input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="continue" alt="save" border=0 border=0>
+					<input type="submit" class="button" value="save">
 				<!-- TMPL_ELSE -->
-					<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->><img src="/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0></a>
+					<a class="button" href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->>Edit</a>
 				<!-- /TMPL_IF -->
 			</td>
 		</tr>
 	</table>
 	<table border=1 cellspacing=0 cellpadding=5 width="40%">
 		<tr valign=top bgcolor=#99cc33>
-			<td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td>
+			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td>
 		</tr>
 		<TR VALIGN=TOP>
 			<TD><B>Bookfund *</B></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index b70b4465b4..68a8ca0e7f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -1,23 +1,25 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<h1>Shopping Basket <!-- TMPL_VAR name="basket" --> for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
-(Our Reference: <!-- TMPL_VAR name="entrydate" -->, #<!-- TMPL_VAR name="basket" -->, authorised by: <!-- TMPL_VAR name="loggedinusername" -->)<br />
+<h1>Shopping Basket <b><!-- TMPL_VAR name="basket" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
+Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b> authorised by <b><!-- TMPL_VAR name="loggedinusername" --></b><br />
 <CENTER>
 <p>
 <table border=0 cellspacing=0 cellpadding=5>
 	<tr valign=top bgcolor="#ffdf61">
 		<td width="5%"><b>Order</b></td>
+		<td width="10%"><b> Publisher</b></td>
 		<td width="10%"><b>Isbn</b></td>
 		<td width="30%"><b>Title</b></td>
 		<td width="20%"><b>Author</b></td>
-		<td width="6%"><b>$ rrp</b></td>
-		<td width="8%"><b>$est</b></td>
-		<td width="8%"><b>Qty</b></td>
-		<td width="8%"><b>Total</b></td>
+		<td width="5%"><b>$ rrp</b></td>
+		<td width="7%"><b>$est</b></td>
+		<td width="7%"><b>Qty</b></td>
+		<td width="7%"><b> Total</b></td>
 	</tr>
 	<!-- TMPL_LOOP name="books_loop" -->
 		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
 			<td><!-- TMPL_VAR name="ordernumber" --></td>
+			<td><!-- TMPL_VAR name="publishercode" --></td>
 			<td><!-- TMPL_VAR name="isbn" --></td>
 			<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
 			<td><!-- TMPL_VAR name="author" --></td>
@@ -32,7 +34,7 @@
 	<tr valign=top bgcolor=white>
 		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
   			<b>HELP</b><br>
-			To change any of the catalogue or accounting information attached to an order,  click on the title.<br>
+			To change any of the catalogue or accounting information attached to an order, click on the title.<br>
 		</td>
   		<td><b>SubTotal</b></td>
   		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
index 758b2ad4bc..3125bef0ec 100755
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
@@ -29,7 +29,7 @@ You searched on
 <BR>
 <!-- TMPL_VAR name="count" -->  results found.
 
-<br> Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> displayed.
+<br> Results <i><!-- TMPL_VAR name="dispnum" --></i> to <i><!-- TMPL_VAR name="offset2" --></i> displayed.
 
 <TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
 	<TR  VALIGN=TOP bgcolor="#ffdf61">
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index d57c89a3d8..49725ffb49 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -66,14 +66,14 @@ win.document.write("</font></body></html>");
 	<input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
 <!-- /TMPL_LOOP -->
 <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
-<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->"><img src="<!-- TMPL_VAR name=themelang -->/images/view-basket.gif" width=187 heigth=42 border=0 align=right alt="View Basket"></a>
+<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">View Basket</a>
 <h1><!-- TMPL_VAR name="ordnum" --> - Order Details </h1><br>
 Shopping Basket For: <!-- TMPL_VAR name="name" -->
 <P>
 <CENTER>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
 	<tr valign=top bgcolor=#99cc33>
-		<td background="/images/background-mem.gif" colspan=2><B>CATALOGUE DETAILS</B></td>
+		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>CATALOGUE DETAILS</B></td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD><b>Title *</b></td>
@@ -83,9 +83,13 @@ Shopping Basket For: <!-- TMPL_VAR name="name" -->
 		<TD>Author</td>
 		<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" ></td>
 	</tr>
+	<TR VALIGN=TOP>
+		<TD> Publisher</td>
+		<td><input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" ></td>
+	</tr>
 	<TR VALIGN=TOP>
 	<TD>Copyright Date</td>
-	<td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->">
+	<td><input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
 	</td>
 	</tr>
 	<TR VALIGN=TOP>
@@ -107,7 +111,7 @@ Shopping Basket For: <!-- TMPL_VAR name="name" -->
 </table>
 <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 height=250 align=left>
 <table border=1 cellspacing=0 cellpadding=5 width="40%">
-	<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
+	<tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
 	<TR VALIGN=TOP>
 		<TD>Quantity</td>
 		<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' ></td>
@@ -148,16 +152,17 @@ Shopping Basket For: <!-- TMPL_VAR name="name" -->
 		<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD colspan=2><input type=image  name=submit src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" border=0 align=right>	</td>
+		<TD colspan=2>
+		<input type="submit" value="OK" class="button">
 	</tr>
 </table>
 </form>
 </center>
 <table>
-<tr><td bgcolor=#cccc99  background="/images/background-mem.gif"><B>HELP</B><br>
+<tr><td bgcolor=#cccc99  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>HELP</B><br>
 <UL>
-<LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
-<LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also  be entered into the database as the quantity received.
+<LI>Bold fields must be filled in to create a new bibilo and item.<p>
+<LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.
 </UL>
 </td></tr></table>
 <p> &nbsp; </p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
index 45eef179f3..3ad85e5aaf 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
@@ -22,7 +22,11 @@ You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR
 <!-- TMPL_LOOP name="loop_suppliers" -->
 	<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
 		<td>
-			<a href="basket.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
+			<!-- TMPL_IF name="active" -->
+				<a href="basket.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
+			<!-- TMPL_ELSE -->
+				Inactive
+			<!-- /TMPL_IF -->
 		</td>
 		<td>
 			<a href="recieveorder.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="receive" ALT="Add" BORDER=0 ></a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
index cf45ece44c..4bb01d999e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
@@ -5,7 +5,7 @@ Invoice: <!-- TMPL_VAR name="invoice" --><br>
 Received By: <!-- TMPL_VAR name="user" --><br>
 <!-- TMPL_VAR name="date" -->
 </div>
-<h1>Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --></h1>
+<h1>Receipt Summary for : <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
 <CENTER>
 
 <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
index 89fbc5f928..a82768a5d2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
@@ -24,7 +24,7 @@
 </td>
 </tr>
 <TR VALIGN=TOP>
-<td colspan=2 align="center"><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
+<td colspan=2 align="center"><input type="submit" class="button" value="save">
 </td>
 </tr>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
index 288ff74452..a43e79e9f7 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
@@ -84,9 +84,6 @@
 		<td><textarea name=notes cols=20 rows=4><!-- TMPL_VAR name="contnotes" --></textarea>
 		</td>
 	</tr>
-	<tr>
-		<td colspan=2 align="center"><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="save" alt="save"></td>
-	</tr>
 </table>
 
 <table border=1 cellspacing=0 cellpadding=5 width="40%">
@@ -95,8 +92,14 @@
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>Supplier is</td>
-		<td><input type="radio" name="status" value="1" <!-- TMPL_IF name="active" -->checked<!-- /TMPL_IF -->>Active
-			<input type="radio" name="status" value="0" <!-- TMPL_UNLESS name="active" -->checked<!-- /TMPL_UNLESS -->>Inactive</td>
+		<td>
+			 <!-- TMPL_IF name="active" -->
+				<input type="radio" name="status" value="1" checked>Active
+				<input type="radio" name="status" value="0">Inactive</td>
+			<!-- TMPL_ELSE -->
+				<input type="radio" name="status" value="1">Active
+				<input type="radio" name="status" value="0"checked>Inactive</td>
+			<!-- /TMPL_IF -->
 	</tr>
 	<tr valign=top bgcolor="#ffdf61">
 		<td colspan=2><B>ORDERING INFORMATION</B></td>
@@ -152,7 +155,8 @@
 		<td><input type=text size=3 name=discount value=<!-- TMPL_VAR name="discount" -->> %
 	</tr>
 </table>
-
+<br/>
+<br/><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="save" alt="save" class="button">
 </form>
 </center>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/auth.tmpl b/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
index 79aa7a2333..091cb0fbf0 100644
--- a/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
@@ -34,7 +34,7 @@
 
     <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
     <tr><th colspan="2"><font size="+2">Koha Login</font></th></tr>
-    <tr><td>Cardnumber:</td><td><input name="userid"></td></tr>
+    <tr><td>Card number:</td><td><input name="userid"></td></tr>
     <tr><td>Password:</td><td><input type="password" name="password"></td></tr>
     <tr><td colspan="2" align="center"><input type="submit" value="login"></td></tr>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
index 0a79fd1124..1c4d024b62 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
@@ -18,6 +18,7 @@
 					<td width=8%><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"></td>
 					<td width=8%><a href="javascript:confirm_deletion()"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png"></td>
 					<td width=8%><a href="detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">Normal</a></td>
+					<td width=8%><a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')">Print</a></td>
 					<td align="center"><b>MARC biblio : <!-- TMPL_VAR name="bibid" --></b></td>
 				</tr>
 			</table>
@@ -256,9 +257,12 @@ for (i=0; i <= 10 ; i++ ) {
 function confirm_deletion() {
 	var is_confirmed = confirm('Confirmez vous la suppression ?');
 	if (is_confirmed) {
-		window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber=<!-- TMPL_VAR name="bibid" -->";
+		window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
 	}
 }
+function Dopop(link) {
+	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+}
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
index 126f5fd36f..676d2b82c2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
@@ -23,10 +23,10 @@
 		<TD colspan=2 > &nbsp;</td>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD  bgcolor="#ad11ad" background="/images/background-mem.gif" colspan=2>
+		<TD  bgcolor="#ad11ad" colspan=2>
 			<span style="color:#FFFFFF;">
 				<b>HELP</b><br>
-				<b>Searching:</b>Using more fields for your search (eg Keyword + author + class) will slow it down.<p>
+				<b>Search :</b>Using more fields for your search will slow it down.<p>
 			</span>
 		</td>
 	</TR>
@@ -63,7 +63,7 @@
 	<TD>Class</TD>
 		<td>
 			<select name="class" size="1">
-			<option value="">Any
+			<option value=""> Any
 			<!-- TMPL_VAR name="classlist" -->
 			</select>
 		</td>
@@ -90,13 +90,13 @@
 				<tr align="center">
 					<td>
 						<input type="hidden" name="type" value="intra">
-						<INPUT TYPE="image"  alt="Start Search" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" BORDER=0 >
+						<input type="submit" class="button" value="Start search">
 					</td>
 					<td>
-						<INPUT TYPE="reset"  VALUE= "Clear">
+						<INPUT TYPE="reset"  VALUE= "Clear" class="button">
 					</td>
 					<td>
-						<a href=/cgi-bin/koha/shelves.pl>Virtual Bookshelves</a>
+						<a href="/cgi-bin/koha/shelves.pl" class="button">Virtual Bookshelves</a>
 					</td>
 				</tr>
 			</table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl
index c4013b06ec..53b9621f5b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl
@@ -23,7 +23,7 @@
 </td></tr>
 </table>
 <br>
-Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
+Results <i><!-- TMPL_VAR NAME="startfrom" --></i> through <i><!-- TMPL_VAR NAME="endat" --></i> of <i><!-- TMPL_VAR NAME="numrecords" --></i> records.
 <hr>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl
index 0cf5cbddef..10b622cfab 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl
@@ -37,11 +37,11 @@
 <center>
 <table border=0 cellspacing=0 cellpadding=2>
 <tr bgcolor="#99cccc">
-<td>Item Type</td>
+<td>Item type</td>
 <td>Class</td>
 <td>Location</td>
 <td>Date Due</td>
-<td>Last Seen</td>
+<td>Last seen</td>
 </tr>
 <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 <tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index 29f1d4d0c8..b22a1e03eb 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -24,23 +24,25 @@
 		<td>
 			<br/><a href="MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">MARC</a><br/><br/>
 			<FONT SIZE=2  face="arial, helvetica">
-			<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
-			<!-- TMPL_IF name="author" --><b>Author:</b> <a href=/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
-			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+			<!-- TMPL_IF name="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="author" --><b>Author:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
 			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br/>
-			<!-- TMPL_IF name="collection" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br/>
-			<!-- TMPL_IF name="subject" --><b>Subject:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subject" --><br/>
-			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br/>
-			<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br/>
-			<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br/>
-			<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br/>
-			<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br/>
-			<!-- TMPL_IF name="url" --><b>URL:</b> <a hre="<!-- TMPL_VAR name="url" --><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
-			<b>total number of Items:</b> <!-- TMPL_VAR NAME="count" -->
-			<p>
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
+			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
 			</font>
 		</td>
 	</tr>
@@ -57,22 +59,20 @@
 <center>
 <table border=0 cellspacing=0 cellpadding=2>
 	<tr bgcolor="#cccc99" background="/images/background-mem.gif">
-		<td>Item Type</td>
-		<td>Class</td>
-		<td>Location</td>
-		<td>Date Due</td>
-		<td>Last Seen</td>
-		<td>Barcode</td>
+		<th>Item type</th>
+		<th>Location</th>
+		<th>Date Due</th>
+		<th>Last seen</th>
+		<th>Barcode</th>
 		<td>Volume</td>
 	</tr>
 	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="description" --></td>
-			<td><a href=/cgi-bin/koha/search.pl?dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE=URL -->><!-- TMPL_VAR NAME="class" --></a></td>
-			<td><!-- TMPL_VAR NAME="branchname" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="bulk" --> <!-- TMPL_VAR NAME="bulk" --><!-- /TMPL_IF --></td>
 			<td><!-- TMPL_VAR NAME="datedue" --></td>
 			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-			<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+			<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
 			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
 			<!-- TMPL_IF NAME="type" -->
 				<td>
@@ -95,22 +95,6 @@
 	<!-- /TMPL_LOOP -->
 </table>
 <p>
-<table border="0" cellspacing="0" cellpadding="5" width=70%>
-	<tr valign="top">
-		<td bgcolor="99cc33" background="/images/background-mem.gif" colspan="2">
-			<p><b>HELP</b><br>
-			<b>Update Biblio for all Items:</b> Click on the <b>Modify</b>
-			button [left] to amend the biblio.  Any changes you make will update
-			the record for <b>all</b> the items listed above. <p>
-			<b>Updating the Biblio for only ONE or SOME Items:</b>
-			If some of the items listed above need a different biblio, or are on the
-			wrong biblio, you must use the
-			<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">acquisitions</a>
-			process to fix this. You will need to "re-order" the items, and delete them
-			from this biblio.<p />
-		</td>
-	</tr>
-</table>
 </center>
 <br clear=all>
 <p />
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl
new file mode 100644
index 0000000000..f3ce91b778
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl
@@ -0,0 +1,52 @@
+<html>
+<body onLoad="window.print();self.close();">
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<table cellspacing="0" cellpadding="1" border="1" width=500>
+	<tr valign="top">
+		<td bgcolor="#cccc99" background="/images/background-mem.gif">
+			<b>BIBLIO RECORD <!-- TMPL_VAR NAME="biblionumber" --></b>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td>
+			<!-- TMPL_VAR NAME="author" --><br>
+			<b><!-- TMPL_VAR NAME="title" --></b><!-- TMPL_VAR NAME="subtitle" --><br>
+			<!-- TMPL_VAR NAME="additional" --><br>
+			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
+			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br>
+			</font>
+		</td>
+	</tr>
+	</table>
+<!-- /TMPL_LOOP -->
+
+<table border=0 cellspacing=0 cellpadding=2>
+	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" -->, <!-- TMPL_VAR NAME="bulk" --></td>
+			<td><!-- TMPL_VAR NAME="barcode" --></td>
+			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+<SCRIPT>
+function docprint() {
+	window.print();
+	window.close();
+}
+</SCRIPT>
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl
index 3fbd638f48..8d29845b85 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl
@@ -30,10 +30,10 @@ href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intr
 <br>
 <FONT SIZE=2  face="arial, helvetica">
 <b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
-<b>Item Type:</b> <!-- TMPL_VAR NAME="itemtype" --><br>
+<b>Item type:</b> <!-- TMPL_VAR NAME="itemtype" --><br>
 <b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
-<b>Loan Length:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
-<b>Rental Charge:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
+<b>Loan length:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
+<b>Rental charge:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
 <b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --><br>
 <b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
 <b>Publisher:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
index 276a2198b5..061cdf27f8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
@@ -84,7 +84,7 @@
 </table>
 
 <br>
-Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
+Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.
 <hr>
 
 Try another <a href=/cgi-bin/koha/catalogue-home.pl>search</a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
index 658d830ed1..6a5a85aea2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
@@ -1,31 +1,47 @@
 <!-- TMPL_IF NAME="opac" -->
-    <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <!-- TMPL_ELSE -->
-    <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 
 <center>
 
 <table border=0 cellspacing=0 cellpadding=2>
-<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=/images/background-opac.gif<!-- TMPL_ELSE --> background="/images/background-mem.gif"<!-- /TMPL_IF -->>
-<th>Subject</th></tr>
+<!-- TMPL_IF NAME="opac" -->
+	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
+<!-- TMPL_ELSE -->
+	<tr background="/images/background-mem.gif">
+<!-- TMPL_ELSE -->
+		<th>Subject</th>
+	</tr>
 <!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
-  <tr>
-  <td><a href=/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->><!-- TMPL_VAR NAME=subject --></a></td>
-  </tr>
+	<tr>
+		<td>
+			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME=subject --></a>
+		</td>
+	</tr>
 <!-- /TMPL_LOOP -->
-<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=/images/background-opac.gif<!-- TMPL_ELSE --> background="/images/background-mem.gif"<!-- /TMPL_IF -->><td colspan=4>
-    <table border=0 cellpadding=0 cellspacing=0 width=100%>
-    <tr><td align=left>
-    <a href=search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->>Previous Records</a>
-    </td><td align=right>
-    <a href=search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->>Next Records</a>
-    </td></tr>
-    </table>
-</td></tr>
+<!-- TMPL_IF NAME="opac" -->
+	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
+<!-- TMPL_ELSE -->
+	<tr background="/images/background-mem.gif">
+<!-- /TMPL_IF -->
+		<td colspan=4>
+			<table border=0 cellpadding=0 cellspacing=0 width=100%>
+			<tr>
+				<td align=left>
+					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
+				</td>
+				<td align=right>
+					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
+				</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
 </table>
 <br>
-Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
+Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --></b> records.
 <hr>
 
 <!-- TMPL_IF NAME="opac" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
index 8d5caf0b17..1c0d1de70a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
@@ -4,7 +4,7 @@
 	<table align="right" cellpadding="10">
 		<tr>
 			<td>
-				<a class="button" href="circulation.pl?borrnumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=yes">
+				<a class="button" href="circulation.pl?branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=yes">
 				Next Borrower</a>&nbsp;
 				<a class="button" href="returns.pl">
 				Returns</a>&nbsp;
@@ -13,13 +13,10 @@
 			</td>
 		</tr>
 	</table>
-	<h1>Circulation: Issues</h1><br>
-	<b>Branch:</b> <!-- TMPL_VAR name="branchname" --><br>
-	<b>Printer:</b> <!-- TMPL_VAR name="printername" --><br>
-	<a href="selectbranchprinter.pl">Change Settings</a>
+	<h1>Circulation: Issues</h1>
+	<i>Branch:</i> <!-- TMPL_VAR name="branchname" --> <i>Printer:</i> <!-- TMPL_VAR name="printername" --> <a href="selectbranchprinter.pl" class="button">Change Settings</a>
 	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
 	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
-	<p>&nbsp;</p>
 <!-- TMPL_ELSE -->
 	<table align="right" cellpadding="10">
 		<tr>
@@ -37,7 +34,7 @@
 	<h1>Circulation: Issues</h1><br>
 	<b>Branch:</b> <!-- TMPL_VAR name="branchname" --> <br>
 	<b>Printer:</b> <!-- TMPL_VAR name="printername" --><br>
-	<a href="selectbranchprinter.pl">Change Settings</a>
+	<a href="selectbranchprinter.pl" class="button">Change Settings</a>
 	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
 	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
 	<p>&nbsp;</p>
@@ -140,7 +137,7 @@
 			<td align="center">
 				<!-- TMPL_VAR name="CGIselectborrower" -->
 				<br>
-				<input type="submit">
+				<input type="submit" value="OK" class="button">
 			</td>
 		</tr>
 	</table>
@@ -171,7 +168,7 @@
 <tr>
 <td>
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-<table border="1" cellpadding="5">
+<table border="1" cellpadding="2">
 	<tr>
 	<td align="center" valign="top">
 		<table border="0" cellspacing="0" cellpadding="5">
@@ -186,7 +183,7 @@
 						<tr>
 							<td>Item Barcode:</td>
 							<td><input name="barcode" size="10"></td>
-							<td><input type="submit" value="Issue"></td>
+							<td><input type="submit" value="Issue" class="button"></td>
 						</tr>
 						<tr>
 							<td colspan="3" align="center">
@@ -224,14 +221,23 @@
 </form>
 </td>
 <td>
-<table border="1" cellpadding="5" cellspacing="0" align="right">
-    <tr><td colspan="2"><font color="black"><b>Patron information</b></font></td></tr>
+<table border="1" cellpadding="2" cellspacing="0" align="right">
+    <tr><td colspan="2"><font color="black"><b>Borrower information</b></font></td></tr>
     <tr><td colspan="2">
     <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this,'Member', 480, 640)">
 		<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
     </a> <br> Category: <!-- TMPL_VAR name="categorycode" -->
     </td></tr>
 <!-- TMPL_IF name="noissues" -->
+<!-- TMPL_IF NAME="gna" -->
+<tr><td valign="top"><font color="red">GNA</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Borrower is gone with no address</td></tr>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="lost" -->
+<tr><td valign="top"><font color="red">LOST</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Borrower's card is lost</td></tr>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="dbarred" -->
+<tr><td valign="top"><font color="red">DBARRED</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Borrower is debarred</td></tr>
+<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="charges" -->
 		<tr><td valign="top"><font color="red">CHARGES</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->><a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
 	<!-- TMPL_ELSE -->
@@ -253,7 +259,7 @@
 		<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="odues" -->
 				<!-- TMPL_IF name="nonreturns" -->
-					<tr><td valign="top">ODUES</td><td>Yes, See below</td></tr>
+					<tr><td valign="top"><font color="red">ODUES</font></td><td><font color="red">Yes, See below</font></td></tr>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="notes" -->
@@ -263,9 +269,9 @@
 </table>
 <!-- /TMPL_IF -->
 </table>
-<p clear="all"><br><br></p>
+<br/>
 <!-- TMPL_IF name="todayissues" -->
-<table border="1" cellpadding="5" cellspacing="0" width="80%">
+<table border="1" cellpadding="5" cellspacing="0" width="100%">
 	<tr>
 		<th colspan="5" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 			<font color="black">
diff --git a/koha-tmpl/intranet-tmpl/default/en/default.tmpl b/koha-tmpl/intranet-tmpl/default/en/default.tmpl
index b70b19271a..468a58c597 100644
--- a/koha-tmpl/intranet-tmpl/default/en/default.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/default.tmpl
@@ -23,6 +23,6 @@
 </td></tr>
 </table>
 <br>
-Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
+Results <i><!-- TMPL_VAR NAME="startfrom" --></i> through </i><!-- TMPL_VAR NAME="endat" --></i> of <i><!-- TMPL_VAR NAME="numrecords" --></i> records.
 <hr>
 <!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
index a054c0c2dc..c68e2cc4c2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
@@ -89,10 +89,13 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 						<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet" class="submenu2">MARC search</a>
 					</td>
 					<td>
-						<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="submenu">Add biblio</a>
+						<a href="/cgi-bin/koha/shelves.pl" class="submenu">Virtual shelves</a>
 					</td>
 					<td>
-						<a href="/cgi-bin/koha/maint/catmaintain.pl" target="window0" class="submenu2">Cat maintenance</a>
+						<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="submenu2">Add biblio</a>
+					</td>
+					<td>
+						<a href="/cgi-bin/koha/maint/catmaintain.pl" target="window0" class="submenu">Cat maintenance</a>
 					</td>
 				</tr>
 			</table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
index ef0d3a35fb..4175d95cfe 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
@@ -1,9 +1,9 @@
 .button {
 	text-align: center;
 	font: 1.2em sans-serif;
-	padding: 10px 15px;
+	padding: 3px;
 	border-style: solid;
-	border-width: 2px;
+	border-width: 1px;
 	border-color: black;
 	text-decoration: none;
 	color: black;
@@ -12,7 +12,6 @@
 	background-color:#FFFFFF;
 	background-image:url("/intranet-tmpl/default/en/images/background-mem.gif");
 }
-
 #problem {
 	color: red;
 	font-weight:bold;
@@ -27,6 +26,12 @@
 	background-color:#EEEEEE;
 	border-left:1px solid #000000;
 }
+a {
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: none;
+}
 a.submenu {
 	font-weight: normal;
 	text-decoration: none;
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc
index 5e7b0137ae..40827b5c6e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc
@@ -171,7 +171,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 			<form name=choose2>
 			<select name=dest size=1 onChange="leapto(this.form)">
 
-			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>AQUISITIONS
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>ACQUISITIONS
 			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Orders
 			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Order Books
 			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Order Serials
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
index ffbf175c74..2e51f09a3d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <center>
 <!-- TMPL_IF name="BARCODE_EXISTS" -->
-	<font color=red>Barcode '<!-- TMPL_VAR name="barcode" -->' has already been assigned.</font><p>
+	<font color=red>Barcode <b><!-- TMPL_VAR name="barcode" --></b> has already been assigned.</font><p>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="ITEM_ERROR" -->
 	<font color=red>Error : <!-- TMPL_VAR name="error" --></font><p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
index d83713b9ad..82cd9d2f8b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
@@ -24,7 +24,7 @@ Full MARC Record available at bottom
 	<tr bgcolor="#dddddd"><td>Volume Description</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size=40 maxlenght=255></td></tr>
 	<tr bgcolor="#ddaaaa"><td>Subject</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size=40 maxlenght=255></td></tr>
 	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Item Type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Item type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
 	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size=40 maxlenght=40></td></tr>
 	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size=40 maxlenght=40></td></tr>
 	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size=40 maxlenght=40></td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl b/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl
index a7329b85b4..bcb1751818 100644
--- a/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl
@@ -22,7 +22,7 @@
 	</table>
 
 	<p>
-	<input type=submit value="Set Flags">
+	<input type=submit value="Set Flags" class="button">
 </form>
 
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
index bcb580ca7d..66b1250cec 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
@@ -21,7 +21,7 @@
 
     <tr align=right>
       <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
-        <STRONG>Member# <!-- TMPL_VAR NAME="member" -->, Card Number*</STRONG>
+        <STRONG>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</STRONG>
       </TD>
       <TD align=right><input type=text name=cardnumber_institution size=20 value=<!-- TMPL_VAR NAME=cardnumber_institution -->><br></td>
     </TR>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
index cb520d7c33..a228eaafa8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
@@ -52,7 +52,7 @@
 	</TR>
 	<TR>
 		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
-			<STRONG>Member# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Card Number*</b></STRONG>
+			<STRONG>Member# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Card number*</b></STRONG>
 		</TD>
 		<TD>
 			<input type=text name=cardnumber_child_<!-- TMPL_VAR NAME=i --> size=20 value="<!-- TMPL_VAR NAME=jcardnumber -->"><br>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
index f07c95fb22..885ee3401a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
@@ -15,7 +15,7 @@ Click <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME=member -->"
 	New UserID: <input name=newuserid size=20 value=<!-- TMPL_VAR NAME=userid -->> <br>
 	New Password: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->>
 	<p>
-	<input type=submit value="Confirm Password">
+	<input type=submit value="Confirm Password" class="button">
 	</form>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
index 682c4492ed..61474ae1f9 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
@@ -41,7 +41,7 @@ You Searched for <!-- TMPL_VAR NAME=member --><p>
 </table>
 
 <form action=/cgi-bin/koha/simpleredirect.pl method=post>
-<input type=submit class="button" value="Add Member" title="Add Member" alt="Add Member">
+<input type=submit class="button" value="Add member" title="Add member" alt="Add member">
 <INPUT TYPE="radio" name="chooseform" value="adult" checked>Adult
 <INPUT TYPE="radio" name="chooseform" value="organisation" >Organisation
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 5e1fd97e14..52fa57760f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -1,6 +1,15 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<h1><!-- TMPL_VAR NAME=header --></h1><br>
+<!-- TMPL_IF NAME=addAction -->
+<h1>
+	Add member
+</h1>
+<!-- TMPL_ELSE -->
+<h1>
+	Update Member Details
+</h1>
+<!-- /TMPL_IF -->
+<br>
 
 <form action=/cgi-bin/koha/newmember.pl method=post>
 	<input type=hidden name=joining value="<!-- TMPL_VAR NAME=dateenrolled -->">
@@ -13,7 +22,7 @@
 
 	<tr valign=top>
 		<td COLSPAN=2><input type=reset value="Clear all Fields"></td>
-		<td COLSPAN=3 ALIGN=RIGHT><font size=4 face='arial,helvetica'>Member# <!-- TMPL_VAR NAME=member -->, Card Number* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"><br></td>
+		<td COLSPAN=3 ALIGN=RIGHT><font size=4 face='arial,helvetica'>Member# <!-- TMPL_VAR NAME=member -->, Card number* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"><br></td>
 	</tr>
 
 	<tr valign=top>
@@ -29,9 +38,9 @@
 	<tr valign=top bgcolor=white>
 		<td><FONT SIZE=2>Title</FONT></td>
 		<td><FONT SIZE=2>Initials</FONT></td>
-		<td><FONT SIZE=2><b>Given Names*</b></FONT></td>
-		<td><FONT SIZE=2><b>Surname*</b></FONT></td>
-		<td><FONT SIZE=2>Prefered Name</FONT></td>
+		<td><FONT SIZE=2><b> Given Names*</b></FONT></td>
+		<td><FONT SIZE=2><b> Surname*</b></FONT></td>
+		<td><FONT SIZE=2> Prefered Name</FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td><!-- TMPL_VAR name="Mr" -->
@@ -112,13 +121,8 @@
 			<input type=text name=streetcity size=20 value="<!-- TMPL_VAR NAME=streetcity -->"></td>
 	</tr>
 
-
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>MEMBER CONTACT DETAILS</b></td>
-	</tr>
-
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><FONT SIZE=2>Phone (Home)</td>
+		<td COLSPAN=2 ><FONT SIZE=2>Phone home</td>
 		<td><FONT SIZE=2>Fax</td>
 		<td><FONT SIZE=2>Email</td>
 		<td><FONT SIZE=2>Text Messaging</td>
@@ -132,7 +136,7 @@
 
 
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><FONT SIZE=2>Phone (Daytime)</td>
+		<td COLSPAN=2 ><FONT SIZE=2>Phone daytime</td>
 		<td></td>
 		<td></td>
 		<td></td>
@@ -150,7 +154,7 @@
 	</tr>
 
 	<tr valign=top bgcolor=white>
-		<td   COLSPAN=3 ><FONT SIZE=2><b>Name*</b></td>
+		<td   COLSPAN=3 ><FONT SIZE=2><b> Surname*</b></td>
 		<td><FONT SIZE=2>Phone</td>
 		<td><FONT SIZE=2><b>Relationship*</b></td>
 	</tr>
@@ -167,7 +171,7 @@
 	</tr>
 
 	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Notes</font></td>
+		<td><FONT SIZE=2> Notes</font></td>
 		<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=altnotes --></textarea></td>
 	</tr>
 
@@ -177,7 +181,7 @@
 	</tr>
 
 	<tr valign=top >
-		<td><FONT SIZE=2>Notes</font></td>
+		<td><FONT SIZE=2> Notes</font></td>
 		<td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=borrowernotes --></textarea></td>
 	</tr>
 
@@ -198,7 +202,7 @@
 		<td></td>
 		<td>
 			<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-			<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" ALT="Add New Member" border=0 >
+			<input type="submit" value="save" class="button">
 		</td>
 	</tr>
 	</table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
index 6d247c8c76..abf1f55716 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
@@ -3,27 +3,17 @@
 <h1>Members</h1><P>
 
 
-<img src="<!-- TMPL_VAR name="themelang" -->/images/numbers-mem-1.gif"   WIDTH=45  HEIGHT=44   ALT="1"
-hspace=5 align=left BORDER=0>
-
 <table border=1 cellspacing=0 cellpadding=10 height="100" >
 <tr VALIGN=TOP  >
 <td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><FORM ACTION="/cgi-bin/koha/member.pl" method=post><FONT SIZE=4>
-<b>Member Search</B> 
+<b>Member Search</B>
 </FONT>
 <INPUT TYPE="text" size=50 name=member >
-<BR>
-Renew Items, view add, modify and delete records, all by starting with this search.<BR>
-Type a borrower name, part of a name,  or number in the field above and hit the <BR>
-enter key to activate search
+<p>Renew Items, view add, modify and delete records, all by starting with this search. Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
 </td></form><tr>
 </table>
- 
-<P>
-
-<img src="<!-- TMPL_VAR name="themelang" -->/images/numbers-mem-2.gif"   WIDTH=45  HEIGHT=44   ALT="2" 
-hspace=5 align=left BORDER=0>
 
+<P>
 
 <table border=1 cellspacing=0 cellpadding=10 height="100" >
 <tr VALIGN=TOP  >
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index c58329c46c..96ac97a22a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -13,22 +13,12 @@
 
 	<tr VALIGN=TOP  >
 	<TD>
-		<!-- TMPL_IF name="IS_ADULT" -->
-			<p align=right>
-			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
-				<INPUT TYPE="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
-				<input type=hidden name=type value=Add>
-				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
-			</form>
-			</P>
-		<!-- /TMPL_IF -->
-		<br>
 		<FONT SIZE=2  face="arial, helvetica"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF --><p>
-		Card Number: <!-- TMPL_VAR NAME="cardnumber" --><BR>
+		Card number: <!-- TMPL_VAR NAME="cardnumber" --><BR>
 		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><BR>
 		<!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><BR>
-		Phone (Home): <!-- TMPL_VAR NAME="phone" --><BR><!-- /TMPL_UNLESS -->
-		Phone (Daytime): <!-- TMPL_VAR NAME="phoneday" --><BR>
+		Phone home: <!-- TMPL_VAR NAME="phone" --><BR><!-- /TMPL_UNLESS -->
+		Phone daytime: <!-- TMPL_VAR NAME="phoneday" --><BR>
 		Fax: <!-- TMPL_VAR NAME="faxnumber" --><BR>
 		E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
 		Text messaging: <!-- TMPL_VAR NAME="textmessaging" --><p>
@@ -66,6 +56,16 @@
 		<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
 		<p align=right>
 		</font>
+		<!-- TMPL_IF name="IS_ADULT" -->
+			<p align=right>
+			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
+				<INPUT TYPE="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
+				<input type=hidden name=type value=Add>
+				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
+			</form>
+			</P>
+		<!-- /TMPL_IF -->
+		<br>
 		<!-- TMPL_IF name="I" -->
 			<form action=/cgi-bin/koha/imemberentry.pl method=post>
 				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
@@ -114,8 +114,12 @@
 	<TD colspan=2 align=right>
 		<p>
 			<br>
-			<a class="button" href=/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->>View Account</a>
-			<a class="button" href=/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->>Pay Fines</a>
+			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+				View Account
+			</a>
+			<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+				Pay Fines
+			</a>
 			<br><br>
 		</p>
 	</td>
@@ -219,7 +223,9 @@
 </table>
 <br />
 <br />
-<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
+<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+	Reading Record
+</a>
 <script>
 function confirm_deletion() {
 	var is_confirmed = confirm('do you confirm deletetion ?');
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
index a1510b8a1f..4191a87d96 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
@@ -2,7 +2,7 @@
 
 <h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
 <br>Member Number: <!-- TMPL_VAR NAME=bornum -->
-<br>Card Number: <!-- TMPL_VAR NAME=cardnumber -->
+<br>Card number: <!-- TMPL_VAR NAME=cardnumber -->
 <P>
 <!-- TMPL_IF NAME=showfulllink -->
 <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=full">Full output</a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
index 4b0259bba5..6bbee7baa5 100755
--- a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
@@ -23,7 +23,7 @@ Modify Group - <!-- TMPL_VAR Name="description" --></h1><br>
 			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >OR MODIFY DETAILS</b></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Item Type</td><td><input type=text name=Item Type value="<!-- TMPL_VAR Name="itemtype" -->" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Item type</td><td><input type=text name=Item Type value="<!-- TMPL_VAR Name="itemtype" -->" size=20></td></tr>
 
 		<tr valign="top" bgcolor="white">
 			<td>URL</td>
@@ -76,7 +76,7 @@ Modify Group - <!-- TMPL_VAR Name="description" --></h1><br>
 			<td background="/images/background-mem.gif">Barcode</td>
 			<td background="/images/background-mem.gif">Location</td>
 			<td background="/images/background-mem.gif">Date Due</td>
-			<td background="/images/background-mem.gif">Last Seen</td>
+			<td background="/images/background-mem.gif">Last seen</td>
 		</tr>
 
 		<!-- TMPL_LOOP Name="itemloop" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
index c5fb447547..165ce20669 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
@@ -36,7 +36,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Card Number</B>
+				<B>Card number</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="cardnumber_institution" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl
index 99d303238b..5fc80f0b42 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl
@@ -41,7 +41,7 @@
 				</tr>
 				<tr valign=top bgcolor="white" >
 					<td>
-					<B>Date Of Birth</B>
+					<B>Date of birth</B>
 					</td>
 					<td>
 					<!-- TMPL_VAR Name="dob" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
index 3bc3f16c26..74cec79e68 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
@@ -31,7 +31,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Card Number</B>
+				<B>Card number</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="cardnum" -->
@@ -84,7 +84,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Date Of Birth</B>
+				<B>Date of birth</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="dob" -->
@@ -95,7 +95,11 @@
 				<B>Sex</B>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="sex" -->
+				<!-- TMPL_IF Name="sex" -->
+					Male
+				<!-- TMPL_ELSE -->
+					Female
+				<!-- /TMPL_IF -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
@@ -126,7 +130,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Phone (Home)</B>
+				<B>Phone home</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="phone" -->
@@ -134,7 +138,7 @@
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Phone (Daytime)</B>
+				<B>Phone daytime</B>
 			</td>
 			<td>
 				<!-- TMPL_VAR Name="phoneday" -->
@@ -223,12 +227,12 @@
 		</form>
 <!-- TMPL_ELSE -->
 	<h1>ERROR</H1>
-	<p>The following  fields have a forbidden value. Please push the back button and try again : </p>
+	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
 	<!-- TMPL_IF name="cardnumber" -->
-		Cardnumber<br/>
+		Card number<br/>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="invalid_cardnumber" -->
-		Invalid_cardnumber<br/>
+		Invalid cardnumber<br/>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="gender" -->
 		Gender<br/>
diff --git a/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
index 0b9283e370..1ac6eff20f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
@@ -1,134 +1,134 @@
-<HTML>
-<TITLE>WELCOME TO THE  KOHA OPAC </TITLE>
-
-
-<style type="text/css">
-<!--
-input{font-size:16px}
--->
-
-</style>
-
-
-</HEAD>
-
-<BODY   onload="document.catsearch.keyword.focus()"
-	BGCOLOR="#339999" 
-	text="black" 
-	link="white" 
-	vlink="white" 
-	alink="#663366" 
-	leftmargin=0 
-	topmargin=0
-	marginheight=0
-	marginwidth=0 >
-
-<center>
-<table cellspacing=0 cellpadding=0 border=0 >
-	
-  <tr valign=top >
-	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
-	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
-cellspacing=0 cellpadding=0 border=0 >
-	
-  <tr valign=top >
-	<td background=" "><img src="/images/holder.gif" width=228 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=57 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=47 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-  </tr>
-
-  <tr valign=top >
-	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
- 	width=1 height=30
-	alt=" " hspace=0 vspace=0><br>
-	<img src="/images/koha.gif" width=200 height=128
-	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
-
-	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
-	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
-
-  </tr>
-
-
-<tr valign=top >
-	<td>&nbsp; &nbsp; </td>
-	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
-	<input type=hidden name=type value=opac>
-	<td background=" " >
-
-	<input type=text size="27" name="keyword"><br>
-	</font>
-	<b>Type in the box and press the enter 			key.</b><br>
-	<a href="/cgi-bin/koha/catalogue-home.pl">
-      
-	<img src="/images/front-arrow.gif" width=27 height=22
-	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
-
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0>
-	<p>
-	<!-- TMPL_IF NAME="loggedinuser" -->
-	    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
-	<!-- TMPL_ELSE -->
-	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
-	<!-- /TMPL_IF -->
-	</td>
-	</form>
-  </tr>
-
-
- 
-
-<!--
-  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
-	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
-	alt="Member Login" hspace=0 vspace=0 border=0></td>
-
-  </tr>
-<tr valign=top >
-        <td></td>
-	<form action="/cgi-bin/member.pl" method=get >
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>
-	<td background=" " ><input type=text size="12" name="card"></td>
-
-  </tr>
-
-  <tr valign=top><td></td>
-	<td></td>
-	<td></td>
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
-	<td background=" " ><input type=password size="12" name="password"><br>
-	<input type=submit value="OK"><br>
-
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0></td>
-	</font>
- </tr>
-
-  <tr valign=top >
-	<td></td>
-	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
-	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
-	</td>
-	<td>
-	</td>
-
-  </tr>
-
--->
-</table>
-
-</td>
-  </tr>
-</table>
-<p>
-</center>
+<HTML>
+<TITLE>WELCOME TO THE  KOHA OPAC </TITLE>
+
+
+<style type="text/css">
+<!--
+input{font-size:16px}
+-->
+
+</style>
+
+
+</HEAD>
+
+<BODY   onload="document.catsearch.keyword.focus()"
+	BGCOLOR="#339999" 
+	text="black" 
+	link="white" 
+	vlink="white" 
+	alink="#663366" 
+	leftmargin=0 
+	topmargin=0
+	marginheight=0
+	marginwidth=0 >
+
+<center>
+<table cellspacing=0 cellpadding=0 border=0 >
+	
+  <tr valign=top >
+	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
+	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
+cellspacing=0 cellpadding=0 border=0 >
+	
+  <tr valign=top >
+	<td background=" "><img src="/images/holder.gif" width=228 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=57 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=47 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=1 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=1 height=88 
+	alt=" " hspace=0 vspace=0></td>
+  </tr>
+
+  <tr valign=top >
+	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
+ 	width=1 height=30
+	alt=" " hspace=0 vspace=0><br>
+	<img src="/images/koha.gif" width=200 height=128
+	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
+
+	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
+	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
+
+  </tr>
+
+
+<tr valign=top >
+	<td>&nbsp; &nbsp; </td>
+	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
+	<input type=hidden name=type value=opac>
+	<td background=" " >
+
+	<input type=text size="27" name="keyword"><br>
+	</font>
+	<b>Type in the box and press the enter 			key.</b><br>
+	<a href="/cgi-bin/koha/catalogue-home.pl">
+      
+	<img src="/images/front-arrow.gif" width=27 height=22
+	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
+
+	<img src="/images/holder.gif" width=1 height=8
+	alt=" " hspace=0 vspace=0>
+	<p>
+	<!-- TMPL_IF NAME="loggedinuser" -->
+	    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+	<!-- TMPL_ELSE -->
+	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
+	<!-- /TMPL_IF -->
+	</td>
+	</form>
+  </tr>
+
+
+ 
+
+<!--
+  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
+	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
+	alt="Member Login" hspace=0 vspace=0 border=0></td>
+
+  </tr>
+<tr valign=top >
+        <td></td>
+	<form action="/cgi-bin/member.pl" method=get >
+	<td background=" " >
+	<font size=3 face="arial narrow,arial,helvetica">Card number &nbsp;</font></td>
+	<td background=" " ><input type=text size="12" name="card"></td>
+
+  </tr>
+
+  <tr valign=top><td></td>
+	<td></td>
+	<td></td>
+	<td background=" " >
+	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
+	<td background=" " ><input type=password size="12" name="password"><br>
+	<input type=submit value="OK"><br>
+
+	<img src="/images/holder.gif" width=1 height=8
+	alt=" " hspace=0 vspace=0></td>
+	</font>
+ </tr>
+
+  <tr valign=top >
+	<td></td>
+	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
+	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
+	</td>
+	<td>
+	</td>
+
+  </tr>
+
+-->
+</table>
+
+</td>
+  </tr>
+</table>
+<p>
+</center>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
index e69b9c929e..6b39bc961b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
@@ -42,7 +42,7 @@
 <tr><td>&nbsp;</td></tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/authorised_values.pl>Authorised values</a></td>
-	<td>Define categories and authorised values for them.  Authorised values are used in MARC form to limit/help editing MARC biblios.</td>
+	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
 </tr>
 <tr><td>&nbsp;</td></tr>
 <tr>
@@ -64,12 +64,9 @@
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/checkmarc.pl>MARC Check</a></td>
 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
 
-<tr><td>&nbsp;</td></tr>
 <tr>
 <th colspan=2>Various parameters</th>
 </tr>
-<tr><td>&nbsp;</td></tr>
-
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/printers.pl>Printers</a></td>
 	<td>Printers (UNIX paths).</td>
@@ -97,20 +94,18 @@
 </table>
 <table cellspacing=5 cellpadding=1 width="80%">
 	<tr>
-	<th colspan=2>Export</th>
+	<th colspan=2> Export</th>
 	</tr>
 	<tr>
 		<td valign="top" width="25%"><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></td>
-		<td>Exporting in MARC format.</td>
+		<td> Exporting in MARC format.</td>
 	</tr>
 	<tr>
 	<th colspan=2>Import</th>
 	</tr>
 	<tr valign="top">
-		<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</td>
-		<td>The breeding farm is a table where imported MARC records are stored.<br/>
-			A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm.
-			If it is found, the biblio is added to Koha active table and removed from the breeding farm. <br/>
+		<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records in Breeding Farm</a></td>
+		<td>The breeding farm is a table where imported MARC records are stored. A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm.
 		</td>
 	</tr>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
index c99bb602a1..9562452da4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
@@ -91,8 +91,8 @@
 	<tr><td>Bookfund</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></td></tr>
 <!-- /TMPL_IF -->
 
-<tr><td>Start date (<!-- TMPL_VAR NAME=dateformat -->)</td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
-<tr><td>End date (<!-- TMPL_VAR NAME=dateformat -->)</td><td><input type=text name=enddate size=11 value='<!-- TMPL_VAR name="enddate" -->'></td></tr>
+<tr><td>Start date <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
+<tr><td>End date <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=enddate size=11 value='<!-- TMPL_VAR name="enddate" -->'></td></tr>
 <tr><td>Budget amount</td><td><input type=text name=budgetamount value='<!-- TMPL_VAR name="budgetamount" -->'></td></tr>
 <tr><td>&nbsp;</td><td><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->"><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
index 4bb0c3190b..c42c7338a6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
@@ -50,8 +50,7 @@
 <!-- TMPL_IF name="else" -->
 <h1>Authorised values admin</h1>
 <p>This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.</p>
-<p>When you define the MARC subfield structure, you can link a subfield to an authorised-value category. When the user adds or modifies a biblio,
-the subfield is not entered through a free field, but though a list of authorised values.</p>
+<p>When you define the MARC subfield structure, you can link a subfield to an authorised-value category. When the user adds or modifies a biblio, the subfield is not entered through a free field, but though a list of authorised values.</p>
 <form action=/cgi-bin/koha/admin/authorised_values.pl method=post>
 	<!-- TMPL_VAR name="tab_list" --><input type="submit" value="OK">   <a href="authorised_values.pl?op=add_form">New category...</a>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
index 78b55dcaaf..609227fa0f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
 <!-- TMPL_IF name="add" -->
+
 <h1><!-- TMPL_VAR name=head --></h1><br>
 <form action='<!-- TMPL_VAR name=action -->' name=Aform method=post>
 <input type=hidden name=op value='add_validate'>
@@ -56,7 +57,7 @@
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type=submit value='Submit'></td>
+		<td><input type=submit value='Save' class="button"></td>
 	</tr>
 </table>
 </form>
@@ -126,7 +127,7 @@
 					<form action='<!-- TMPL_VAR name=action -->' method=post>
 					<input type='hidden' name='op' value='edit'>
 					<input type='hidden' name='branchcode' value='<!-- TMPL_VAR name=value escape="HTML" -->'>
-					<input type=submit value=Edit class="button">
+					<input type=submit value="Edit" class="button">
 					</form>
 				</td>
 				<td align='left' valign='top'>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
index 63c0f456f4..61f00a8347 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
@@ -192,10 +192,6 @@
 			<td>Fine type</td>
 			<td><!-- TMPL_VAR NAME=finetype --></td>
 		</tr>
-		<tr>
-			<td>Bulk</td>
-			<td><!-- TMPL_VAR NAME=bulk --></td>
-		</tr>
 		<tr>
 			<td>Enrollment fee</td>
 			<td><!-- TMPL_VAR NAME=enrolmentfee --></td>
@@ -237,7 +233,7 @@
 
 <!-- TMPL_IF NAME=delete_confirmed -->
 	Data deleted
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+        <form action='<!-- TMPL_VAR NAME="script_name" -->' method=post>
         <input type=submit value=OK>
         </form>
 
@@ -246,26 +242,25 @@
 <!-- TMPL_IF NAME=else -->
 	<h2>Category admin</h2>
 	<!-- TMPL_IF NAME=searchfield -->
-		You Searched for <!-- TMPL_VAR NAME=searchfield -->
+		You Searched for <!-- TMPL_VAR name=searchfield -->
 	<!-- /TMPL_IF -->
 
-	<form action='<TMP_VAR NAME=script_name>' method=post>
-		<input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
-		<input type=reset name=reset value="clr">
+	<form action='<TMPL_VAR NAME="script_name">' method=post>
+		<input type=text name=description value=<!-- TMPL_VAR name="searchfield" -->>
+		<input type="submit" name="submit" value="OK" class="button">
 	</form>
-	
+
         <table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Category</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Description</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Enrollment</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Enrollment period</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Enrollment fee</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Upper Age Limit</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Age Required</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Fine</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Bulk</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Fee</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Overdue</b></td>
-			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Issue Limit</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Issue limit</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Reserve</b></td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
 			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
@@ -275,12 +270,16 @@
                         <td><!-- TMPL_VAR NAME=categorycode --></td>
                         <td><!-- TMPL_VAR NAME=description --></td>
                         <td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
+                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
                         <td><!-- TMPL_VAR NAME=upperagelimit --></td>
                         <td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
                         <td><!-- TMPL_VAR NAME=finetype --></td>
-                        <td><!-- TMPL_VAR NAME=bulk --></td>
-                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
-                        <td><!-- TMPL_IF NAME=overduenoticerequired -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+                        <td><!-- TMPL_IF NAME=overduenoticerequired -->
+					<i>Yes</i>
+				<!-- TMPL_ELSE -->
+					<i>No</i>
+				<!-- /TMPL_IF -->
+			</td>
                         <td><!-- TMPL_VAR NAME=issuelimit --></td>
                         <td><!-- TMPL_VAR NAME=reservefee --></td>
                         <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
@@ -291,7 +290,7 @@
 	</table>
 	<p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 		<input type=hidden name=op value=add_form>
-		<input type=submit class="button" value="Add Category"  ALT="Add Category"><br>
+		<input type=submit class="button" value="Add category"  ALT="Add category"><br>
 	</form></p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
index f15f73b0fb..bbbf8f789c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl
@@ -268,7 +268,7 @@
                         <td background='/images/background-mem.gif'><b>Bulk</b></td>
                         <td background='/images/background-mem.gif'><b>Fee</b></td>
                         <td background='/images/background-mem.gif'><b>Overdue</b></td>
-                        <td background='/images/background-mem.gif'><b>Issue Limit</b></td>
+                        <td background='/images/background-mem.gif'><b>Issue limit</b></td>
                         <td background='/images/background-mem.gif'><b>Reserve</b></td>
                         <td background='/images/background-mem.gif'> </td>
                         <td background='/images/background-mem.gif'> </td>
@@ -293,7 +293,7 @@
         </table>
         <p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
                 <input type=hidden name=op value=add_form>
-                <input type=submit class="button"  value="Add Category"  ALT="Add Category"><br>
+                <input type=submit class="button"  value="Add category"  ALT="Add category"><br>
         </form></p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl
index c83ac8726b..f8ad898cae 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl
@@ -1,9 +1,8 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <p>
 Each box needs to be filled in with fine,time to start charging,charging cycle<br/>
-eg 1,7,7 = $1 fine, after 7 days, every 7 days</p>
-<p>Note : fines are calculated by the fines2.pl script, located in misc directory.
-Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night
+eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days</p>
+<p>Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night
 </p>
 <form action=/cgi-bin/koha/admin/updatecharges.pl method=post>
 <table border=0>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl
index 990269fc40..70b3b0668d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl
@@ -117,7 +117,7 @@
 <!-- TMPL_IF name="total" -->
 	<tr>
 		<td><b>TOTAL</b></td>
-		<td>You have <!-- TMPL_VAR name="total" --> error(s) in your MARC configuration. Please fix them before using koha</td>
+		<td>You have <b><!-- TMPL_VAR name="total" --></b> error(s) in your MARC configuration. Please fix them before using koha</td>
 	</tr>
 <!-- TMPL_ELSE -->
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
index a19cb1fb7d..2e270d2437 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
@@ -181,8 +181,8 @@
 		<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
 			<td><!-- TMPL_VAR NAME=currency --></td>
 			<td><!-- TMPL_VAR NAME=rate --></td>
-			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=currency -->">Edit</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=currency -->">Delete</a></td>
+			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Edit</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
@@ -201,7 +201,7 @@
 	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Add Currency" alt="Add Currency">
+	<input type=submit class="button" value="Add currency" alt="Add currency">
 	<br>
         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
index 0261d1cf72..a610245463 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
@@ -78,9 +78,23 @@ function Check(f) {
 				<td>Description</td>
 				<td><input type=text name=description size=40 maxlength=80 value='<!-- TMPL_VAR name="description" escape=HTML -->'>&nbsp;</td>
 			</tr>
+			<tr>
+				<td>Not for loan</td>
+				<td>
+					<!-- TMPL_IF name="notforloan" -->
+						<input type=checkbox name=notforloan checked value=1>
+					<!-- TMPL_ELSE -->
+						<input type=checkbox name=notforloan value=1>
+					<!-- /TMPL_IF -->
+					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
+				</td>
+			</tr>
 			<tr>
 				<td>Loan length</td>
-				<td><input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'></td>
+				<td>
+					<input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'>
+					meaningful only if not for loan is not set
+				</td>
 			</tr>
 			<tr>
 				<td>Renewals allowed</td>
@@ -151,7 +165,7 @@ function Check(f) {
 <table width=40%>
 	<tr>
 		<td width="33%">
-			<input type=submit class="button" value="Add Item Type" title="Add item type" alt="Add item type" >
+			<input type=submit class="button" value="Add item type" title="Add item type" alt="Add item type" >
 		</td>
 		<td width=33%><!-- TMPL_IF name="previous" --><a href="<!-- TMPL_VAR name=previous -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0></a><!-- /TMPL_IF --></td>
 		<td width=33%><!-- TMPL_IF name="next" --><a href="<!-- TMPL_VAR name=next -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" ALT="next" BORDER=0></a><!-- /TMPL_IF --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
index 2c1547aa3e..da01fbbf17 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
@@ -163,7 +163,7 @@
 
 <table border=0 cellspacing=0 cellpadding=2>
 <tr valign=top bgcolor=#99cc33>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Tag</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Subfield</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=42%><b>Lib</b></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
index 10c3b3a30a..8fa45707c1 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
@@ -21,8 +21,8 @@
 	<!-- TMPL_LOOP name="loop" -->
 		<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
 		<td><!-- TMPL_VAR name="tagfield" --> - <!-- TMPL_VAR name="tagsubfield" --></td>
-		<td><input type=text name="liblibrarian" value='<!-- TMPL_VAR name="liblibrarian" escape=HTML -->' size=40 maxlength=80><br/>
-				<input type=text name="libopac" value='<!-- TMPL_VAR name="libopac" escape=HTML -->' size=40 maxlength=80></td>
+		<td><input type=text name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" -->" size=40 maxlength=80><br/>
+				<input type=text name="libopac" value="<!-- TMPL_VAR name="libopac" -->" size=40 maxlength=80></td>
 		<td><!-- TMPL_VAR name="repeatable" --></td>
 		<td><!-- TMPL_VAR name="mandatory" --></td>
 		<td><!-- TMPL_VAR name="kohafield" --></td>
@@ -67,16 +67,15 @@
 
 <!-------------------------------------------------------------------------------------------------->
 <!-- TMPL_IF name="else" -->
-<font SIZE=6><em>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></em></font>
-<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit". </p>
-<p>The column <b>Koha field</b> shows that the subfield is linked with a "Koha field". Koha can manage a MARC interface, or a Koha interface. This link ensures that 
-both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
+<h1>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></h1>
+<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
+<p>The column <b>Koha field</b> shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
 
 <table border=0 cellspacing=0 cellpadding=2 width="80%">
 <tr valign=top bgcolor=#99cc33>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Subfield</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=30%><b>Lib</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Rep</b> <span style="font-size:8;color:red" title="subfield may be repeated (1=yes, 0=no)">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Mand</b> <span style="font-size:8;color:red" title="subfield is mandatory (1=yes, 0=no)">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Tab</b> <span style="font-size:8;color:red" title="subfield is shown in which tab (0-9 or item)">?</span></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
index c09a85fcc1..c8737ef42f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
@@ -194,7 +194,7 @@
 	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Add Printer" alt="Add Printer">
+	<input type=submit class="button" value="Add printer" alt="Add printer">
 	<br>
         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
index 110fd892fb..dea46f5309 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
@@ -69,8 +69,8 @@
 	<!-- TMPL_ELSE -->
 		<tr><td>Variable</td><td><input type=text name=variable></td></tr>
 	<!-- /TMPL_IF -->
-	<tr><td>Value</td><td><input type=text name=value value='<!-- TMPL_VAR name="value" escape=HTML -->'></td></tr>
-	<tr><td>Explanation</td><td><input type=text name=explanation size=80 value='<!-- TMPL_VAR name="explanation" escape=HTML -->'></td></tr>
+	<tr><td>Value</td><td><input type=text name=value value="<!-- TMPL_VAR name="value" escape=HTML -->"></td></tr>
+	<tr><td>Explanation</td><td><input type=text name=explanation size=80 value="<!-- TMPL_VAR name="explanation" escape=HTML -->"></td></tr>
 	<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 	</table>
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
index fd193cca6b..29de9dc7c2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
@@ -98,7 +98,7 @@
 	<h1>Thesaurus management</h1>
 	<p>Manages thesaurus and authorities files.<br />
 	<ul>
-		<b>Dig</b>: see data dependent one this one<br />
+		<b>Dig</b>: see data depending of this one<br />
 		<b>Related</b>: see other forms of this authority entry</p>
 	</ul>
 	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
@@ -124,7 +124,7 @@
 		<td>&nbsp;</td>
 		<td><!-- TMPL_VAR name="freelib" --></td>
 		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
-		<td><!-- TMPL_VAR name="dig" -->Dig</a></td>
+		<td><!-- TMPL_VAR name="dig" -->Dig</a>&nbsp;&nbsp;</td>
 		<td><!-- TMPL_VAR name="related" -->Related</a></td>
 		<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
 		<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
@@ -133,21 +133,23 @@
 	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type=hidden name=op value=add_form>
 	</table>
-	<table width=40%>
+	<br/>
+	<table width=40% height="80">
 		<tr>
-			<td width=50%><!-- TMPL_VAR name="previous" --></td>
-			<td width=50%><!-- TMPL_VAR name="next" --></td>
+			<td width=50%><a href="<!-- TMPL_VAR name="previous" -->" class="button">Previous</a></td>
+			<td width=50%><a href="<!-- TMPL_VAR name="next" -->" class="button"> Next</a></td>
 		</tr>
 	</table>
-
+	<br/>
 	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type="hidden" name="op" value="add_form">
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
 	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
 	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->">
-	<br><input type=submit class="button"  value="Add Thesaurus entry" title="Add Thesaurus entry" ALT="Add Thesaurus entry"><br>
+	<br><input type=submit class="button"  value="Add" title="Add Thesaurus entry" ALT="Add Thesaurus entry"><br>
 	</form>
 
+
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
index 28b8ec7083..2fd8cc12b0 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl
@@ -73,7 +73,7 @@
         <!-- TMPL_IF NAME=searchfield -->
                 <h1>Modify Z39.50 Server</h1>
         <!-- TMPL_ELSE -->
-                <h1>Add Z39.50 Server</h1>
+                <h1>Add Z39.50 server</h1>
         <!-- /TMPL_IF -->
         <form action="<!-- TMPL_VAR NAME=script_name -->" name=Aform method=post>
         <input type=hidden name=op value='add_validate'>
@@ -279,7 +279,7 @@
         <!-- /TMPL_iF -->
                 
         <br>
-        <input type=submit class="button" alt="Add Z39.50 server" value="Add Z39.50 Server">
+        <input type=submit class="button" alt="Add Z39.50 server" value="Add Z39.50 server">
         <br>
         </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
index bd3f81745b..f140902636 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
@@ -7,8 +7,7 @@
 
 
 <ul><li><a href=/cgi-bin/koha/stats.pl?time=yesterday>Till Reconciliation:</a> Daily Report (yesterday)
-<li><a href=/cgi-bin/koha/stats.pl?time=today>Till Reconciliation:</a> Daily
-Report (today)
+<li><a href=/cgi-bin/koha/stats.pl?time=today>Till Reconciliation:</a> Daily Report (today)
 <li><a href=/cgi-bin/koha/overdue.pl>Overdue items</a>
 
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
index 9fde83d060..16edd351e4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
@@ -1,7 +1,6 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 <form action="placerequest.pl" method=post>
-<INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=187 BORDER=0 src="<!-- TMPL_VAR name="themelang" -->/images/place-request.gif" align=right >
 <input type=hidden name=biblio value="<!-- TMPL_VAR Name="bib" -->">
 <input type=hidden name=type value=str8>
 <input type=hidden name=title value="<!-- TMPL_VAR Name="title" -->">
@@ -36,16 +35,16 @@
 		<td><!-- TMPL_VAR Name=date --></td>
 		<td><!-- TMPL_VAR name="CGIbranch" --></td>
 		<td>
-			<input type=checkbox name=request value=any>Next Available,<br>(or choose from list below)
+			<input type=checkbox name=request value=any>Next Available, or choose from list below
 		</td>
 	</tr>
 </table>
-
+<INPUT type="submit" value="request" class="button">
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 <TR VALIGN=TOP>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Request</b></TD>
-	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Item Type</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Item type</b></TD>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Classification</b></TD>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Volume</b></TD>
 	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Pubdate</b></TD>
@@ -142,10 +141,10 @@
 					</a>
 				<!-- TMPL_ELSE -->
 					<!-- TMPL_IF Name="constrainttypea" -->
-						Next Available
+						<i>Next Available</i>
 					<!-- TMPL_ELSE -->
 						<!-- TMPL_IF Name="constrainttypeo" -->
-							This type only : <!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="itemtype" -->
+							This type only : <b><!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="itemtype" --></b>
 						<!-- /TMPL_IF -->
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_IF -->
@@ -155,8 +154,9 @@
 	<!-- /TMPL_LOOP -->
 	<tr VALIGN=TOP>
 	<TD colspan=6 align=right>
-	Delete a request by selecting "del" from the rank list.
-	<INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png"></td>
+		Delete a request by selecting "del" from the rank list.
+		<INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png">
+	</td>
 	</tr>
 </table>
 <P>
diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
index 9b12d9ec23..10d6c09f94 100644
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
@@ -4,7 +4,7 @@
     <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 
-<span style="font-size:2em; text-align:left;">MARC Search</span>
+<span style="font-size:2em; text-align:left;">MARC search</span>
 
 <center>
 <form name="f" method="post">
@@ -13,22 +13,22 @@
 <input type="hidden" name="type" value="intranet">
 <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
 
-	<table border=0 cellspacing=0 cellpadding=2 width="80%>
+	<table border=0 cellspacing=0 cellpadding=2 width="100%">
 		<tr align="center">
-			<td colspan=3>
+			<td>
 				<div name="sql">
 				<textarea name="sql" rows=5 cols=60 disabled readonly></textarea>
 				</div>
 			</td>
-			<td colspan=2 bgcolor="#ad11ad" valign="top" align="left">
+			<td bgcolor="#ad11ad" valign="top" align="left">
 				<span style="color:#FFFFFF;">
 					<b>HELP :</b><br/>
-					Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search.
-					Search commits the request and displays the results.
+					Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search. Search commits the request and displays the results.
 				</span>
 			</td>
 		</tr>
-
+	</table>
+	<table border=0 cellspacing=0 cellpadding=2 width="100%">
 		<!-- TMPL_LOOP NAME="statements" -->
 		<tr>
 			<td>
@@ -67,8 +67,8 @@
 
 	<table width="90%">
 	<tr>
-	<td align="left" width="33%"><input type="button" value="Add criteria" onClick="AddStatement()"></td>
-	<td align="middle" width="33%"><input type="submit" value="Search"></td>
+	<td align="left" width="33%"><input type="button" value="Add criteria" onClick="AddStatement()" class="button"></td>
+	<td align="middle" width="33%"><input type="submit" value="Start search" class="button"></td>
 	<td align="right" width="33%">Results per page :
 		<select align="right" name="resultsperpage" size="1">
 			<option value="20">20</option>
diff --git a/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl b/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
index 76948ba51b..109bdc3978 100644
--- a/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
@@ -1,42 +1,48 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<p align=left>Logged in as: <!-- TMPL_VAR Name="loggedinuser" --> [<a href="/cgi-bin/koha/logout.pl">Log Out</a>]</p>
-
-
 <!-- TMPL_IF Name="viewshelf" -->
-    <center>
-    <form>
-    <a href=shelves.pl>Shelf List</a><p>
-    <table border=0 cellpadding=0 cellspacing=0>
-		<tr><td colspan=7>
-			<table>
-			<tr><td>Add a book by barcode:</td><td><input name=addbarcode></td></tr>
-			</table>
-			<br>
-			<table border=0 cellpadding=5 cellspacing=0 width=100%>
-			<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-			<font color=white>Contents of <!-- TMPL_VAR Name="shelfname" --> shelf</font>
-			</th></tr>
-			</table>
-		</td></tr>
+<center>
+<form>
+    <table border=0 cellpadding=2 cellspacing=0>
+    		<tr>
+			<th colspan=4 bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+				<font color=white>Contents of <!-- TMPL_VAR Name="shelfname" --></font>
+			</th>
+		</tr>
 		<!-- TMPL_LOOP Name="itemsloop" -->
 			<tr>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
 				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
-    </table>
-    <br>
-    <input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-    <input type=hidden name=modifyshelfcontents value=1>
-    <input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
-    <input type=submit value="Remove Selected Items">
-    </form>
+	</table>
+	<br>
+	<a href="shelves.pl" class="button">Shelf list</a>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=submit value="Remove Selected Items" class="button">
+</form>
+<form>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<table>
+		<tr>
+			<td>
+				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
+			</td>
+			<td>
+				<input name="addbarcode">
+				<input type=hidden name=modifyshelfcontents value=1>
+				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+				<input type="submit" value="Save" class="button">
+			</td>
+		</tr>
+	</table>
+</form>
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
@@ -48,55 +54,86 @@
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
 		<center>
-		<a href=shelves.pl>Modify Shelf Contents</a><p>
 		<h1>Bookshelves</h1>
 		<table border=0 cellpadding=7>
-			<tr><td align=center>
-				<form method=post>
-				<input type=hidden name=shelves value=1>
-				<table border=0 cellpadding=0 cellspacing=0>
-				<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<font color=white>Select Shelves to Delete</font>
-			</th></tr>
-			<!-- TMPL_LOOP Name="shelvesloop" -->
-				<tr>
-					<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-						<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
-					</td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-    </table>
-    <p><input type=submit value="Delete Shelves"><p>
-    </td><td align=center valign=top>
-    <form method=post>
-    <input type=hidden name=shelves value=1>
-    <p>Add Shelf: <input name=addshelf size=25><p>
-    <p><input type=submit value="Add New Shelf"><p>
-    </form>
-    </td></tr></table>
+			<tr>
+				<td align=center valign="bottom">
+					<form>
+						<p>
+							<a href="shelves.pl" class="button">Shelf list</a>
+						</p>
+					</form>
+				</td>
+				<td align=center valign="bottom">
+					<form method=post>
+					<input type="hidden" name="shelves" value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Select Shelves to Delete</font>
+							</th>
+						</tr>
+						<!-- TMPL_LOOP Name="shelvesloop" -->
+						<tr>
+							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
+								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
+								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
+							</td>
+						</tr>
+						<!-- /TMPL_LOOP -->
+					</table>
+					<p>
+						<input type=submit value="Delete Shelves" class="button"></form>
+					</p>
+				</td>
+				<td align=center valign=bottom>
+					<form method=post>
+					<input type=hidden name=shelves value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Add Shelf</font>
+							</th>
+						</tr>
+						<tr>
+							<td>
+								<p><input name=addshelf size=25></p>
+							</td>
+						</tr>
+					</table>
+								<p><input type=submit value="Add New Shelf" class="button"></p>
+					</form>
+				</td>
+			</tr>
+		</table>
 
 	<!-- TMPL_ELSE -->
 		<center>
 		<table border=0 cellpadding=4 cellspacing=0>
-			<tr><td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<table border=0 cellpadding=5 cellspacing=0 width=100%>
-					<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-					<font color=white>Shelf List</font>
-					</th></tr>
-				</table>
-			</td></tr>
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+					<table border=0 cellpadding=5 cellspacing=0 width=100%>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Shelf List</font>
+							</th>
+						</tr>
+					</table>
+				</td>
+			</tr>
 			<!-- TMPL_LOOP Name="shelvesloop" -->
-				<tr><td bgcolor="<!-- TMPL_VAR Name="color" -->">
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR Name="color" -->">
 					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
 					</a>
-				</td></tr>
+				</td>
+			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		<P><a href=shelves.pl?shelves=1>Add or Remove Book Shelves</a>
+		<P>
+			<a href="shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
+		</p>
 	<!-- /TMPL_IF -->
-
 <!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
index eceb228827..38454d2839 100644
--- a/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
@@ -9,6 +9,7 @@
 		<p>
 			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
 			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
 			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 			<input type="hidden" name="op" value="search">
 			<input type="submit" value="Search">
@@ -18,6 +19,7 @@
 	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
 	<!-- TMPL_VAR name="select_list" -->
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
 	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="op" value="select">
 	<input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
@@ -27,6 +29,7 @@
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
 	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
 	<input type="hidden" name="op" value="add">
 	insert a new authority : <input type="text" name="insert">
 	<input type="submit" name="NEW" value="NEW">
diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl
new file mode 100644
index 0000000000..a83eb6d33c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl
@@ -0,0 +1,48 @@
+<html>
+<head>
+<title>UNIMARC Field 100 builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>Date d'enregistrement </td>
+		<td><input type="text" name="f1" maxlength=8 size=8 value="<!-- TMPL_VAR name="f1" -->"></td>
+	</tr>
+	<tr>
+		<td>Code date publication </td><td><select name="f2" size="1">
+		<option value="a" <!-- TMPL_IF name="f2a" -->SELECTED<!-- /TMPL_IF -->>p?riodique en cours</option>
+			<option value="b" <!-- TMPL_IF name="f2b" -->SELECTED<!-- /TMPL_IF -->>p?riodique mort</option>
+			<option value="c" <!-- TMPL_IF name="f2c" -->SELECTED<!-- /TMPL_IF -->>p?riodique d'?tat inconnu</option>
+			<option value="d" <!-- TMPL_IF name="f2d" -->SELECTED<!-- /TMPL_IF -->>monographie compl?te</option>
+			<option value="e" <!-- TMPL_IF name="f2e" -->SELECTED<!-- /TMPL_IF -->>reproduction</option>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Ann?e d?but</td>
+		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
+	</tr>
+	<tr>
+	<td>Ann?e fin</td>
+	<td><input type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
+	</tr>
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+	function report() {
+		document.f_pop.f1.value=document.f_pop.f1.value+'        ';
+		document.f_pop.f3.value=document.f_pop.f3.value+'    ';
+		document.f_pop.f4.value=document.f_pop.f4.value+'    ';
+		document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
+		document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
+		document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
+
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/about.tmpl b/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
new file mode 100644
index 0000000000..d7b67fd56b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
@@ -0,0 +1,102 @@
+<!-- TMPL_INCLUDE name="about-top.inc" -->
+
+<!-- TMPL_VAR NAME=about -->
+
+<p>Data about the current version sur Koha for bug reports (ou general
+interest).
+
+<center>
+<table border=1>
+	<tr bgcolor="white">
+		<td width=25%>version Koha:</td>
+		<td><!-- TMPL_VAR ESCAPE=HTML NAME=kohaVersion --></td>
+	</tr>
+	<tr bgcolor="white">
+		<td>Version Système (uname -a):</td>
+		<td><!-- TMPL_VAR ESCAPE=HTML NAME=osVersion --></td>
+	</tr>
+	<tr bgcolor="white">
+		<td>version Perl:</td>
+		<td><!-- TMPL_VAR ESCAPE=HTML NAME=perlVersion --></td>
+	</tr>
+	<tr bgcolor="white">
+		<td>version MySQL:</td>
+		<td><!-- TMPL_VAR ESCAPE=HTML NAME=mysqlVersion --></td>
+	</tr>
+	<tr bgcolor="white">
+		<td>version Apache:</td>
+		<td><!-- TMPL_VAR ESCAPE=HTML NAME=apacheVersion --></td>
+	</tr>
+	<tr>
+ 		<td valign="top">Crédits</td>
+		<td>
+			<h3>Equipe principale</h3>
+			<table width=100%>
+				<tr>
+					<td width="50%">
+						Pat Eyler, Kaitiaki<br/>
+						Paul Poulain, 2.0 release manager (MARC developper)<br/>
+						Joshua Ferraro & the Nelsonville Public Library (MARC features funders)<br/>
+						Steve Tonnesen (early MARC work, Rayonnages virtuels concept, KohaCD)<br/>
+						Nicholas Rosasco, (Documentation Compiler)<br/>
+						Mike Hansen<br/>
+						1<br/>
+						Nicolas Morin, Français Translation<br/>
+					</td>
+					<td width="50%" valign="top">
+						<b>Horowhenua Library Trust</b><br/>
+						Rosalie Blake, Head sur Libraries<br/>
+						Jo Ransom<br/>
+						<b>Katipo Communications</b><br/>
+						Rachel Hamilton-Williams, General Manager (Webmistress)<br/>
+						Chris Cormack, 1.2 release manager<br/>
+						et Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
+						Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
+					</td>
+				</tr>
+			</table>
+			<h3>Grâce à</h3>
+			<table width=100%>
+				<tr>
+					<td width="33%">
+						Adam Thick<br/>
+						Andrew Hooper<br/>
+						Al Banks<br/>
+						Ambrose Li<br/>
+						Andrew Arensburger<br/>
+						1<br/>
+						Brig C. McCoy<br/>
+						Daniel Holth<br/>
+						David Strainchamps<br/>
+						Dorian Meid<br/>
+					</td>
+					<td width="33%">
+						Ed Summers<br/>
+						Florian Bischof<br/>
+						Francisco M. Marzoa Alonso<br/>
+						Glen Stewart<br/>
+						Henri-Damien Laurent<br/>
+						Jérome Vizcaino (Esiee Ecole)<br/>
+						Kip DeGraaf<br/>
+						Marco Gaiarin<br/>
+						Md. Aftabuddin<br/>
+						Michaes Herman<br/>
+					</td>
+					<td width="33%">
+						1<br/>
+						Mike Johnson<br/>
+						Mike Mylonas<br/>
+						Pierre Cauchois (Esiee Ecole)<br/>
+						Pawel Skuza (Polonais for 1.2)<br/>
+						Regula Sebastiao<br/>
+						Roger Buck<br/>
+						Ron Wickersham<br/>
+						Sebastiaan Durand<br/>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</center>
+<!-- TMPL_INCLUDE name="about-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
new file mode 100644
index 0000000000..de51088b21
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
@@ -0,0 +1,55 @@
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+
+<FONT SIZE=6><em>Ajout d'une notice biblio</em></FONT><br>
+
+<table bgcolor="#ffcc00" width="80%" cellpadding="5">
+  <tr>
+  <td><FONT SIZE=5>Section Un: Information sur le Copyright </font></td>
+  </tr>
+</table>
+
+<!-- TMPL_IF NAME="ERREUR" -->
+<p />
+<center>
+<font color="#FF0000">Spécifiez un titre</font>
+</center>
+<!-- /TMPL_IF -->
+
+<FORM action="savebiblio.pl" method="post">
+<table align="center">
+<tr>
+<td>Titre: *</td>
+<td><INPUT name="title" size="40" /></td>
+</tr>
+<tr>
+<td>Sous-titre:</td>
+<td><INPUT name="subtitle" size="40" /></td>
+</tr>
+<tr>
+<td>Auteur:</td>
+<td><INPUT name="author" size="40" /></td>
+</tr>
+<tr valign="top">
+<td>Titre Séries:<br />
+<i>(si applicable)</i></td>
+<td><INPUT name="seriestitle" size="40" /></td>
+</tr>
+<tr>
+<td>Date Copyright:</td>
+<td><INPUT name="copyrightdate" size="40" /></td>
+</tr>
+<tr valign="top">
+<td>Résumé:</td>
+<td><textarea cols="30" rows="6" name="abstract"></textarea></td>
+</tr>
+<tr valign="top">
+<td>Notes:</td>
+<td><textarea cols="30" rows="6" name="notes"></textarea></td>
+</tr>
+<tr valign="top">
+<td colspan="2"><center><input type="submit" value="Submit"></center></td>
+</tr>
+</table>
+</FORM>
+* Required
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
index 64ebc5188d..ff038ea179 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
@@ -1,36 +1,40 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<STYLE TYPE="text/css" MEDIA=screen>
+<!--STYLE TYPE="text/css" MEDIA=screen>
 	table {	font-family:Arial;
 	font-weight:normal;
 	text-decoration:none;
 	font-size:10pt;}
-</STYLE>
+</STYLE-->
 
 <form method="post" name="f">
 <table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<th>Notice MARC : <TMPL_VAR name="bibid"></th>
+<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+	<th>Notice biblio MARC : <!-- TMPL_VAR name="bibid" --></th>
 </tr>
 <tr>
 	<td>
 	<table width=100% border=0 colspacing=0 cellpadding=0>
 	<tr>
-		<td width=9% align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(1)"><div id="link1">1</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(2)"><div id="link2">2</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(3)"><div id="link3">3</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(4)"><div id="link4">4</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(5)"><div id="link5">5</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(6)"><div id="link6">6</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(7)"><div id="link7">7</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(8)"><div id="link8">8</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(9)"><div id="link9">9</div></a></td>
-		<td width=10% align="center"><input type="hidden" name="op" value="addbiblio">
+		<td width="8" align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(1)"><div id="link1">1</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(2)"><div id="link2">2</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(3)"><div id="link3">3</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(4)"><div id="link4">4</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(5)"><div id="link5">5</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(6)"><div id="link6">6</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(7)"><div id="link7">7</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(8)"><div id="link8">8</div></a></td>
+		<td width="8" align="center"><a href="javascript:active(9)"><div id="link9">9</div></a></td>
+		<td width="20" align="center"><input type="hidden" name="op" value="addbiblio">
 												<input type="hidden" name="addfield_field">
-												<input type="hidden" name="oldbiblionumber" value="<TMPL_VAR name="oldbiblionumber">">
-												<input type="button" value="Enreg puis Exemplaires" onClick='Check(this.form)' accesskey="w">
-												<a href="javascript:PopupZ3950()">recherche z3950</a>
+												<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="oldbiblionumber" -->">
+												<!-- TMPL_IF name="bibid" -->
+													<input type="button" value="Enregistrer" onClick='Check(this.form)' accesskey="w" class="button">
+												<!-- TMPL_ELSE -->
+													<input type="button" value="Ajouter une notice biblio" onClick='Check(this.form)' accesskey="w" class="button">
+												<!-- /TMPL_IF -->
+												<a href="javascript:PopupZ3950()" class="button">Recherche Z39.50</a>
 		</td>
 	</tr>
 	</table>
@@ -39,286 +43,398 @@
 </table>
    <DIV name="0XX" id="0XX" style="position:absolute;visibility:visible;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="0XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="0XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				&nbsp;
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(1)">
+					<div id="link1"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
+
 		</table>
 		</DIV>
 
 	<DIV name="1XX" id="1XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="1XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="1XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(0)">
+					<div id="link0"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(2)">
+					<div id="link2"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="2XX" id="2XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="2XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="2XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(1)">
+					<div id="link1"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(3)">
+					<div id="link3"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="3XX" id="3XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="3XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="3XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(2)">
+					<div id="link2"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(4)">
+					<div id="link4"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="4XX" id="4XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="4XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="4XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(3)">
+					<div id="link3"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(5)">
+					<div id="link5"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="5XX" id="5XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="5XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="5XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(4)">
+					<div id="link4"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(6)">
+					<div id="link6"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="6XX" id="6XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="6XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="6XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(5)">
+					<div id="link5"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(7)">
+					<div id="link7"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="7XX" id="7XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="7XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="7XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(6)">
+					<div id="link6"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(8)">
+					<div id="link8"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="8XX" id="8XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="8XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="8XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+		<tr>
+			<td width=9% align="center">
+				<a href="javascript:active(7)">
+					<div id="link7"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
+			<td width=9% align="center">
+				<a href="javascript:active(9)">
+					<div id="link9"  class="button">&gt;&gt;&gt;&gt;</div>
+				</a>
+			</td>
+		</tr>
 		</table>
 		</DIV>
 
 	<DIV name="9XX" id="9XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="9XX">
-			<TMPL_IF name="tag">
-				<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<TMPL_VAR name="tag">)">+</a></td></tr>
-			</TMPL_IF>
-			<TMPL_LOOP name="subfield_loop">
+	<!-- TMPL_LOOP name="9XX" -->
+			<!-- TMPL_IF name="tag" -->
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
 					<td width="3%">&nbsp;</td>
-					<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-					<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+					<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+					<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 					<td width="40%">
-						<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">">
-						<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-						<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+						<!-- 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" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 					</td>
 				</tr>
 			</tmpl_loop>
 	</tmpl_loop>
+			<td width=9% align="center">
+				<a href="javascript:active(8)">
+					<div id="link8"  class="button">&lt;&lt;&lt;&lt;</div>
+				</a>
+			</td>
 		</table>
 		</DIV>
 
 	<DIV name="hidden" id="hidden" style="position:absolute;visibility:hidden;width:90%">
 	<table width=90% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="hidden_loop">
+	<!-- TMPL_LOOP name="hidden_loop" -->
 	<tr>
 		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+		<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
+		<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 		<td width="40%">
-			<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">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
+			<!-- 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" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
 		</td>
 	</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	</table>
 	</DIV>
-	<TMPL_IF name="oldbiblionumtagfield">
-		<input type="hidden" name="tag" value="<TMPL_VAR name="oldbiblionumtagfield">">
-		<input type="hidden" name="subfield" value="<TMPL_VAR name="oldbiblionumtagsubfield">">
-		<input type="hidden" name="field_value" value="<TMPL_VAR name="oldbiblionumber">">
-		<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
+	<!-- TMPL_IF name="oldbiblionumtagfield" -->
+		<input type="hidden" name="tag" value="<!-- TMPL_VAR name="oldbiblionumtagfield" -->">
+		<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="oldbiblionumtagsubfield" -->">
+		<input type="hidden" name="field_value" value="<!-- TMPL_VAR name="oldbiblionumber" -->">
 		<input type="hidden" name="mandatory" value="0">
-		<input type="hidden" name="tag" value="<TMPL_VAR name="oldbiblioitemnumtagfield">">
-		<input type="hidden" name="subfield" value="<TMPL_VAR name="oldbiblioitemnumtagsubfield">">
-		<input type="hidden" name="field_value" value="<TMPL_VAR name="oldbiblioitemnumber">">
+		<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+		<input type="hidden" name="tag" value="<!-- TMPL_VAR name="oldbiblioitemnumtagfield" -->">
+		<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="oldbiblioitemnumtagsubfield" -->">
+		<input type="hidden" name="field_value" value="<!-- TMPL_VAR name="oldbiblioitemnumber" -->">
 		<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">">
-	</TMPL_IF>
+		<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+		<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
+	<!-- /TMPL_IF -->
 </form>
 
 
@@ -327,11 +443,11 @@ function active(numlayer)
 {
 	for (i=0; i < 10 ; i++ ) {
 		ong = i+"XX";
-			link = "link"+i;
+		link = "link"+i;
 		if (numlayer==i) {
 			document.getElementById(ong).style.visibility="visible";
 			document.getElementById(link).style.backgroundColor="#11AA11";
-			document.getElementById(link).style.backgroundImage="url(<TMPL_VAR name="themelang">/images/background-mem.gif)";
+			document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif)";
 		} else {
 			document.getElementById(ong).style.visibility="hidden";
 			document.getElementById(link).style.backgroundColor="#FFFFFF";
@@ -356,7 +472,7 @@ function Check(f) {
 	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
+		    // mandatory, ou if something else in the tag is entered
 
 		    if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
 			document.getElementById("error"+i).style.backgroundColor="#FF0000";
@@ -384,18 +500,18 @@ function Check(f) {
 	var total_errors = total_missing_mandatory_tags + total_missing_mandatory_subfields;
 	var alertString2;
 	if (total_errors!=0) {
-		alertString2 = "Saisie invalide pour les raisons suivantes :\n";
+		alertString2 = "Form not submitted because sur the following problem(s)\n";
 		alertString2 += "------------------------------------------------------------------------------------\n\n";
-		alertString2 += "- "+ total_missing_mandatory_tags +" zones obligatoires vides\n";
-		alertString2 += "- "+ total_missing_mandatory_subfields +" sous-zones obligatoires vides (voir sous-zones en gras)";
+		alertString2 += "- "+ total_missing_mandatory_tags +" mandatory tags empty\n";
+		alertString2 += "- "+ total_missing_mandatory_subfields +" mandatory fields empty (see bold subfields)";
 		alert(alertString2);
 	} else {
-		document.f.submit();
+		document.forms[0].submit();
 	}
 }
 function Dopop(link,i) {
 	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=600,height=400,toolbar=false,scrollbars=yes');
+	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=oui');
 }
 
 function PopupZ3950() {
@@ -414,8 +530,9 @@ function PopupZ3950() {
 		    strQuery += "&issn="+document.forms[0].field_value[i].value;
 		}
 	}
-	newin=window.open("../z3950/search.pl?bibid=<TMPL_VAR name="bibid">"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
+	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR name="bibid" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=oui');
 }
+
 function AddField(field) {
 	document.forms[0].op.value = "addfield";
 	document.forms[0].addfield_field.value=field;
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl
index b2d069c88b..0ddd41541b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl
@@ -1,19 +1,19 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
 
-<font size="5"><em>Import et saisie de notices</em></font>
-<TMPL_IF name="noitemsfound">
+<font size="5"><em>Gérer une notice biblio MARC</em></font>
+<!-- TMPL_IF name="noitemsfound" -->
 	<p />
-	<font color="red" size="4">Pas d'exemplaires</font>
-</TMPL_IF>
-<TMPL_IF name="websiteadded">
+	<font color="red" size="4">Pas d'ouvrages trouvés</font>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="websiteadded" -->
 	<p />
-	<font color="red" size="4">Site web ajouté</font>
-</TMPL_IF>
+	<font color="red" size="4">Notice site Web ajoutée</font>
+<!-- /TMPL_IF -->
 
 <p />
 <table bgcolor="#ffcc00" width="80%" cellpadding="3">
 	<tr valign="center">
-	<td><font size="4">Pour ajouter une nouvelle notice, scanner le code barre ou saisir l'ISBN/ISSN/titre de l'ouvrage</font></td>
+	<td><font size="4">Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN.:</font></td>
 	</tr>
 </table>
 <form action="isbnsearch.pl">
@@ -21,20 +21,20 @@
 		<tr valign="top">
 			<td width="5%">ISBN:</td>
 			<td width="20%"><input type="text" name="isbn" /></td>
-			<td width="10%" rowspan=2 valign="middle"><input type="submit" value="Go" /></td>
-			<td rowspan=2>Si l'ouvrage est trouvé dans la table des notices actives, il sera rappelé et pourra être modifié.<br />
-			Si l'ouvrage est trouvé dans le réservoir, il pourra être appelé pour la saisie d'une nouvelle notice active.<br />
-			Sinon, il est possible de créer une notice à partir de 0</td>
+			<td width="10%" rowspan=2 valign="middle"><input type="submit" value="Go" class="button"/></td>
+			<td rowspan=2>Si l'ISBN ou le titre est trouvé dans la table biblio, il sera récupéré et peut être modifié.<br/>
+					Si l'ISBN ou le titre existe déjà dans le réservoir, il va être récupéré et une notice biblio sera ajoutée.<br/>
+					Sinon, une notice biblio peut être créée manuellement.</td>
 		</tr>
 			<td width="5%">Titre</td>
 			<td width="20%"><input type="text" name="title" /></td>
 		</tr>
 		<tr><td>&nbsp;</td>
-			<TMPL_IF NAME="NOTMARC">
-				<td colspan=2><a href=addbiblio-nomarc.pl>Créer une notice vide</a></td></tr>
-			<TMPL_ELSE>
-				<td colspan=2><a href=addbiblio.pl>Créer une notice vide</a></td></tr>
-			</TMPL_IF>
+		<!-- TMPL_IF NAME="NOTMARC" -->
+			<td colspan=2><a href="addbiblio-nomarc.pl" class="button">Créer une notice biblio vide</a></td></tr>
+		<!-- TMPL_ELSE -->
+			<td colspan=2><a href="addbiblio.pl" class="button">Créer une notice biblio vide</a></td></tr>
+		<!-- /TMPL_IF -->
 	</table>
 </form>
 
@@ -43,17 +43,17 @@
 
 <table bgcolor="#ffcc00" width="80%" cellpadding="3">
 	<tr valign="center">
-		<td><FONT SIZE=4>Ajout d'un site web</font></td>
+		<td><FONT SIZE=4>Ajouter un nouveau site Web</font></td>
 	</tr>
 </table>
 <form action="websitesearch.pl" method="post">
 	<table>
 	<tr>
-		<td>mot-clef:</td>
+		<td>Mot-clé:</td>
 		<td><input type="text" name="keyword" /></td>
-		<td><input type="submit" value="Go" /></td>
+		<td><input type="submit" value="Go" class="button"/></td>
 	</tr>
 	</table>
 </FORM>
 <p />
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem-nomarc.tmpl
new file mode 100644
index 0000000000..e1205b9809
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem-nomarc.tmpl
@@ -0,0 +1,210 @@
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+test
+<font size="6"><em><!-- TMPL_VAR NAME="TITRE" --></em></font>
+<p>
+<!-- TMPL_IF NAME="NOBARCODE" -->
+<font size="5" color="red">Vous devez attribuer un code barre à l'ouvrage</font>
+<p>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
+<font size="5" color="red">Vous doit create a new group for your item to be
+added to</font>
+<p>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="BARCODEINUSE" -->
+<font size="5" color="red">Désolé, ce code barre est déjà utilisé</font>
+<p>
+<!-- /TMPL_IF -->
+<table align="left" cellpadding="5" cellspacing="0" border="1" width="220">
+<tr valign="top" bgcolor="#CCCC99">
+<td background="/images/background-mem.gif"><b>Notice bibliographique <!-- TMPL_VAR NAME="BIBNUM" --></b></td>
+</tr>
+<tr valign="top">
+<td><b>Auteur:</b> <!-- TMPL_VAR NAME="AUTEUR" --><br>
+<b>Copyright:</b> <!-- TMPL_VAR NAME="COPYRIGHT" --><br>
+<b>Titre Séries:</b> <!-- TMPL_VAR NAME="SERIES" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="NOTES" --></td>
+</tr>
+<!-- TMPL_LOOP NAME="BIBITEMS" -->
+<!-- TMPL_IF NAME="WEB" -->
+<tr valign="top" bgcolor="#CCCC99">
+<td
+background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP -
+<!-- TMPL_VAR NAME="itemtype" -->
+</b></td>
+</tr>
+<tr valign="top">
+<td><b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
+<b>Date:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></td>
+</tr>
+<!-- TMPL_ELSE -->
+<tr valign="top" bgcolor="#CCCC99">
+<td
+background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="biblioitemnumber" -->
+
+GROUP - <!-- TMPL_VAR NAME="itemtype" --></b></td>
+</tr>
+<tr valign="top">
+<td><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
+<b>Dewey:</b> <!-- TMPL_VAR NAME="dewey" --><br>
+<b>Editeur:</b> <!-- TMPL_VAR NAME="publishercode" --><br>
+<b>Lieu:</b> <!-- TMPL_VAR NAME="place" --><br>
+<b>Date:</b> <!-- TMPL_VAR NAME="publicationyear" --></td>
+</tr>
+<!-- TMPL_LOOP NAME="ITEMS -->
+<tr valign="top" bgcolor="#FFFFCC">
+<td><b>Ouvrage:</b> <!-- TMPL_VAR NAME="barcode" --><br>
+<b>Annexe propriétaire:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --></td>
+</tr>
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+</table>
+<img src="/images/holder.gif" width="16" height="650" align="left">
+
+<center>
+
+<form action="saveitem.pl" method="post">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="BIBNUM" -->">
+<table border="1" cellspacing="0" cellpadding="5">
+<tr valign="top" bgcolor="#CCCC99">
+<td background="/images/background-mem.gif" colspan="2"><b>ADD NEW
+ITEM:</b><br>
+<small><i>Pour une site Web, ajouter uniquement le groupe</i></small></td>
+</tr>
+<tr valign="top">
+<td>Code barre d'un ouvrage:</td>
+<td><input type="text" name="barcode" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Annexe:</td>
+<td><select name="homebranch">
+<!-- TMPL_LOOP NAME="BRANCHES" -->
+<option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+<!-- /TMPL_LOOP -->
+</select></td>
+</tr>
+<tr valign="top">
+<td>Prix Remplacement:</td>
+<td><input type="text" name="replacementprice" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Notes:</td>
+<td><textarea name="itemnotes" cols="30" rows="6"></textarea></td>
+</tr>
+<tr valign="top" bgcolor="#CCCC99">
+<td colspan="2" background="/images/background-mem.gif"><b>Ajouter à un groupe existant:</b></td>
+</tr>
+<tr valign="top">
+<td>Groupe:</td>
+<td><select name="biblioitemnumber">
+
+<!-- TMPL_LOOP NAME="BIBITEMS" -->
+<!-- TMPL_IF NAME="WEB" -->
+<!-- TMPL_ELSE -->
+    <option value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="itemtype" --></option>
+
+<!-- /TMPL_IF -->
+
+<!-- /TMPL_LOOP -->
+</select></td>
+</tr>
+<tr valign="top">
+<td colspan="2" align="center"><input type="submit" name="existinggroup"
+value="Ajouter un nouvel ouvrage au groupe existant"></td>
+</tr>
+<tr valign="top" bgcolor="#CCCC99">
+<td colspan="2" background="/images/background-mem.gif"><b>OU Add to a new
+Groupe:</b></td>
+</tr>
+<tr valign="top">
+<td>Format:</td>
+<td><select name="itemtype">
+<!-- TMPL_LOOP NAME="ITEMTYPES" -->
+<option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
+<!-- /TMPL_LOOP -->
+</select></td>
+</tr>
+<tr valign="top">
+<td>ISBN:</td>
+<td><input name="isbn" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Editeur:</td>
+<td><input name="publishercode" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Année de publication:</td>
+<td><input name="publicationyear" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Lieu de publication:</td>
+<td><input name="place" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Illustrateur:</td>
+<td><INPUT name="illus" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Auteurs supplémentaires:<br><i>Un auteur par ligne</i></td>
+<td><textarea name="additionalauthors" cols="30" rows="6"></textarea></td>
+</tr>
+<tr valign="top">
+<td>Entête sujet:<br><i>Un sujet par ligne</i></td>
+<td><textarea name="subjectheadings" cols="30" rows="6"></textarea></td>
+</tr>
+<tr valign="top">
+<td>URL de site Web:</td>
+<td><INPUT name="url" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Dewey:</td>
+<td><INPUT name="dewey" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Sous-classe Dewey:</td>
+<td><input name="subclass" size="40"></td>
+</tr>
+<tr valign="top">
+<td>ISSN:</td>
+<td><input name="issn" size="40"></td>
+</tr>
+<tr valign="top">
+<td>LCCN:</td>
+<td><input name="lccn" size="40"</td>
+</tr>
+<tr valign="top">
+<td>Volume:</td>
+<td><input name="volume" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Nombre;LIMITED:</td>
+<td><input name="number" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Description Volume:</td>
+<td><input name="volumeddesc" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Pages:</td>
+<td><input name="pages" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Taille:</td>
+<td><input name="size" size="40"></td>
+</tr>
+<tr valign="top">
+<td>Notes:</td>
+<td><textarea name="notes" cols="30" rows="6"></textarea></td>
+</tr>
+<tr valign="top">
+<td colspan="2" align="center"><input type="submit" name="newgroup"
+value="Ajouter un nouvel ouvrage à un nouveau groupe"></td>
+</tr>
+</table>
+
+</form>
+</center>
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl
index 3e02dfdf97..be55db41ce 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl
@@ -1,4 +1,4 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <STYLE TYPE="text/css" MEDIA=screen>
 	table {	font-family:Arial;
 	font-weight:normal;
@@ -7,16 +7,16 @@
 </STYLE>
 <br /><br />
 <form method="post" action="additem.pl" name="f">
-<input type="hidden" name="op" value="<TMPL_VAR name="op">">
-<input type="hidden" name="bibid" value="<TMPL_VAR name="bibid">">
+<input type="hidden" name="op" value="<!-- TMPL_VAR name="op" -->">
+<input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid" -->">
 <table width="80%" align="center" cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 	<td>
 	<table width="100%" border=0 cellpadding=0 cellspacing=0>
 		<tr>
-			<td width=8%><a href="addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">"><img border="0" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png"></a></td>
-			<td width=8%><a href="../detail.pl?bib=<TMPL_VAR name="biblionumber">">Normal</a></td>
-			<td align="center"><b>MARC biblio : <TMPL_VAR name="biblionumber"></b></td>
+			<td width=8%><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"></td>
+			<td width=8%><a href="../detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">Normal</a></td>
+			<td align="center"><b>Notice biblio MARC : <!-- TMPL_VAR name="biblionumber" --></b></td>
 		</tr>
 	</table>
 	</td>
@@ -24,57 +24,59 @@
 </table>
 <br />
 <center>
+
 <DIV name="10XX" id="10XX">
 <table border=1 cellspacing=0 cellpadding=5 width=80%>
-	<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<th>Exemplaires existants</th>
+	<tr  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<th>Ouvrages existant</th>
 	</tr>
 </table>
 <table border=1 cellspacing=0 cellpadding=0 width=80%>
-	<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<TMPL_LOOP name="item_header_loop"><th><tmpl_var name="header_value"></th></TMPL_LOOP><th colspan=2>&nbsp;</th>
+	<tr  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<!-- TMPL_LOOP name="item_header_loop" --><th><tmpl_var name="header_value"></th><!-- /TMPL_LOOP --><th colspan=2>&nbsp;</th>
 	</tr>
-		<TMPL_LOOP name="item_loop">
+		<!-- TMPL_LOOP name="item_loop" -->
 		<tr>
-			<TMPL_VAR name="item_value">
-			<td><a href="additem.pl?op=edititem&bibid=<TMPL_VAR name="bibid">&itemnum=<TMPL_VAR name="itemnum">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border=0></a></td>
-			<td><a href="javascript:confirm_deletion(<TMPL_VAR name="bibid">,<TMPL_VAR name="itemnum">)"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border=0></a></td>
+			<!-- TMPL_VAR name="item_value" -->
+			<td><a href="additem.pl?op=edititem&bibid=<!-- TMPL_VAR name="bibid" -->&itemnum=<!-- TMPL_VAR name="itemnum" -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" border=0></a></td>
+			<td><a href="javascript:confirm_deletion(<!-- TMPL_VAR name="bibid" -->,<!-- TMPL_VAR name="itemnum" -->)"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" border=0></a></td>
 		</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 </table>
 </DIV>
 <br /><br />
+
 <table border=1 cellspacing=0 cellpadding=5 width=80%>
-	<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<th>Exemplaire</th>
+	<tr  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<th>Nouveau ouvrage</th>
 	</tr>
 </table><table width=80%  cellspacing=0 cellpadding=1 border=0>
-	<TMPL_LOOP name="item">
+	<!-- TMPL_LOOP name="item" -->
 	<tr>
 		<td width="3%">&nbsp;</td>
-		<td width="2%"><TMPL_VAR name="subfield"></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
+		<td width="2%"><!-- TMPL_VAR name="subfield" --></td>
+		<td width="55%"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
 		<td width="40%">
-			<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">">
+			<!-- 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" -->">
 		</td>
 	</tr>
 	</tmpl_loop>
 </table>
-<input type="hidden" name="itemnum" value="<TMPL_VAR name="itemnum">">
-<TMPL_IF name="barcode_not_unique">
-	<div id="problem"><b>ERREUR : le code barre existe déjà !<b></div>
-</TMPL_IF>
-<TMPL_IF name="opisadd">
-<input type="button" value="Enregistrer" onClick='Check(this.form)' accesskey="w">
-<TMPL_ELSE>
-<input type="hidden" name="tag" value="<TMPL_VAR name="itemtagfield">">
-<input type="hidden" name="subfield" value="<TMPL_VAR name="itemtagsubfield">">
-<input type="hidden" name="field_value" value="<TMPL_VAR name="itemnum">">
-<input type="button" value="Enregistrer" onClick='Check(this.form)' accesskey="w">
-</TMPL_IF>
+<input type="hidden" name="itemnum" value="<!-- TMPL_VAR name="itemnum" -->">
+<!-- TMPL_IF name="barcode_not_unique" -->
+	<div id="problem"><b>ERREUR: Code barre existe déjà!<b></div>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="opisadd" -->
+<input type="button" value="Ajouter un ouvrage" onClick='Check(this.form)' accesskey="w">
+<!-- TMPL_ELSE -->
+<input type="hidden" name="tag" value="<!-- TMPL_VAR name="itemtagfield" -->">
+<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="itemtagsubfield" -->">
+<input type="hidden" name="field_value" value="<!-- TMPL_VAR name="itemnum" -->">
+<input type="button" value="Modifier ouvrage" onClick='Check(this.form)' accesskey="w">
+<!-- /TMPL_IF -->
 </center>
 </form>
 <script LANGUAGE="JavaScript">
@@ -86,7 +88,7 @@ function active(numlayer)
 		if (numlayer==i) {
 			document.getElementById(ong).style.visibility="visible";
 			document.getElementById(link).style.backgroundColor="#11AA11";
-			document.getElementById(link).style.backgroundImage="url(<TMPL_VAR name="themelang">/images/background-mem.gif)";
+			document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif)";
 		} else {
 			document.getElementById(ong).style.visibility="hidden";
 			document.getElementById(link).style.backgroundColor="#FFFFFF";
@@ -110,18 +112,18 @@ function Check(f) {
 	if (total_errors==0) {
 		document.f.submit();
 	} else {
-		alertString2 = "Formulaire invalide :\n";
+		alertString2 = "Form not submitted because sur the following problem(s)\n";
 		alertString2 += "------------------------------------------------------------------------------------\n\n";
-		alertString2 += "- "+ total_errors+" champs obligatoire laissés vides";
+		alertString2 += "- "+ total_errors+" mandatory fields empty (see bold subfields)";
 		alert(alertString2);
 	}
 }
 function Dopop(link,i) {
 	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
+	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=oui');
 }
 function confirm_deletion(bibid,itemnum) {
-	var is_confirmed = confirm('Confirmez vous la suppression ?');
+	var is_confirmed = confirm('Do you confirm item deletion ?');
 	if (is_confirmed) {
 	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;
 	}
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl
index 14eb2f894d..ae20bbce74 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl
@@ -1,56 +1,64 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-
-<font size="6"><em>R&eacute;sultats recherche de notices</em></font><br />
+  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<font size="6"><em>Résultats de recherche Biblio</em></font><br />
 <CENTER>
-Votre recherche : <b>ISBN <TMPL_VAR name="isbn">,</b> <TMPL_VAR name="count"> r&eacute;sultats trouv&eacute;s <br />
-Affichage des r&eacute;sultats <TMPL_VAR name="showoffset"> &agrave; <TMPL_VAR name="total">
-<TMPL_VAR NAME=total> r&eacute;ponses<br />
-<!-- Row of numbers corresponding to search result pages -->
-<TMPL_IF NAME=displayprev>
-	<a href=isbnsearch.pl?offset=<TMPL_VAR NAME="prevstartfrom">&<TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>><img src=<TMPL_VAR name="themelang">/images/numbers/prev.gif border=0></a>
-<TMPL_ELSE>
-	<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-</TMPL_IF>
-<TMPL_LOOP NAME=numbers>
-	<TMPL_IF NAME=highlight>
-	<img src=<TMPL_VAR name="themelang">/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
-	<TMPL_ELSE>
-	<a href=isbnsearch.pl?offset=<TMPL_VAR NAME=startfrom>&<TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>><img src=<TMPL_VAR name="themelang">/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
-	</TMPL_IF>
-</TMPL_LOOP>
-<TMPL_IF NAME=displaynext>
-	<a href=isbnsearch.pl?offset=<TMPL_VAR NAME="nextstartfrom">&<TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>><img src=<TMPL_VAR name="themelang">/images/numbers/next.gif border=0></a>
-<TMPL_ELSE>
-	<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-</TMPL_IF>
-
-<div align="right">
-<h2><a href="addbiblio.pl?isbn=<TMPL_VAR name="isbn">">Ajouter nouvelle notice</a></h2>
-</div>
+Recherche effectuée sur <b><!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->title <!-- TMPL_VAR name="title" --><!-- /TMPL_IF --></b><br />
+<!-- TMPL_IF name="total" -->
+<!-- TMPL_VAR NAME=total --> Résultats trouvés<br />
+Résultats <i><!-- TMPL_VAR name="showoffset" --></i> to <i><!-- TMPL_VAR name="total" --></i> affiché
+<!-- /TMPL_IF -->
 <p />
-<table width="80%" border="0" cellspacing="0" cellpadding="5">
-<tr valign=top bgcolor=#ffcc00>
-<td><b>Titre</b></td>
-<td><b>Auteur</b></td>
-<td><b>Année</b></td>
-<td><b>&nbsp;</b></td>
+<!-- Row sur numbers corresponding to search result pages -->
+<!-- TMPL_IF NAME=displayprev -->
+	<a href=isbnsearch.pl?offset=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/prev.gif border=0></a>
+<!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+<!-- /TMPL_IF -->
+<!-- TMPL_LOOP NAME=numbers -->
+	<!-- TMPL_IF NAME=highlight -->
+	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif>
+	<!-- TMPL_ELSE -->
+	<a href=isbnsearch.pl?offset=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0></a>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+<!-- TMPL_IF NAME=displaynext -->
+	<a href=isbnsearch.pl?offset=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/next.gif border=0></a>
+<!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+<!-- /TMPL_IF -->
 
-</tr>
-
-<TMPL_LOOP name="loop">
-	<tr valign="top" bgcolor="<TMPL_VAR name="toggle">">
-	<td><TMPL_VAR name="title"></a>
-	<td><TMPL_VAR name="author"></td>
-	<td><TMPL_VAR name="copyrightdate"></td>
-	<td><a href="addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">">Editer...</a></td>
+<table width="80%" cellpadding="3">
+	<tr valign="center">
+	<td><font size="4">Notices bibliographiques dans Koha</font></td>
 	</tr>
-</TMPL_LOOP>
 </table>
-<br />
+<table border="0" cellspacing="0" cellpadding="5" width="80%">
+	<tr valign=top bgcolor=#ffcc00>
+		<td><b>Titre</b></td>
+		<td><b>Auteur</b></td>
+		<td><b>&copy;</b></td>
+		<td>&nbsp;</td>
+	</tr>
+	<!-- TMPL_IF name="loop" -->
+	<!-- TMPL_LOOP name="loop" -->
+		<tr valign="top" bgcolor="<!-- TMPL_VAR name="toggle" -->">
+			<td><!-- TMPL_VAR name="title" --></a>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td><!-- TMPL_VAR name="copyrightdate" --></td>
+			<!-- TMPL_IF NAME="NOTMARC" -->
+			  <td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Ajouter items</a></td>
+			<!-- TMPL_ELSE -->
+			  <td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->">Editer...</a></td>
+			<!-- /TMPL_IF -->
+		</tr>
+	<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+	<tr><td colspan=4>Rien trouvé</td></tr>
+	<!-- /TMPL_IF -->
+</table>
 <br />
 <table width="80%" cellpadding="3">
 	<tr valign="center">
-	<td><font size="4">Notices dans le réservoir</font></td>
+	<td><font size="4">Notices bibliographiques dans le réservoir</font></td>
 	</tr>
 </table>
 <table border="0" cellspacing="0" cellpadding="5" width="80%">
@@ -58,26 +66,39 @@ Affichage des r&eacute;sultats <TMPL_VAR name="showoffset"> &agrave; <TMPL_VAR n
 		<td><b>Titre</b></td>
 		<td><b>Auteur</b></td>
 		<td><b>ISBN</b></td>
-		<td><b>vient de </b></td>
+		<td><b>provenant de</b></td>
 		<td><b>&nbsp;</b></td>
 		<td>&nbsp;</td>
 	</tr>
-	<TMPL_LOOP name="breeding_loop">
-		<tr valign="top" bgcolor="<TMPL_VAR name="toggle">">
-			<td><TMPL_VAR name="title"></a>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="isbn"></td>
-			<td><TMPL_VAR name="file"></td>
-			<td><a href="addbiblio.pl?breedingid=<TMPL_VAR name="id">">créer notice</a></td>
+	<!-- TMPL_IF name="breeding_loop" -->
+	<!-- TMPL_LOOP name="breeding_loop" -->
+		<tr valign="top" bgcolor="<!-- TMPL_VAR name="toggle" -->">
+			<td><!-- TMPL_VAR name="title" --></a>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td><!-- TMPL_VAR name="isbn" --></td>
+			<td><!-- TMPL_VAR name="file" --></td>
+			<!-- TMPL_IF NAME="NOTMARC" -->
+			
+			<!-- TMPL_ELSE -->
+			<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR name="id" -->">Ajouter une notice biblio</a></td>
+			<!-- /TMPL_IF -->
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+	<tr><td colspan=6>Rien trouvé</td></tr>
+	<!-- /TMPL_IF -->
 	<tr>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
-		<td><a href="addbiblio.pl?isbn=<TMPL_VAR name="isbn">">Créer notice vierge</a></td>
+		<!-- TMPL_IF NAME="NOTMARC" -->
+		<td><a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR name="isbn" -->">Ajouter New Biblio</a></td>
+		<!-- TMPL_ELSE -->
+		<td><a href="addbiblio.pl?isbn=<!-- TMPL_VAR name="isbn" -->">Ajouter New Biblio</a></td>
+		<!-- /TMPL_IF -->
 	</tr>
 </table>
 
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+<br />
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl
new file mode 100644
index 0000000000..4c06b2b948
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl
@@ -0,0 +1,60 @@
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<h1>Système d'acquisition MARC</h1>
+
+<table bgcolor="#ffcc00" width="80%" cellpadding="3">
+	<tr valign="center">
+	<td><font size="4">Importer vers le réservoir</font></td>
+	</tr>
+</table>
+
+<!-- TMPL_IF name="uploadmarc" -->
+<p>Résultats de l'importation :</p>
+<ul>
+	<p><!-- TMPL_VAR name="imported" --> notices importées</p>
+	<p><!-- TMPL_VAR name="alreadyindb" --> pas importé, car déjà existant dans la base de données</p>
+	<p><!-- TMPL_VAR name="alreadyinfarm" --> pas importé, car déjà existant dans le réservoir</p>
+	<p><!-- TMPL_VAR name="notmarcrecord" --> pas importé, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) !</p>
+	<p><!-- TMPL_VAR name="total" -->  enregistrements étudiés</p>
+	<p><a href="addbooks.pl">Retour vers acquisition</a>
+</ul>
+<!-- TMPL_ELSE -->
+<ul>
+	<li>Sélectionner un fichier à importer dans le réservoir. Il sera analysé et pour chaque ISBN trouvé, une entrée enfant sera créée dans le réservoir.</li>
+	<li>Si un ISBN existe déjà dans le réservoir, vous pouvez soit ignorer le nouveau, soit écrire par dessus l'ancien.</li>
+	<li>Vous pouvez nommer ce fichier d'importation. Cela peut servir lors de la création de notice biblio pour se souvenir d'où viennent les données MARC par défaut.</li>
+	<li>Si l'ISBN existe déjà dans la base active, la notice biblio sera ignorée.</li>
+</ul>
+<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
+<table cellpadding="3" border=0>
+	<tr valign="top">
+		<td>Sélectionner le fichier à importer:</td>
+		<td>
+			<input type="file" name="uploadmarc"/><br/>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td>Nom de ce fichier d'importation:</td>
+		<td>
+			<input type="text" name="filename"/><br/>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td>Codage des caractères (MARC21 ou UNIMARC)</td>
+		<td>
+			<select name="syntax"/><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td>Si un ISBN existe déjà dans le réservoir: </td>
+		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignorer celui-là, conserver l'existant<br/>
+			<input type="radio" name="overwrite_biblio" value="1">Ecrire par dessus l'actuel avec cet</td>
+	</tr>
+	<tr valign="top">
+		<td>&nbsp; </td>
+		<td><input type="submit" value="Importer"></td>
+	</tr>
+
+</table>
+</form>
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl
index 92160f17de..6c6068c2b4 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl
@@ -1,15 +1,15 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<FONT SIZE=6><em>Acquisitions</em></FONT><br>
+<h1>Acquisitions</h1><br>
 
-<TABLE width="50%" cellspacing=0 cellpadding=5 border=1 >
+<TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=1 >
 <TR VALIGN=TOP>
 	<TD  bgcolor="ffdf61" colspan=2>
-		<b>Débuter, réceptionner, modifier une commande</b>
+		<b>COMMENCER, RECEVOIR, MODIFIER UNE COMMANDE</b>
 	</TD>
 </TR>
 <TR VALIGN=TOP>
-	<TD>N° ou nom du vendeur</TD>
+	<TD>Nom du fournisseur</TD>
 	<TD>
 		<form action="/cgi-bin/koha/acqui/order.pl" method=post>
 		<INPUT TYPE="text"  SIZE="25"   NAME="supplier">
@@ -17,80 +17,99 @@
 	</TD>
 </TR>
 </table>
-<br />
-<!-- showbudget-->
-<TABLE  align="left" width="40%"  cellspacing=0 cellpadding=5 border=1 >
-<FORM ACTION="/cgi-bin/koha/search.pl">
+<TABLE width="40%" cellspacing=0 cellpadding=5 border=1 >
 <TR VALIGN=TOP>
-	<TD  bgcolor="ffdf61" colspan=2><b>Budgets</b></TD>
+	<TD  bgcolor="ffdf61" colspan=2>
+		<b>RECEPTIONNE OU MODIFIE UNE COMMANDE PERIODIQUE</b>
+	</TD>
 </TR>
 <TR VALIGN=TOP>
-	<TD colspan=2>
-		<table cellspacing=0 cellpadding=2 border=1>
-			<tr>
-				<td><b>Budgets</B></TD>
-				<TD><b>Total</B></TD>
-				<TD><b>Dépensé</B></TD>
-				<TD><b>Engagé</B></TD>
-				<TD><b>Dispo</B></TD>
-			</TR>
-			<TMPL_LOOP name="loop_budget">
-				<tr>
-					<td><TMPL_VAR name="bookfundname"></TD>
-					<TD><TMPL_VAR name="budgetamount"></TD>
-					<TD><TMPL_VAR name="spent"></TD>
-					<TD><TMPL_VAR name="comtd"></TD>
-					<TD><TMPL_VAR name="avail"></TD>
-				</TR>
-			</TMPL_LOOP>
-			<tr>
-				<td><b>Total</b></TD>
-				<TD><b><TMPL_VAR name="total"></b></TD>
-				<TD><b><TMPL_VAR name="totspent"></b></TD>
-				<TD><b><TMPL_VAR name="totcomtd"></b></TD>
-				<TD><b><TMPL_VAR name="totavail"></b></TD>
-			</TR>
-		</table><br>
-		Utiliser la fonction "mise à jour" (ctrl-r) pour mettre à jour les valeurs.
-		Les montants engagés sont approximatifs, ils varient en fonction des taux de change.
+	<TD>Recherche Titre</TD>
+	<TD>
+		<FORM ACTION="/cgi-bin/koha/acqui/acquire.pl" method=post>
+		<INPUT TYPE="text"  SIZE="25"   NAME="recieve">
+		</form>
 	</TD>
 </TR>
-</form>
 </table>
+
+<br />
+
 <!-- currencies-->
-<TABLE cellspacing=0 cellpadding=5 border=1 >
+<TABLE align="left" cellspacing=0 cellpadding=5 border=1 >
 	<FORM ACTION="/cgi-bin/koha/currency.pl">
 	<input type=hidden name=type value=change>
 	<TR VALIGN=TOP>
-		<TD  bgcolor="ffdf61" colspan=2><b>Taux de change</b></TD>
+		<TD  bgcolor="ffdf61" colspan=2><b>TAUX DE CHANGE </b></TD>
 	</TR>
-	<TMPL_LOOP name="loop_currency">
+	<!-- TMPL_LOOP name="loop_currency" -->
 		<TR VALIGN=TOP>
 			<TD>
-				<TMPL_VAR name="currency">
+				<!-- TMPL_VAR name="currency" -->
 			</td>
 			<td>
-				<INPUT TYPE="text"  SIZE="10"   NAME="<TMPL_VAR name="currency">" value=<TMPL_VAR name="rate">>
+				<INPUT TYPE="text"  SIZE="10"   NAME="<!-- TMPL_VAR name="currency" -->" value=<!-- TMPL_VAR name="rate" -->>
 			</td>
 		</TR>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	<tr>
-		<td colspan=2 align="center"><input type=submit value="Save"></TD>
+		<td colspan=2 align="center"><input type=submit value="Enregistrer"></TD>
 	</tr>
 	</form>
 </table>
 
+<!-- showbudget-->
+<TABLE  width="40%"  cellspacing=0 cellpadding=5 border=1 >
+<FORM ACTION="/cgi-bin/koha/search.pl">
+<TR VALIGN=TOP>
+	<TD  bgcolor="ffdf61" colspan=2><b>BUDGETS ET COMPTES</b></TD>
+</TR>
+<TR VALIGN=TOP>
+	<TD colspan=2>
+		<table cellspacing=0 cellpadding=2 border=1>
+			<tr>
+				<td><b>Budgets</B></TD>
+				<TD><b> Total</B></TD>
+				<TD><b>Dépensé</B></TD>
+				<TD><b>Engagé</B></TD>
+				<TD><b>Disp.</B></TD>
+			</TR>
+			<!-- TMPL_LOOP name="loop_budget" -->
+				<tr>
+					<td><!-- TMPL_VAR name="bookfundname" --></TD>
+					<TD align=right><!-- TMPL_VAR name="budgetamount" --></TD>
+					<TD align=right><!-- TMPL_VAR name="spent" --></TD>
+					<TD align=right><!-- TMPL_VAR name="comtd" --></TD>
+					<TD align=right><!-- TMPL_VAR name="avail" --></TD>
+				</TR>
+			<!-- /TMPL_LOOP -->
+			<tr>
+				<td><b> Total</b></TD>
+				<TD align=right><b><!-- TMPL_VAR name="total" --></b></TD>
+				<TD align=right><b><!-- TMPL_VAR name="totspent" --></b></TD>
+				<TD align=right><b><!-- TMPL_VAR name="totcomtd" --></b></TD>
+				<TD align=right><b><!-- TMPL_VAR name="totavail" --></b></TD>
+			</TR>
+		</table>
+		<p>
+		Rafraichissez la page pour avoir les derniers chiffres. Les montants engagés sont approximatifs, car les taux de change peuvent modifier le montant effectivement payé.
+		</p>
+	</TD>
+</TR>
+</form>
+</table>
+
 <br />
 <TABLE cellspacing=0 cellpadding=5 border=1 >
 <TR VALIGN=TOP>
 	<TD  bgcolor="ffdf61" colspan=2>
-		<b>Aide</b><br>
-		<b>Commande:</b> <p>Pour débuter une acquisition, chercher tout d'abord le vendeur. Vous pourrez ensuite créer un nouveau "panier".</p>
-		<p>Pour commander un exemplaire, vous devez vérifier qu'une notice existe déjà, et soit ajouter un exemplaire, soit créer une nouvelle notice et y ajouter un exemplaire</p>
-		<p>Pour commencer un nouveau panier avec un nouveau fournisseur, revenez à cette page, et passez par la recherche d'un fournisseur</p>
-		<p>Pour cloturer un panier, cliquer sur "voir panier", et choisir "confirmer panier"</p>
+		<p><b>AIDE commande:</b></p>
+		<ul>Pour faire une acquisition, soit par commande, par achat direct ou par un don, commencer par rechercher le fournisseur. Ajoutez-en un si nécessaire.</ul>
+		<ul>Sélectionnez ensuite un panier ou créez-en un nouveau. Note: le panier sera rattaché à cet utilisateur </ul>
+		<ul>Pour commander un ouvrage, une notice biblio doit exister pour l'ajouter ou alors il faut d'abord créer une nouvelle notice biblio avant de l'ajouter.  </ul>
+		<p>Pour quittez un panier, cliquez sur "Voir les paniers" ou Recherche ci-dessus, puis cliquez sur "Confirmer le panier".</p>
 	</td>
 </TR>
 </table>
 
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl
index 0bfbba371b..854b09bb89 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl
@@ -1,15 +1,15 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
 <div align=right>
-Facture : <TMPL_VAR name="invoice"><br>
-Réceptionnée par : <TMPL_VAR name="user"><br>
-<TMPL_VAR name="date">
+Facture: <!-- TMPL_VAR name="invoice" --><br>
+Reçu par: <!-- TMPL_VAR name="user" --><br>
+<!-- TMPL_VAR name="date" -->
 </div>
-<FONT SIZE=6><em>Réception pour : <TMPL_VAR name="name"> facture, <TMPL_VAR name="invoice"></em></FONT>
+<h1>Sommaire pour: <i><!-- TMPL_VAR name="name" --></i> Facture <i><!-- TMPL_VAR name="invoice" --></i></h1>
 <CENTER>
 
 
-<TMPL_IF name="count">
+<!-- TMPL_IF name="count" -->
 	<script language="javascript" type="text/javascript">
 	<!--
 	function messenger(X,Y,etc){
@@ -24,51 +24,51 @@ R
 	//-->
 	</script>
 	<form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
-	<FONT SIZE=6><em><TMPL_VAR name="ordernumber"> - Receive Order</em></FONT><br>
-	Panier pour : <TMPL_VAR name="name">
-	<br> Commande passée le : <TMPL_VAR name="date">
+	<h1><!-- TMPL_VAR name="ordernumber" --> - Recevoir Commande</h1><br>
+	Panier pour: <!-- TMPL_VAR name="name" -->
+	<br> Commande envoyée: <!-- TMPL_VAR name="date" -->
 	<P>
 	<CENTER>
 	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
 		<tr valign=top bgcolor=#99cc33>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2>
-				<B>Détail catalogue </B>
+			<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2>
+				<B>DETAILS CATALOGUE</B>
 			</td>
 		</tr>
 		<TR VALIGN=TOP>
 			<TD><b>Titre *</b></td>
-			<td><input type=text size=20 name=title value="<TMPL_VAR name="title">" >
+			<td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->" >
 			</td>
 		</tr>
 		<TR VALIGN=TOP>
 			<TD>Auteur</td>
-			<td><input type=text size=20 name=author value="<TMPL_VAR name="author">" >
+			<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
 			</td>
 		</tr>
 		<TR VALIGN=TOP>
-			<TD>Copyright</td>
-			<td><input type=text size=20 name=copyright value="<TMPL_VAR name="copyrightdate">" >
+			<TD>Date Copyright</td>
+			<td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->" >
 			</td>
 		</tr>
 		<TR VALIGN=TOP>
 			<TD>Format</td>
-			<td><TMPL_VAR name="CGIitemtype"></td>
+			<td><!-- TMPL_VAR name="CGIitemtype" --></td>
 		</tr>
 		<TR VALIGN=TOP>
 			<TD>ISBN</td>
-			<td><input type=text size=20 name=ISBN value="<TMPL_VAR name="isbn">"></td>
+			<td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
 		</tr>
 		<TR VALIGN=TOP>
-			<TD>titre périodique</td>
-			<td><input type=text size=20 name=Series value="<TMPL_VAR name="seriestitle">"></td>
+			<TD>Séries</td>
+			<td><input type=text size=20 name=Séries value="<!-- TMPL_VAR name="seriestitle" -->"></td>
 		</tr>
 		<TR VALIGN=TOP>
-			<TD>Site</td>
-			<td><TMPL_VAR name="CGIbranch"></td>
+			<TD>Annexe</td>
+			<td><!-- TMPL_VAR name="CGIbranch" --></td>
 		</tr>
 		<TR VALIGN=TOP bgcolor=#ffffcc >
-			<TD><B>code barre exemplaire *</B></td>
-			<td><input type=text size=20 name=barcode value="<TMPL_VAR name="barcode">"></td>
+			<TD><B>Code barre d'un ouvrage *</B></td>
+			<td><input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->"></td>
 		</tr>
 		<TR VALIGN=TOP bgcolor=#ffffcc >
 			<TD><B>Info Volume (pour périodiques) *</B></td>
@@ -76,87 +76,87 @@ R
 		</tr>
 		<TR VALIGN=TOP>
 			<td colspan=2 align="center">
-				<input type=hidden name=biblio value=<TMPL_VAR name="biblionumber">>
-				<input type=hidden name=ordnum value=<TMPL_VAR name="ordernumber">>
-				<input type=hidden name=biblioitemnum value=<TMPL_VAR name="biblioitemnumber">>
-				<input type=hidden name=id value="<TMPL_VAR name="booksellerid">">
-				<input type=hidden name=freight value="<TMPL_VAR name="freight">">
-				<input type=hidden name=gst value="<TMPL_VAR name="gst">">
-				<TMPL_IF name="catview">
-					<input type=image  name=submit src="/<TMPL_VAR name="theme">/images/filesave.png" border=0 title="continue" alt="save" border=0 border=0>
-				<TMPL_ELSE>
-					<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">><img src="/<TMPL_VAR name="theme">/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0></a>
-				</TMPL_IF>
+				<input type=hidden name=biblio value=<!-- TMPL_VAR name="biblionumber" -->>
+				<input type=hidden name=ordnum value=<!-- TMPL_VAR name="ordernumber" -->>
+				<input type=hidden name=biblioitemnum value=<!-- TMPL_VAR name="biblioitemnumber" -->>
+				<input type=hidden name=id value="<!-- TMPL_VAR name="booksellerid" -->">
+				<input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
+				<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
+				<!-- TMPL_IF name="catview" -->
+					<input type="submit" class="button" value="Enregistrer">
+				<!-- TMPL_ELSE -->
+					<a class="button" href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->>Editer</a>
+				<!-- /TMPL_IF -->
 			</td>
 		</tr>
 	</table>
 	<table border=1 cellspacing=0 cellpadding=5 width="40%">
 		<tr valign=top bgcolor=#99cc33>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>Détails financiers</B></td>
+			<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>DETAILS COMPTABILITE</B></td>
 		</tr>
 		<TR VALIGN=TOP>
-			<TD><B>Fonds *</B></td>
-			<td><TMPL_VAR name="CGIbookfund">
+			<TD><B>Comptes *</B></td>
+			<td><!-- TMPL_VAR name="CGIbookfund" -->
 		</tr>
 		<TR VALIGN=TOP>
 			<TD>Quantité commandée</td>
-			<td><input type=text size=20 name=quantity value="<TMPL_VAR name="quantity">">
+			<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->">
 			</td>
 		</tr>
 		<TR VALIGN=TOP bgcolor=#ffffcc>
-			<TD><B>Quantité Reçue *</B></td>
-			<td><input type=text size=20 name=quantityrec value="<TMPL_VAR name="quantityreceived">">
+			<TD><B>Quantité reçue *</B></td>
+			<td><input type=text size=20 name=quantityrec value="<!-- TMPL_VAR name="quantityreceived" -->">
 			</td>
 		</tr>
 		<TR VALIGN=TOP>
-			<TD>Cout remplacement</td>
-			<td><input type=text size=20 name=rrp value="<TMPL_VAR name="rrp">">
+			<TD>Frais Remplacement</td>
+			<td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->">
 		</tr>
 		<TR VALIGN=TOP>
-			<TD>cout budgété</td>
-			<td><input type=text size=20 name=ecost value="<TMPL_VAR name="ecost">"></td>
+			<TD>Coûts budgetés </td>
+			<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->"></td>
 		</tr>
 		<TR VALIGN=TOP bgcolor=#ffffcc>
-			<TD><B>Cout réel *</B></td>
-			<td><input type=text size=20 name=cost value="<TMPL_VAR name="unitprice">"></td>
+			<TD><B>Coût effectif *</B></td>
+			<td><input type=text size=20 name=cost value="<!-- TMPL_VAR name="unitprice" -->"></td>
 		</tr>
 		<TR VALIGN=TOP bgcolor=#ffffcc>
-			<TD>Facture N°</td>
+			<TD>N° facture</td>
 			<td>
-				<TMPL_VAR name="invoice">
-				<input type=hidden name=invoice value="<TMPL_VAR name="invoice">">
+				<!-- TMPL_VAR name="invoice" -->
+				<input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
 			</td>
 		</tr>
 		<TR VALIGN=TOP>
 			<TD>Notes</td>
-			<td><input type=text size=20 name=notes value="<TMPL_VAR name="notes">"></td>
+			<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
 		</tr>
 	</table>
 	</form>
 	</center>
 	<br clear=all>
 	<p> &nbsp; </p>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<br />
 	<center>
 	<table width=80%>
 	<tr valign=top bgcolor="#ffdf61">
 		<td><b>Panier</b></td>
 		<td><b>ISBN</b></td>
-		<td><b>TITLE</b></td>
+		<td><b>TITRE</b></td>
 		<td><b>AUTEUR</b></td>
-		<td><b>Qté</b></td>
+		<td><b>Quantité</b></td>
 		<td><b>Reçu</b></td>
 	</tr>
-	<TMPL_LOOP name="loop">
+	<!-- TMPL_LOOP name="loop" -->
 		<tr>
-			<TD><TMPL_VAR name="basketno"></td>
-			<TD><TMPL_VAR name="isbn"></td>
-			<td><a href=acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&freight=<TMPL_VAR name="freight">&gst=<TMPL_VAR name="gst">&id=<TMPL_VAR name="id">><TMPL_VAR name="title"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="quantity"></td>
-			<td><TMPL_VAR name="quantityrecieved"></td>
-		</tr>
-	</TMPL_LOOP>
+			<TD><!-- TMPL_VAR name="basketno" --></td>
+			<TD><!-- TMPL_VAR name="isbn" --></td>
+			<td><a href=acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&freight=<!-- TMPL_VAR name="freight" -->&gst=<!-- TMPL_VAR name="gst" -->&id=<!-- TMPL_VAR name="id" -->><!-- TMPL_VAR name="title" --></a></td>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td><!-- TMPL_VAR name="quantity" --></td>
+			<td><!-- TMPL_VAR name="quantityrecieved" --></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
index 7423092354..71520383dd 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl
@@ -1,58 +1,58 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<FONT SIZE=6><em>Panier <TMPL_VAR name="basket"> pour <a href=supplier.pl?id=<TMPL_VAR name="booksellerid">></a> <TMPL_VAR name="name"></em></FONT><br />
-(Référence: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, passée par : <TMPL_VAR name="authorisedby">)<br />
+<h1>Panier <b><!-- TMPL_VAR name="basket" --> </b>pour <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
+Notre ref: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b> validée par <b><!-- TMPL_VAR name="loggedinusername" --></b><br />
 <CENTER>
 <p>
 <table border=0 cellspacing=0 cellpadding=5>
 	<tr valign=top bgcolor="#ffdf61">
-		<td width="5%"><b>N° cmde</b></td>
+		<td width="5%"><b>Commande</b></td>
+		<td width="10%"><b> Editeur</b></td>
 		<td width="10%"><b>Isbn</b></td>
 		<td width="30%"><b>Titre</b></td>
 		<td width="20%"><b>Auteur</b></td>
-		<td width="6%"><b>Px rempl</b></td>
-		<td width="8%"><b>Px est</b></td>
-		<td width="8%"><b>Qté</b></td>
-		<td width="8%"><b>Recu</b></td>
-		<td width="8%"><b>Total</b></td>
+		<td width="5%"><b>$ rrp</b></td>
+		<td width="7%"><b>$est</b></td>
+		<td width="7%"><b>Quantité</b></td>
+		<td width="7%"><b> Total</b></td>
 	</tr>
-	<TMPL_LOOP name="books_loop">
-		<tr valign=top bgcolor="<TMPL_VAR name="color">">
-			<td><TMPL_VAR name="ordernumber"></td>
-			<td><TMPL_VAR name="isbn"></td>
-			<td><a href="newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">&basket=<TMPL_VAR name="basket">"><TMPL_VAR name="title"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="rrp"></td>
-			<td><TMPL_VAR name="ecost"></td>
-			<td><TMPL_VAR name="quantity"></td>
-			<td><TMPL_VAR name="quantityrecieved"></td>
-			<td><TMPL_VAR name="line_total"></td>
+	<!-- TMPL_LOOP name="books_loop" -->
+		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
+			<td><!-- TMPL_VAR name="ordernumber" --></td>
+			<td><!-- TMPL_VAR name="publishercode" --></td>
+			<td><!-- TMPL_VAR name="isbn" --></td>
+			<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td><!-- TMPL_VAR name="rrp" --></td>
+			<td><!-- TMPL_VAR name="ecost" --></td>
+			<td><!-- TMPL_VAR name="quantity" --></td>
+			<td><!-- TMPL_VAR name="line_total" --></td>
 		</tr>
-	</TMPL_LOOP>
-	<input type=hidden name=number value=<TMPL_VAR name="count">>
-	<input type=hidden name=basketno value="<TMPL_VAR name="basket">">
+	<!-- /TMPL_LOOP -->
+	<input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
+	<input type=hidden name=basketno value="<!-- TMPL_VAR name="basket" -->">
 	<tr valign=top bgcolor=white>
 		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
   			<b>AIDE</b><br>
-			Pour changer un élément de cataloguage ou de comptabilité attaché à une commande, cliquer sur le titre<br>
+			Pour changer n'importe quelle information attachée à cette commande, cliquez sur le titre.<br>
 		</td>
-  		<td><b>Sous-Total</b></td>
-  		<td><TMPL_VAR name="currency"><input type=text name=subtotal size=10 value=<TMPL_VAR name="sub_total">></td>
+  		<td><b>Sous-total</b></td>
+  		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td><b>TVA</b></td>
-		<td><TMPL_VAR name="currency"><input type=text name=gst size=10 value=<TMPL_VAR name="gist">></td>
+		<td><b>GST</b></td>
+		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td><b>TOTAL</b></td>
-		<td><TMPL_VAR name="currency"><input type=text name=grandtotal size=10 value=<TMPL_VAR name="grand_total">></td>
+		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td colspan=9>
 			<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
-				<input type=hidden name=id value="<TMPL_VAR name="id">">
-				<input type=hidden name=basket value="<TMPL_VAR name="basket">">
-				<b> Ajouter commande : entrer mot clef ou titre de notice </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
+				<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
+				<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
+				<b> Ajouter une commande : entrez un mot-clé ou un titre: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
 			</form>
 		</td>
 	</tr>
@@ -60,4 +60,4 @@
 </table>
 </CENTER>
 
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl
index 55064e8bfb..1e6d12efff 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl
@@ -1,36 +1,36 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<FONT SIZE=6><em>Panier <TMPL_VAR name="basket"> for <TMPL_VAR name="name"></em></FONT><br />
-(Référence: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, passée par : <TMPL_VAR name="user">)<br />
-Tel: <TMPL_VAR name="phone">, Fax: <TMPL_VAR name="fax"><br />
-<TMPL_VAR name="address1">, <TMPL_VAR name="address2"><br />
-<TMPL_VAR name="address3">, <TMPL_VAR name="address4"><br />
+<h1>Panier <!-- TMPL_VAR name="basket" --> for <!-- TMPL_VAR name="name" --></h1><br />
+(Notre ref: <!-- TMPL_VAR name="entrydate" -->, #<!-- TMPL_VAR name="basket" -->, validée par: <!-- TMPL_VAR name="user" -->)<br />
+Tél.: <!-- TMPL_VAR name="phone" -->, Fax: <!-- TMPL_VAR name="fax" --><br />
+<!-- TMPL_VAR name="address1" -->, <!-- TMPL_VAR name="address2" --><br />
+<!-- TMPL_VAR name="address3" -->, <!-- TMPL_VAR name="address4" --><br />
 <p>
 <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
-<input type=hidden name=id value="<TMPL_VAR name="id">">
-<input type=hidden name=basket value="<TMPL_VAR name="basket">">
-<b> Chercher mot-clef ou titre: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
+<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
+<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
+<b> Rechercher Mot-clé ou Titre: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
 
 </form>
 
 <table border=0 cellspacing=0 cellpadding=5>
 	<tr valign=top bgcolor="#ffdf61">
-		<td width="5%"><b>N° cmde</b></td>
+		<td width="5%"><b>Commande</b></td>
 		<td width="10%"><b>Isbn</b></td>
 		<td width="30%"><b>Titre</b></td>
 		<td width="20%"><b>Auteur</b></td>
-		<td width="8%"><b>Qté</b></td>
+		<td width="8%"><b>Quantité</b></td>
 	</tr>
-	<TMPL_LOOP name="books_loop">
-		<tr valign=top bgcolor=<TMPL_VAR name="color">>
-			<td><TMPL_VAR name="ordernumber"></td>
-			<td><TMPL_VAR name="isbn"></td>
-			<td><TMPL_VAR name="title"></td>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="quantity"></td>
+	<!-- TMPL_LOOP name="books_loop" -->
+		<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
+			<td><!-- TMPL_VAR name="ordernumber" --></td>
+			<td><!-- TMPL_VAR name="isbn" --></td>
+			<td><!-- TMPL_VAR name="title" --></td>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td><!-- TMPL_VAR name="quantity" --></td>
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 </table>
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl
index 2433e450b1..3d8c4a3281 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl
@@ -1,77 +1,77 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
 
- <H1>Panier pour: <TMPL_VAR name="bookselname"></H1>
+ <H1>Panier pour: <!-- TMPL_VAR name="bookselname" --></H1>
 
-<TMPL_IF name ="testdonation">
-	<a href="newbiblio.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&sub=<TMPL_VAR name="parsub">">
-	<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" align=right alt="Ajouter Notice" border=0></a>
-<TMPL_ELSE>
-	<a href="newdonation.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&sub=<TMPL_VAR name="parsub">">
-	<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" border=0 align=right alt="Ajouter Notice"></a>
-</TMPL_IF>
+<!-- TMPL_IF name ="testdonation" -->
+	<a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
+	<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" border=0 align=right alt="Ajouter New Biblio"></a>
+<!-- TMPL_ELSE -->
+	<a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
+	<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png"  border=0 align=right alt="Ajouter New Biblio"></a>
+<!-- /TMPL_IF -->
 
-<a href="basket.pl?basket=<TMPL_VAR name="basket">">
-<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1uparrow.png" border=0 align=right alt="Voir Panier"></a>
+<a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">
+<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1uparrow.png"  border=0 align=right alt="Voir Panier"></a>
 <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
-<input type=hidden name=id value=<TMPL_VAR name="id">>
-<input type=hidden name=basket value=<TMPL_VAR name="basket">>
-<b>Nouvelle Recherche: </b><INPUT TYPE="text"  SIZE="25"   NAME="search"></form>
+<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
+<input type=hidden name=basket value=<!-- TMPL_VAR name="basket" -->>
+<b>Nouvelle recherche: </b><INPUT TYPE="text"  SIZE="25"   NAME="search"></form>
 <br clear=all>
 
 <CENTER>
 
-Votre recherche:
+Recherche effectuée sur
 <B>
-<TMPL_LOOP name="loopsearch">
-	<TMPL_VAR name="key"> <TMPL_VAR name="value">
-</TMPL_LOOP>
+<!-- TMPL_LOOP name="loopsearch" -->
+	<!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
+<!-- /TMPL_LOOP -->
 </B>
 <BR>
-<TMPL_VAR name="count">  r&eacute;sultats.
+<!-- TMPL_VAR name="count" -->  Résultats trouvés.
 
-<br> Affichage des r&eacute;sultats <TMPL_VAR name="dispnum"> &agrave; <TMPL_VAR name="offset2">.
+<br> Résultats <i><!-- TMPL_VAR name="dispnum" --></i> to <i><!-- TMPL_VAR name="offset2" --></i> affiché.
 
-<TABLE  CELLSPACING=0  CELLPADDING=6 border=0 Color="<TMPL_VAR name="main">">
-	<TR  VALIGN=TOP  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+<TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
+	<TR  VALIGN=TOP bgcolor="#ffdf61">
 		<TD><b>TITRE</b></TD>
 		<TD><b>AUTEUR</b></TD>
-		<TD><b>ANNEE</b></TD>
-		<TD><b>NOMBRE</b></TD>
+		<TD><b>&copy;</b></TD>
+		<TD><b>COMPTE</b></TD>
 		<TD><b>LOCALISATION</b></TD>
 	</TR>
 
-<TMPL_LOOP name="loopresult">
-	<TR VALIGN=TOP bgcolor="<TMPL_VAR name="coltab">">
+<!-- TMPL_LOOP name="loopresult" -->
+	<TR VALIGN=TOP bgcolor="<!-- TMPL_VAR name="toggle" -->">
 		<TD>
-			<TMPL_IF name="testdonation">
-				<A HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<TMPL_VAR name="sub">&author=<TMPL_VAR name="author2">&copyright=<TMPL_VAR name="copyright">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&biblio=<TMPL_VAR name="biblionumber">&title=<TMPL_VAR name="title2">">
-				<TMPL_VAR name="title">
+			<!-- TMPL_IF name="testdonation" -->
+				<A HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
+				<!-- TMPL_VAR name="title" -->
 				</A>
-			<TMPL_ELSE>
-				<A HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<TMPL_VAR name="author2">&copyright=<TMPL_VAR name="copyright">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&biblio=<TMPL_VAR name="biblionumber">&title=<TMPL_VAR name="title2">">
-				<TMPL_VAR name="title">
+			<!-- TMPL_ELSE -->
+				<A HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
+				<!-- TMPL_VAR name="title" -->
 				</A>
-			</TMPL_IF>
+			<!-- /TMPL_IF -->
 		</TD>
 		<TD>
-			<A HREF="/cgi-bin/koha/search.pl?author=<TMPL_VAR name="word">&type=<TMPL_VAR name="type">">
-			<TMPL_VAR name="author">
+			<A HREF="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
+			<!-- TMPL_VAR name="author" -->
 			</A>
 		</TD>
 		<TD>
-			<TMPL_VAR name="copyright">
+			<!-- TMPL_VAR name="copyright" -->
 		</TD>
 		<TD>
-			<TMPL_VAR name="itemcount">
+			<!-- TMPL_VAR name="itemcount" -->
 		</TD>
 		<TD>
-			<TMPL_VAR name="location">
+			<!-- TMPL_VAR name="location" -->
 		</TD>
 	</TR>
 
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 
-	<TR VALIGN=TOP>
+	<TR VALIGN=TOP bgcolor="#ffdf61">
 		<TD>
 			&nbsp;
 		</TD>
@@ -90,11 +90,11 @@ Votre recherche:
 	</TR>
 </TABLE>
 
-<TMPL_IF name="offsetover">
-<A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<TMPL_VAR name="num">&offset=<TMPL_VAR name="offset">&type=<TMPL_VAR name="type">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&search=<TMPL_VAR name="title">&author=<TMPL_VAR name="author">">
+<!-- TMPL_IF name="offsetover" -->
+<A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">
 Next
 </A>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 </CENTER>
 
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl
index 095b33c3c7..05daf6ad47 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl
@@ -1,8 +1,8 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <script language="javascript" type="text/javascript">
 
 <!--
-function update(f){
+function mettre à jour(f){
   //collect values
   quantity=f.quantity.value
   discount=f.discount.value
@@ -14,21 +14,20 @@ function update(f){
   //  ecost=f.ecost.value  //budgetted cost
   //  GST=f.GST.value
   //  total=f.total.value
-  //make useful constants out of the above
+  //make useful constants out sur the above
   exchangerate=f.elements[currency].value      //get exchange rate
   gst_on=(!listinc && applygst);
   //do real stuff
   rrp=listprice*exchangerate;
-  ecost=Math.round(rrp*(100-discount))/100;
+  ecost=rrp*(100-discount)/100
   GST=0;
   if (gst_on){
-    rrp= Math.round(rrp*(1+<TMPL_VAR name="gstrate">)*100)/100;
-    GST=ecost*<TMPL_VAR name="gstrate">;
+    rrp=rrp*(1+<!-- TMPL_VAR name="gstrate" -->);
+    GST=ecost*(<!-- TMPL_VAR name="gstrate" -->);
   }
 
   total=(ecost+GST)*quantity
 
-
   f.rrp.value=rrp;
   f.ecost.value=ecost;
   f.GST.value=GST;
@@ -51,97 +50,95 @@ win.document.write("</font></body></html>");
 
 </script>
 <form action=/cgi-bin/koha/acqui/addorder.pl method=post name=frusin>
-<TMPL_UNLESS name="existing"><input type=hidden name=existing value=no></TMPL_UNLESS>
-<!-- <TMPL_VAR name="title"> -->
-<input type=hidden name=ordnum value="<TMPL_VAR name="ordnum">">
-<input type=hidden name=basket value="<TMPL_VAR name="basket">">
-<input type=hidden name=supplier value="<TMPL_VAR name="id">">
-<input type=hidden name=biblio value="<TMPL_VAR name="biblio">">
-<input type=hidden name=bibitemnum value="<TMPL_VAR name="biblioitemnumber">">
-<input type=hidden name=oldtype value="<TMPL_VAR name="itemtype">">
-<input type=hidden name=discount value="<TMPL_VAR name="discount">">
-<input type=hidden name=listinc value="<TMPL_VAR name="listincgst">">
-<input type=hidden name=currency value="<TMPL_VAR name="currency">">
-<input type=hidden name=applygst value="<TMPL_VAR name="gstreg">">
-<TMPL_LOOP name="loop_currencies">
-	<input type=hidden name="<TMPL_VAR name="currency">" value="<TMPL_VAR name="rate">">
-</TMPL_LOOP>
-<TMPL_IF name="orderexists"><input type=hidden name=orderexists value=yes></TMPL_IF>
-<table width="80%">
-<tr><td>
-	<FONT SIZE=6><em><TMPL_VAR name="ordnum"> - Détail commande</em></FONT><br>
-	Panier pour : <TMPL_VAR name="name">
-</td><td>
-	<a href="basket.pl?basket=<TMPL_VAR name="basket">">
-		<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1uparrow.png" border=0 alt="View Basket">
-	</a>
-</td></tr></table>
+<!-- TMPL_UNLESS name="existing" --><input type=hidden name=existing value=no><!-- /TMPL_UNLESS -->
+<!-- <!-- TMPL_VAR name="title" --> -->
+<input type=hidden name=ordnum value="<!-- TMPL_VAR name="ordnum" -->">
+<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
+<input type=hidden name=supplier value="<!-- TMPL_VAR name="id" -->">
+<input type=hidden name=biblio value="<!-- TMPL_VAR name="biblio" -->">
+<input type=hidden name=bibitemnum value="<!-- TMPL_VAR name="biblioitemnumber" -->">
+<input type=hidden name=oldtype value="<!-- TMPL_VAR name="itemtype" -->">
+<input type=hidden name=discount value="<!-- TMPL_VAR name="discount" -->">
+<input type=hidden name=listinc value="<!-- TMPL_VAR name="listincgst" -->">
+<input type=hidden name=currency value="<!-- TMPL_VAR name="currency" -->">
+<input type=hidden name=applygst value="<!-- TMPL_VAR name="gstreg" -->">
+<!-- TMPL_LOOP name="loop_currencies" -->
+	<input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
+<!-- /TMPL_LOOP -->
+<!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=oui><!-- /TMPL_IF -->
+<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">Voir Panier</a>
+<h1><!-- TMPL_VAR name="ordnum" --> - Commande Details </h1><br>
+Panier pour: <!-- TMPL_VAR name="name" -->
 <P>
 <CENTER>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
 	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>DETAIL CATALOGUE </B></td>
+		<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>DETAILS CATALOGUE</B></td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD><b>Titre *</b></td>
-		<td><input type=text size=20 name=title value="<TMPL_VAR name="title">"></td>
+		<td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->"></td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>Auteur</td>
-		<td><input type=text size=20 name=author value="<TMPL_VAR name="author">" ></td>
+		<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" ></td>
+	</tr>
+	<TR VALIGN=TOP>
+		<TD> Editeur</td>
+		<td><input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" ></td>
 	</tr>
 	<TR VALIGN=TOP>
-	<TD>Date copyright</td>
-	<td><input type=text size=20 name=copyright value="<TMPL_VAR name="copyrightdate">">
+	<TD>Date Copyright</td>
+	<td><input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
 	</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Catégorie</td>
-		<td><TMPL_VAR name="CGIitemtype"></td>
+		<TD>Format</td>
+		<td><!-- TMPL_VAR name="CGIitemtype" --></td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>ISBN</td>
-		<td><input type=text size=20 name=ISBN value="<TMPL_VAR name="isbn">"></td>
+		<td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Périodiques</td>
-		<td><input type=text size=20 name=Series value="<TMPL_VAR name="seriestitle">"></td>
+		<TD>Séries</td>
+		<td><input type=text size=20 name=Séries value="<!-- TMPL_VAR name="seriestitle" -->"></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Site</td>
-		<td><TMPL_VAR name="CGIbranch"></td>
+		<TD>Annexe</td>
+		<td><!-- TMPL_VAR name="CGIbranch" --></td>
 	</tr>
 </table>
-<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=32 height=250 align=left>
+<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 height=250 align=left>
 <table border=1 cellspacing=0 cellpadding=5 width="40%">
-	<tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>DETAILS FINANCIERS</B></td></tr>
+	<tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>DETAILS COMPTABILITE</B></td></tr>
 	<TR VALIGN=TOP>
 		<TD>Quantité</td>
-		<td><input type=text size=20 name=quantity value="<TMPL_VAR name="quantity">" onchange='update(this.form)' ></td>
+		<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='mettre à jour(this.form)' ></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Fonds</td>
-		<td><TMPL_VAR name="CGIbookfund"></td>
+		<TD>Comptes</td>
+		<td><!-- TMPL_VAR name="CGIbookfund" --></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Prix fournisseur</td>
-		<td><input type=text size=20 name=list_price value="<TMPL_VAR name="listprice">" onchange='update(this.form)'></td>
+		<TD>Prix catalogue du fournisseur</td>
+		<td><input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='mettre à jour(this.form)'></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Coût remplacement <br><FONT SIZE=2></td>
-		<td><input type=text size=20 name=rrp value="<TMPL_VAR name="rrp">" onchange='update(this.form)'>
+		<TD>Frais Remplacement <br><FONT SIZE=2></td>
+		<td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='mettre à jour(this.form)'>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Cout budgété<BR><FONT SIZE=2></FONT> </td>
-		<td><input type=text size=20 name=ecost value="<TMPL_VAR name="ecost">" onchange='update(this.form)'></td>
+		<TD>Coûts budgetés<BR><FONT SIZE=2>(ex TVA, remise)</FONT> </td>
+		<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='mettre à jour(this.form)'></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Taxes</td>
-		<td><input type=text size=20 name=GST value="" onchange='update(this.form)'></td>
+		<TD>GST budgeté</td>
+		<td><input type=text size=20 name=GST value="" onchange='mettre à jour(this.form)'></td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD><B>TOTAL BUDGETE</B></td>
-		<td><input type=text size=20 name=total value="" onchange='update(this.form)'></td>
+		<td><input type=text size=20 name=total value="" onchange='mettre à jour(this.form)'></td>
 	</tr>
 	<TR VALIGN=TOP  bgcolor=#ffffcc>
 		<TD>Coût effectif</td>
@@ -152,22 +149,23 @@ win.document.write("</font></body></html>");
 		<td><input type=text size=20 name=invoice ></td>
 	<TR VALIGN=TOP>
 		<TD>Notes</td>
-		<td><input type=text size=20 name=notes value="<TMPL_VAR name="notes">"></td>
+		<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD colspan=2><input type=image  name=submit src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 align=right>	</td>
+		<TD colspan=2>
+		<input type="submit" value="OK" class="button">
 	</tr>
 </table>
 </form>
 </center>
 <table>
-<tr><td bgcolor=#cccc99  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>HELP</B><br>
+<tr><td bgcolor=#cccc99  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>AIDE</B><br>
 <UL>
-<LI>les champs en <B>GRAS</B> doivent être remplis pour créer une nouvelle notice et un exemplaire</li>
-<LI>Les champs en italique peuvent être utilisés pour faire une "réception rapide" lorsque les exemplaires seront réceptionnés</li>
+<LI>Les champs en gras sont obligatoires.<p>
+<LI>Les champs ombrés peuvent être utilisés pour effectuer un retour "rapide", quand les ouvrages ont été acheté localement ou reçus en don. Dans ce cas, la quantité "commandée" sera aussi affectée dans la base de données à la quantité "reçue".
 </UL>
 </td></tr></table>
 <p> &nbsp; </p>
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl
index b757d4bac0..620a8c5035 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl
@@ -1,52 +1,52 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
-<FONT SIZE=6><em>Recherche fournisseur</em></FONT><br />
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+<h1>Résultats de recherche fournisseur</h1><br />
 <CENTER>
-vous avez cherché le <b>fournisseur <TMPL_VAR name="supplier">,</b> <TMPL_VAR name="count"> réponses trouvées<p>
+Recherche effectuée sur <b>Fournisseur <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> Résultats trouvés<p>
 <table border=0 cellspacing=0 cellpadding=5 width="80%">
 <tr valign=top bgcolor="#ffdf61">
-	<td width="10%"><b>N° cmde</b></td>
-	<td width="10%"><b>Livraison<b></td>
-	<td width="30%"><b>fournisseur</b></td>
+	<td width="10%"><b>Commande</b></td>
+	<td width="10%"><b>Recevoir<b></td>
+	<td width="30%"><b>Entreprise</b></td>
 	<td width="50%">
 		<table width="100%" border=0 cellspacing=0 cellpadding=5>
 			<tr>
 				<td width="15%"><b>Panier</b></td>
-				<td width="15%"><b>Exemplaire</b></td>
-				<td width="40%"><b>Saisi par</b></td>
+				<td width="15%"><b>Ouvrages</b></td>
+				<td width="40%"><b>Equipe</b></td>
 				<td width="30%"><b>Date</b></td>
 			</tr>
 		</table>
 	</td>
 </tr>
 
-<TMPL_LOOP name="loop_suppliers">
-	<tr valign=top bgcolor=<TMPL_VAR name="color">>
+<!-- TMPL_LOOP name="loop_suppliers" -->
+	<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
 		<td>
-			<a href="basket.pl?id=<TMPL_VAR name="id">"><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_send.png" title="Passer commande" ALT="Add" BORDER=0 ></a>
+			<!-- TMPL_IF name="active" -->
+				<a href="basket.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 ></a>
+			<!-- TMPL_ELSE -->
+				Inactif
+			<!-- /TMPL_IF -->
 		</td>
 		<td>
-			<a href="recieveorder.pl?id=<TMPL_VAR name="id">"><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_get.png" title="Livraison" ALT="Add" BORDER=0 ></a>
+			<a href="recieveorder.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="receive" ALT="Add" BORDER=0 ></a>
 		</td>
-		<td><a href="supplier.pl?id=<TMPL_VAR name="id">"><TMPL_VAR name="name"></a></td>
+		<td><a href="supplier.pl?id=<!-- TMPL_VAR name=id -->"><!-- TMPL_VAR name="name" --></a></td>
 		<td>
 			<table width="100%" cellspacing=0 cellpadding=5 border=0>
-				<TMPL_LOOP name="loop_basket">
+				<!-- TMPL_LOOP name="loop_basket" -->
 					<tr>
-						<td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR name="basketno">"><TMPL_VAR name="basketno"></a></td>
+						<td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a></td>
 						<td width="15%"><TMPl_VAR name="total"></td>
-						<td width="40%"><TMPL_VAR name="authorisedby"></td>
-						<td width="30%"><TMPL_VAR name="entrydate"></td>
+						<td width="40%"><!-- TMPL_VAR name="authorisedby" --></td>
+						<td width="30%"><!-- TMPL_VAR name="entrydate" --></td>
 					</tr>
-				</TMPL_LOOP>
+				<!-- /TMPL_LOOP -->
 			</table>
-		</td>
 	</tr>
-</TMPL_LOOP>
-<tr>
-<td colspan=4><br/>
-<a class="button" href="supplier.pl?id=0">Ajouter fournisseur</a>
-<br/><br/>
-</tr>
+<!-- /TMPL_LOOP -->
 </table>
 </CENTER>
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<br>
+<a class="button" href="supplier.pl?id=0">Ajouter un fournisseur</a>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl
index b6fbd9781c..947d6c669a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl
@@ -1,20 +1,20 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
 <div align=right>
-Facture : <TMPL_VAR name="invoice"><br>
-Réceptionnée par : <TMPL_VAR name="user"><br>
-<TMPL_VAR name="date">
+Facture: <!-- TMPL_VAR name="invoice" --><br>
+Reçu par: <!-- TMPL_VAR name="user" --><br>
+<!-- TMPL_VAR name="date" -->
 </div>
-<FONT SIZE=6><em>Réception pour : <TMPL_VAR name="name">, Facture <TMPL_VAR name="invoice"></em></FONT>
+<h1>Sommaire pour : <i><!-- TMPL_VAR name="name" --></i> Facture <i><!-- TMPL_VAR name="invoice" --></i></h1>
 <CENTER>
 
 <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
-<input type=hidden name=id value="<TMPL_VAR name="id">">
-<input type=hidden name=gst value="<TMPL_VAR name="gst">">
-<input type=hidden name=freight value="<TMPL_VAR name="freight">">
-<input type=hidden name=invoice value="<TMPL_VAR name="invoice">">
+<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
+<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
+<input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
+<input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
 
-<b>Rechercher ISBN or Titre:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
+<b>Rechercher ISBN ou Titre:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
 </form>
 <p>
 <FORM ACTION="" method=get name=orderform>
@@ -26,23 +26,23 @@ R
 		<td><b>TITRE</b></td>
 		<td><b>AUTEUR</b></td>
 		<td><b>ACTUEL</b></td>
-		<td><b>Port</b></td>
-		<td><b>QTE</b></td>
+		<td><b>P&P</b></td>
+		<td><b>QUANTITE</b></td>
 		<td><b>TOTAL</b></td>
 	</tr>
-	<TMPL_VAR name="count">
-	<TMPL_LOOP name="loop_orders">
-		<tr valign=top bgcolor="<TMPL_VAR name="color">">
-			<td><TMPL_VAR name="basketno"></td>
-			<td><TMPL_VAR name="isbn"></td>
-			<td><a href="acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&gst=<TMPL_VAR name="gst">&freight=<TMPL_VAR name="freight">&id=<TMPL_VAR name="id">"><TMPL_VAR name="title"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td>$<TMPL_VAR name="unitprice"></td>
+	<!-- TMPL_VAR name="count" -->
+	<!-- TMPL_LOOP name="loop_orders" -->
+		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
+			<td><!-- TMPL_VAR name="basketno" --></td>
+			<td><!-- TMPL_VAR name="isbn" --></td>
+			<td><a href="acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&gst=<!-- TMPL_VAR name="gst" -->&freight=<!-- TMPL_VAR name="freight" -->&id=<!-- TMPL_VAR name="id" -->"><!-- TMPL_VAR name="title" --></a></td>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td>$<!-- TMPL_VAR name="unitprice" --></td>
 			<td></td>
-			<td><TMPL_VAR name="quantityrecieved"></td>
-			<td>$<TMPL_VAR name="total"></td>
+			<td><!-- TMPL_VAR name="quantityrecieved" --></td>
+			<td>$<!-- TMPL_VAR name="total" --></td>
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	<tr valign=top bgcolor=white>
 		<td colspan=8><hr>
 		</td>
@@ -51,24 +51,25 @@ R
 		<td></td>
 		<td></td>
 		<td></td>
-		<td><b>SUBTOTALS</b></td>
-		<td>$<TMPL_VAR name="totalprice"></td>
-		<td><TMPL_VAR name="totalfreight"></td>
-		<td><TMPL_VAR name="totalquantity"></td>
-		<td>$<TMPL_VAR name="tototal"></td>
+		<td><b>SOUS-TOTAUX</b></td>
+		<td>$<!-- TMPL_VAR name="totalprice" --></td>
+		<td><!-- TMPL_VAR name="totalfreight" --></td>
+		<td><!-- TMPL_VAR name="totalquantity" --></td>
+		<td>$<!-- TMPL_VAR name="tototal" --></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td colspan=5 rowspan=2  bgcolor="#ffdf61">
 		<b>AIDE</b>
-		<br>Le total en bas de la page doit être le même que sur la facture à quelques cents près.</p>
-		 Quand vous avez terminé, enregistrez les modifications
+		<br>
+		Le total au fond de la page devrait correspondre à quelques centimes au total de la facture.<p>
+		Quand vous avez fini cette facture, sauvegardez les changements.
 		</td>
 		<td colspan=2 align=right><b>GST</b></td>
-		<td>?<TMPL_VAR name="gst"></td>
+		<td>$<!-- TMPL_VAR name="gst" --></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td colspan=2 align=right ><b>TOTAL</b></td>
-		<td>?<TMPL_VAR name="grandtot"></td>
+		<td>$<!-- TMPL_VAR name="grandtot" --></td>
 	</tr>
 </table>
 </CENTER>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl
index 39dc6fc229..c1c444c5c9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl
@@ -1,33 +1,33 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<FONT SIZE=6><em>Réceptionner commande du fournisseur <TMPL_VAR name="name"></em></FONT>
+<h1>Réceptionner commandes d'un fournisseur <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR name="name" --></a></h1>
 <p>
 <CENTER>
 <form method=get action="receive.pl">
-<input type=hidden name=id value=<TMPL_VAR name="id">>
+<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
 <p>
 <table border=1 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor="#ffdf61"><td  colspan=2><B>INFORMATIONS DE FACTURE FOURNISSEUR</B></td></tr>
+<tr valign=top bgcolor="#ffdf61"><td  colspan=2><B>INFORMATION FACTURE FOURNISSEUR</B></td></tr>
 <TR VALIGN=TOP >
-<TD>N° commande fournisseur</td>
+<TD>N° de facture de fournisseur</td>
 <td><input type=text size=20 name=invoice>
 </td>
 </tr>
 <TR VALIGN=TOP bgcolor="#ffffcc">
-<TD>gst</td>
+<TD>GST</td>
 <td><input type=text size=20 name=gst>
 </td>
 </tr>
 <TR VALIGN=TOP>
-<TD>Port</td>
+<TD>Fret</td>
 <td><input type=text size=20 name=freight>
 </td>
 </tr>
 <TR VALIGN=TOP>
-<td colspan=2 align="center"><input type=image  name=submit src="/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
+<td colspan=2 align="center"><input type="submit" class="button" value="Enregistrer">
 </td>
 </tr>
 </table>
 </CENTER>
 
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl
index 420f74476a..615ec93def 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl
@@ -1,159 +1,164 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
 <form action=updatesupplier.pl method=post>
 
-<input type=hidden name=id value=<TMPL_VAR name="id">>
-<FONT SIZE=6><em>Modification : <TMPL_VAR name="name"></em></FONT>
+<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
+
+<!-- TMPL_IF NAME=id -->
+	<h1>Mettre à jour: <!-- TMPL_VAR name="name" --></h1>
+<!-- TMPL_ELSE -->
+	<h1><em>Ajouter un fournisseur</h1>
+<!-- /TMPL_IF -->
+
 <P>
 <CENTER>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
 	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>DETAIL FOURNISSEUR </B></td>
+		<td colspan=2><B>DETAILS ENTREPRISE</B></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD><b>Nom fournisseur</b></td>
-		<td><input type=text size=20 name=company value="<TMPL_VAR name="name">">
+		<TD><b>Nom Entreprise</b></td>
+		<td><input type=text size=20 name=company value="<!-- TMPL_VAR name="name" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Adresse</td>
+		<TD>Adresse postale</td>
 		<td>
-			<textarea name=company_postal cols=20 rows=3><TMPL_VAR name="postal">
-			</textarea>
+			<textarea name=company_postal cols=20 rows=3><!-- TMPL_VAR name="postal" --></textarea>
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Adresse siège</td>
-		<td><textarea name=physical cols=20 rows=4><TMPL_VAR name="address1">
-			<TMPL_VAR name="address2">
-			<TMPL_VAR name="address3">
-			<TMPL_VAR name="address4">
-			</textarea>
+		<TD>Adresse physique</td>
+		<td><textarea name=physical cols=20 rows=4><!-- TMPL_VAR name="address1" --><!-- TMPL_VAR name="address2" --><!-- TMPL_VAR name="address3" --><!-- TMPL_VAR name="address4" --></textarea>
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Tel</td>
-		<td><input type=text size=20 name=company_phone value="<TMPL_VAR name="phone">">
+		<TD>Téléphone</td>
+		<td><input type=text size=20 name=company_phone value="<!-- TMPL_VAR name="phone" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>Fax</td>
-		<td><input type=text size=20 name=company_fax value="<TMPL_VAR name="fax">">
+		<td><input type=text size=20 name=company_fax value="<!-- TMPL_VAR name="fax" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>site web</td>
-		<td><input type=text size=20 name=website value="<TMPL_VAR name="url">">
+		<TD>Site Web</td>
+		<td><input type=text size=20 name=website value="<!-- TMPL_VAR name="url" -->">
 		</td>
 	</tr>
 	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>CONTACT</B></td>
+		<td colspan=2><B>DETAILS CONTACT</B></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Nom</td>
-		<td><input type=text size=20 name=company_contact_name value="<TMPL_VAR name="contact">"></td>
+		<TD>Nom du contact</td>
+		<td><input type=text size=20 name=company_contact_name value="<!-- TMPL_VAR name="contact" -->"></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>fonction</td>
-		<td><input type=text size=20 name=company_contact_position value="<TMPL_VAR name="contpos">">
+		<TD>Position</td>
+		<td><input type=text size=20 name=company_contact_position value="<!-- TMPL_VAR name="contpos" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Tel</td>
-		<td><input type=text size=20 name=contact_phone value="<TMPL_VAR name="contphone">">
+		<TD>Téléphone</td>
+		<td><input type=text size=20 name=contact_phone value="<!-- TMPL_VAR name="contphone" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Autre tel</td>
-		<td><input type=text size=20 name=contact_phone_2 value="<TMPL_VAR name="contaltphone">">
+		<TD>Autre téléphone</td>
+		<td><input type=text size=20 name=contact_phone_2 value="<!-- TMPL_VAR name="contaltphone" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>Fax</td>
-		<td><input type=text size=20 name=contact_fax value="<TMPL_VAR name="contfax">">
+		<td><input type=text size=20 name=contact_fax value="<!-- TMPL_VAR name="contfax" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>E-mail</td>
-		<td><input type=text size=20 name=company_email value="<TMPL_VAR name="contemail">">
+		<td><input type=text size=20 name=company_email value="<!-- TMPL_VAR name="contemail" -->">
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>Notes</td>
-		<td><textarea name=notes cols=20 rows=4><TMPL_VAR name="contnotes"></textarea>
+		<td><textarea name=notes cols=20 rows=4><!-- TMPL_VAR name="contnotes" --></textarea>
 		</td>
 	</tr>
-	<tr>
-		<td colspan=2 align="center"><input type=submit value="Enregistrer" class="button"></td>
-	</tr>
 </table>
 
 <table border=1 cellspacing=0 cellpadding=5 width="40%">
 	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>STATUT</B></td>
+		<td colspan=2><B>STATUT ACTUEL</B></td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>Le fournisseur est</td>
-		<td><input type="radio" name="status" value="1" <TMPL_IF name="active">checked</TMPL_IF>>Actif
-			<input type="radio" name="status" value="0" <TMPL_UNLESS name="active">checked</TMPL_UNLESS>>Inactif</td>
+		<td>
+			 <!-- TMPL_IF name="active" -->
+				<input type="radio" name="status" value="1" checked>Actif
+				<input type="radio" name="status" value="0">Inactif</td>
+			<!-- TMPL_ELSE -->
+				<input type="radio" name="status" value="1">Actif
+				<input type="radio" name="status" value="0"checked>Inactif</td>
+			<!-- /TMPL_IF -->
 	</tr>
 	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>INFORMATIONS COMMANDE</B></td>
+		<td colspan=2><B>INFORMATION COMMANDES</B></td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Publications</td>
-		<td><textarea name="publishers_imprints" cols=20 rows=4><TMPL_VAR name="specialty"></textarea>
+		<TD>Edition</td>
+		<td><textarea name="publishers_imprints" cols=20 rows=4><!-- TMPL_VAR name="specialty" --></textarea>
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Les prix sont en </td>
+		<TD>Prix catalogue sont</td>
 		<td>
 			<select name=list_currency size=1>
-			<TMPL_LOOP name="loop_pricescurrency">
-				<TMPL_VAR name="currency">
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP name="loop_pricescurrency" -->
+				<!-- TMPL_VAR name="currency" -->
+			<!-- /TMPL_LOOP -->
 			</select>
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Les factures sont en </td>
+		<TD>Prix facturés sont</td>
 		<td>
 			<select name=invoice_currency size=1>
-			<TMPL_LOOP name="loop_invoicecurrency">
-				<TMPL_VAR name="currency">
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP name="loop_invoicecurrency" -->
+				<!-- TMPL_VAR name="currency" -->
+			<!-- /TMPL_LOOP -->
 			</select>
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>GST</td>
+		<TD>GST enregistré</td>
 		<td>
-			<input type=radio name=gst value=1 <TMPL_IF name="gstreg">checked</TMPL_IF>>Oui
-			<input type=radio name=gst value=0 <TMPL_UNLESS name="gstreg">checked</TMPL_UNLESS>>Non
+			<input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Oui
+			<input type=radio name=gst value=0 <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Non
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Prix incluent la TVA</td>
+		<TD>Prix catalogue de l'ouvrage inclus le GST</td>
 		<td>
-			<input type=radio name=list_gst <TMPL_IF name="listincgst">checked</TMPL_IF>>Oui
-			<input type=radio name=list_gst value=0 <TMPL_UNLESS name="listincgst">checked</TMPL_UNLESS>>Non
+			<input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui
+			<input type=radio name=list_gst value=0 <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>Le prix des factures incluent la TVA</td>
+		<TD>Prix de la facture de l'ouvrage inclus le GST</td>
 		<td>
-			<input type=radio name=invoice_gst value=1 <TMPL_IF name= "invoiceincgst">checked</TMPL_IF>>Oui
-			<input type=radio name=invoice_gst value=0 <TMPL_UNLESS name="invoiceincgst">checked</TMPL_UNLESS>>Non
+			<input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Oui
+			<input type=radio name=invoice_gst value=0 <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>Non
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>remise</td>
-		<td><input type=text size=8 name=discount value=<TMPL_VAR name="discount">> %
+		<TD>Rabais</td>
+		<td><input type=text size=3 name=discount value=<!-- TMPL_VAR name="discount" -->> %
 	</tr>
 </table>
-
+<br/>
+<br/><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" class="button">
 </form>
 </center>
 
 
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/auth.tmpl b/koha-tmpl/intranet-tmpl/default/fr/auth.tmpl
new file mode 100644
index 0000000000..37f9747b34
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/auth.tmpl
@@ -0,0 +1,49 @@
+
+<!-- TMPL_IF NAME="nopermission" -->
+<!-- This is what is affiché if user doesn't have permission -->
+<h2>Désolé, vous n'avez pas la permission d'accéder à cette page.</h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="timed_out" -->
+<!-- This is what is affiché if connecter has timed out -->
+<h2>Sorry, your session has timed out.  Please connecter again.</h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="different_ip" -->
+<!-- This is what is affiché if user's IP has changed -->
+<h2>Vous avez changé d'adresse IP. Identifiez-vous à nouveau.</h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="invalid_username_or_password" -->
+<!-- This is what is affiché if the username ou password doesn't work -->
+<h2>Vous entered an incorrect username ou password.  Please try again.</h2>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="loginprompt" -->
+<!-- connecter prompt time-->
+
+<center>
+
+<form action='<!-- TMPL_VAR NAME="url" -->' method="post">
+<!-- TMPL_LOOP NAME="INPUTS" -->
+  <input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->'>
+<!-- /TMPL_LOOP -->
+<table border="0" cellpadding="10" cellspacing="0" width="60%">
+    <tr><td align="center" valign="top">
+
+    <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
+    <tr><th colspan="2"><font size="+2">Identifiant</font></th></tr>
+    <tr><td>N° Carte:</td><td><input name="userid"></td></tr>
+    <tr><td>Mot de passe:</td><td><input type="password" name="password"></td></tr>
+    <tr><td colspan="2" align="center"><input type="submit" value="connecter"></td></tr>
+    </table>
+    </td><td align="center" valign="top">
+
+
+    </td></tr>
+</table>
+</form>
+
+
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl b/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl
index 572c636267..a8ec94a3c8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl
@@ -1,46 +1,40 @@
-<TMPL_INCLUDE Name="reports-top.inc">
-<CENTER>
-<br>
-<FONT SIZE=6><em>
-<a href=/cgi-bin/koha/detail.pl?bib=><TMPL_VAR Name="bib">&type="intra"> <TMPL_VAR Name="title"> (<TMPL_VAR Name="author">)
-</a></em></FONT>
-<p>
-<img src="/images/holder.gif" width=16 height=200 align=left>
-
-<TABLE CELLSPACING=0 CELLPADDING=5 border=1 width=440 >
-	<TR VALIGN=TOP>
-		
-	  <TD bgcolor="99cc33" background="/images/background-mem.gif"> <B>CODE BARRES<TMPL_VAR Name="barcode"></B> 
-	  </TD>
-	</TR>
-	<TR VALIGN=TOP  >
-		<TD>
-
-		<b>Site d'origine :</b> <TMPL_VAR Name="homebranch"> <br>
-		<b>Site actuel :</b> <TMPL_VAR Name="holdingbranch"><br>
-		<b>Date d'arriv&eacute;e sur le site actuel :</b> <TMPL_VAR Name="lastdate"> 
-		<br>
-		<b>Nombre de sortie depuis cette date :</b> <TMPL_VAR Name="count"> <br>
-
-		<table cellspacing =0 cellpadding=5 border=1 width = 440>
-			<TR>
-				
-			<TD> <b>Site</b></td>
-				
-			<TD> <b>Nombre de sorties</b></td>
-				
-			<TD> <b>Derni&egrave;re apparition sur le site</b></td>
-			</TR>
-			<TMPL_LOOP Name="branchloop">
-				<TR>
-					<TD> <b> <TMPL_VAR Name="branchname"> </b></td>
-					<TD> <b> <TMPL_VAR Name="issues"> </b></td>
-					<TD> <b> <TMPL_VAR Name="seen"> </b></td>
-				</TR>
-			</TMPL_LOOP>
-		</table>
-		</TD>
-	</TR>
-</table>
-
-<TMPL_INCLUDE Name="reports-bottom.inc"></center>
\ No newline at end of file
+<!-- TMPL_INCLUDE Name="reports-top.inc" -->
+<CENTER>
+<br>
+<h1>
+<a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->&type="intra"> <!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</a></h1><P>
+<p>
+
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 width=440 >
+	<TR VALIGN=TOP>
+		<TD  bgcolor="99cc33" background="/images/background-mem.gif">
+			<B>CODE BARRE <!-- TMPL_VAR Name="barcode" --></B>
+		</TD>
+	</TR>
+	<TR VALIGN=TOP  >
+		<TD width=440 >
+
+		<b>Annexe propriétaire: </b> <!-- TMPL_VAR Name="homebranch" --> <br>
+		<b>Annexe: </b> <!-- TMPL_VAR Name="holdingbranch" --><br>
+		<b>Date d'arrivée à l'Annexe: </b> <!-- TMPL_VAR Name="lastdate" --> <br>
+		<b>Nombre de prêt depuis la date ci-dessus:</b> <!-- TMPL_VAR Name="count" --> <br>
+
+		<table cellspacing =0 cellpadding=5 border=1 width = 440>
+			<TR>
+				<TD> <b>Annexe</b></td>
+				<TD> <b>Nombre de prêts</b></td>
+				<TD> <b>Vu à l'Annexe</b></td>
+			</TR>
+			<!-- TMPL_LOOP Name="branchloop" -->
+				<TR>
+					<TD> <b> <!-- TMPL_VAR Name="branchname" --> </b></td>
+					<TD> <b> <!-- TMPL_VAR Name="issues" --> </b></td>
+					<TD> <b> <!-- TMPL_VAR Name="seen" --> </b></td>
+				</TR>
+			<!-- /TMPL_LOOP -->
+		</table>
+		</TD>
+	</TR>
+</table>
+
+<!-- TMPL_INCLUDE Name="reports-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl b/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
index 2a7160209e..10fcc14d30 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
@@ -1,11 +1,11 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<FONT SIZE=6><em>Compte de<TMPL_VAR NAME=firstname>
-<TMPL_VAR NAME=surname></em></FONT>
-<P>
-<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<TMPL_VAR NAME=bornum>">Ajouter une dette</a>
+<!-- The manual invoice et credit buttons -->
+
+<h1>Compte pour <a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></a></h1><P>
+<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Créer une facture manuelle</a>
 &nbsp;
-<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<TMPL_VAR NAME=bornum>">Encaisser</a>
+<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Créer un crédit manuel</a>
 <center>
 <p>
 
@@ -14,34 +14,34 @@
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 
   <TR VALIGN=TOP>
-      <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>AMENDES
-		&amp; FRAIS</b></TD>
-      <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=1><B>MONTANT</b></TD>
-      <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=1><B>SOLDE
-		</b></TD>
+    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>AMENDES & FRAIS</TD>
+    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=1><B>MONTANT</TD>
+    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=1><B>DOIT ENCORE</TD>
   </TR>
 
-  <TMPL_LOOP NAME=accounts>
+  <!-- TMPL_LOOP NAME=accounts -->
 
     <tr VALIGN=TOP>
-      <td><TMPL_VAR NAME=date></td>
-      <td><TMPL_VAR NAME=description><TMPL_IF NAME=printtitle> <TMPL_VAR NAME=title></TMPL_IF></td>
-      <td><TMPL_VAR NAME=amount></td>
-      <td><TMPL_VAR NAME=amountoutstanding></td>
+      <td><!-- TMPL_VAR NAME=date --></td>
+      <td><!-- TMPL_VAR NAME=description --><!-- TMPL_IF NAME=printtitle --> <!-- TMPL_VAR NAME=title --><!-- /TMPL_IF --></td>
+      <td><!-- TMPL_VAR NAME=amount --></td>
+      <td><!-- TMPL_VAR NAME=amountoutstanding --></td>
     </tr>
 
-  </TMPL_LOOP>
+  <!-- /TMPL_LOOP -->
 
   <tr VALIGN=TOP  >
-      <td></td>
-    <td colspan=2><b>Total d&ucirc;</b></td>
-    <td><b><TMPL_VAR NAME=total></b></td>
+    <td></td>
+    <td colspan=2><b>Total dû</b></td>
+    <td><b><!-- TMPL_VAR NAME=total --></b></td>
   </tr>
 
 </table>
 
 <br clear=all>
-<p>&nbsp;  </p>
+<p> &nbsp; </p>
 
 <!-- endmenu (member) -->
-<TMPL_INCLUDE NAME="members-bottom.inc">
+
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl
index ad2cd4b95b..3836b57504 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl
@@ -1,17 +1,25 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+
+<STYLE TYPE="text/css" MEDIA=screen>
+	table {	font-family:Arial;
+	font-weight:normal;
+	text-decoration:none;
+	font-size:10pt;}
+</STYLE>
 
 <table width="100%" cellspacing=0 cellpadding=5>
 <tr>
 	<td width="80%">
 		<table width=100% cellspacing=0 cellpadding=5 border=1>
-		<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+		<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 			<td>
 			<table width="100%" border=0 cellpadding=0 cellspacing=0>
 				<tr>
-					<td width=8%><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">"><img border="0" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png"></td>
-					<td width=8%><a href="javascript:confirm_deletion()"><img border="0" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png"></td>
-					<td width=8%><a href="detail.pl?bib=<TMPL_VAR name="biblionumber">">Normal</a></td>
-					<td align="center"><b>MARC biblio : <TMPL_VAR name="bibid"></b></td>
+					<td width=8%><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"></td>
+					<td width=8%><a href="javascript:confirm_deletion()"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png"></td>
+					<td width=8%><a href="detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">Normal</a></td>
+					<td width=8%><a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')">Imprimer</a></td>
+					<td align="center"><b>Notice biblio MARC : <!-- TMPL_VAR name="bibid" --></b></td>
 				</tr>
 			</table>
 			</td>
@@ -30,7 +38,7 @@
 				<td width=9% align="center"><a href="javascript:active(7)"><div  id="link7">7</div></a></td>
 				<td width=9% align="center"><a href="javascript:active(8)"><div  id="link8">8</div></a></td>
 				<td width=9% align="center"><a href="javascript:active(9)"><div  id="link9">9</div></a></td>
-				<td width=10% align="center"><a href="javascript:active(10)"><div  id="link10">Exemplaire</div></a></td>
+				<td width=10% align="center"><a href="javascript:active(10)"><div  id="link10">Ouvrage</div></a></td>
 			</tr>
 			</table>
 			</td>
@@ -38,26 +46,25 @@
 		</table>
 	</td>
 	<td>
-		<TMPL_IF NAME="norequests">
-		<TMPL_ELSE>
-			<a href=request.pl?bib=<TMPL_VAR NAME="biblionumber"> class="button">R&eacute;servations</a>
-		</TMPL_IF>
+		<!-- TMPL_IF NAME="norequests" -->
+		<!-- TMPL_ELSE -->
+			<a href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" --> class="button">Réservation</a>
+		<!-- /TMPL_IF -->
 	</td>
 </tr>
 </table>
 
-
    <DIV name="0XX" id="0XX" style="position:absolute;visibility:visible;width:90%">
     <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="0XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="0XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%" align="right"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
 	</tr>
 	</tmpl_loop>
 	</tmpl_loop>
@@ -66,167 +73,167 @@
 
     <DIV name="1XX" id="1XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="1XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="1XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="2XX" id="2XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="2XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="2XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="3XX" id="3XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="3XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="3XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="4XX" id="4XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="4XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="4XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="5XX" id="5XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="5XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="5XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
 	<DIV name="6XX" id="6XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=90% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="6XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="6XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="7XX" id="7XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="7XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="7XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="8XX" id="8XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="8XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="8XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="9XX" id="9XX" style="position:absolute;visibility:hidden;width:90%">
     <table width=90% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="9XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
-	<TMPL_LOOP name="subfield">
+	<!-- TMPL_LOOP name="9XX" -->
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_subfield"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<TMPL_VAR name="marc_tag"><TMPL_VAR name="marc_subfield">&operator=&#x003D&type=intranet&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></a></td>
+	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
+		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
+		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
+		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></a></td>
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
     <DIV name="10XX" id="10XX" style="position:absolute;visibility:hidden;width:90%">
     <table border=1 cellspacing=0 cellpadding=5>
-		<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<TMPL_LOOP name="item_header_loop"><th><tmpl_var name="header_value"></th></TMPL_LOOP>
+		<tr  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+			<!-- TMPL_LOOP name="item_header_loop" --><th><tmpl_var name="header_value"></th><!-- /TMPL_LOOP -->
 		</tr>
-		<TMPL_LOOP name="item_loop">
+		<!-- TMPL_LOOP name="item_loop" -->
 			<tr>
-					<TMPL_VAR name="item_value">
+					<!-- TMPL_VAR name="item_value" -->
 			</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
      </table>
      </DIV>
 
@@ -239,7 +246,7 @@ for (i=0; i <= 10 ; i++ ) {
     if (numlayer==i) {
 	document.getElementById(ong).style.visibility="visible";
 	document.getElementById(link).style.backgroundColor="#11AA11";
-	document.getElementById(link).style.backgroundImage="url(<TMPL_VAR name="themelang">/images/background-mem.gif)";
+	document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif)";
 } else {
 	document.getElementById(ong).style.visibility="hidden";
 	document.getElementById(link).style.backgroundColor="#FFFFFF";
@@ -250,9 +257,12 @@ for (i=0; i <= 10 ; i++ ) {
 function confirm_deletion() {
 	var is_confirmed = confirm('Confirmez vous la suppression ?');
 	if (is_confirmed) {
-		window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber=<TMPL_VAR name="bibid">";
+		window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
 	}
 }
+function Dopop(link) {
+	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui');
+}
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl
index 4db367ef32..5279e2778e 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl
@@ -1,30 +1,32 @@
-<TMPL_IF name="opac">
-	<TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-	<TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
+<!-- TMPL_IF name="opac" -->
+	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
 
 <!-- ----------------------- MAIN BODY OF PAGE ------------------------ -->
 <FORM ACTION="/cgi-bin/koha/search.pl" method=post>
 
-<FONT SIZE=6><em>Recherche Catalogue</em></FONT>
+<h1>Recherche Catalogue</h1>
 
 <CENTER>
 
 <TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=0 >
 	<TR VALIGN=TOP>
-		<TD>Code barre exemplaires</TD>
+		<TD>Code barre</TD>
 		<TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></td>
-		<td> <b> &nbsp; &nbsp; OU</b></TD>
-	</TR>
+		<td><b> &nbsp; &nbsp; OU</b></TD></TR>
+	<!-- <TR VALIGN=TOP>
+	<TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
+	-->
 	<TR VALIGN=TOP>
 		<TD colspan=2 > &nbsp;</td>
 	</TR>
-
 	<TR VALIGN=TOP>
-		<TD  bgcolor="#ad11ad" background="/images/background-mem.gif" colspan=2>
+		<TD  bgcolor="#ad11ad" colspan=2>
 			<span style="color:#FFFFFF;">
-				<b>Note :</b>Utiliser un plus grand nombre de champs pour votre recherche (par ex. Mots-cl&eacute;s + auteur + cote) ralentira la recherche.<p>
+				<b>AIDE</b><br>
+				<b>Chercher :</b>L'utilisation de plusieurs critères pour votre recherche ralentit le système.<p>
 			</span>
 		</td>
 	</TR>
@@ -32,15 +34,17 @@
 
 
 
-<TABLE >
+<TABLE border=0>
 	<TR VALIGN=TOP>
-		<TD>Mots-cl&eacute;s</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
+		<TD>Mots-clés</TD>
+		<TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
 	</TR>
 	<TR VALIGN=TOP>
 		<TD>Titre</TD>
-		<TD>
-			<INPUT TYPE="text"  SIZE="25" NAME="title"></TD><td><input type=radio name=ttype value=normal checked>Normal
-			<input type=radio name=ttype value=exact>Exacte
+		<TD><INPUT TYPE="text"  SIZE="25" NAME="title"></TD>
+		<td>
+			<input type=radio name=ttype value=normal checked>Normal
+			<input type=radio name=ttype value=exact>Exact
 		</td>
 	</TR>
 	<TR VALIGN=TOP>
@@ -51,51 +55,56 @@
 		<TD>Illustrateur</TD>
 		<TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD>
 	</TR>
-
-	<TR VALIGN=TOP>
-		<TD>Dewey</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="dewey"></TD>
+		<TR VALIGN=TOP>
+		<TD>Dewey</TD><TD><INPUT TYPE="text"  SIZE="25"   NAME="dewey"></TD>
 	</TR>
 
 	<TR VALIGN=TOP>
-		<TD>Cote</TD>
+	<TD>Catégorie</TD>
 		<td>
 			<select name="class" size="1">
-				<option value="">Toute
-				<TMPL_VAR name="classlist">
+			<option value=""> Tout
+			<!-- TMPL_VAR name="classlist" -->
 			</select>
 		</td>
 	</tr>
 	<!-- <TR VALIGN=TOP>
-	<td>Localisation</td><td><select name=branch>
+	<td>Annexe</td><td><select name=branch>
 	<option value="F">Foxton
 	</select>
 	</td></tr> -->
 
-	<!-- <TD>Date de publication (avant)</TD> <TD><INPUT TYPE="text"  SIZE="8"   NAME="date-before"> &nbsp; &nbsp; (apr&egrave;s) <INPUT TYPE="text"  SIZE="8"   NAME="date-after"></TD></TR>
+	<!-- <TD>Pub Date (before)</TD> <TD><INPUT TYPE="text"  SIZE="8"   NAME="date-before"> &nbsp; &nbsp; (after) <INPUT TYPE="text"  SIZE="8"   NAME="date-after"></TD></TR>
 	-->
 	<TR VALIGN=TOP>
-		<TD><b>OU</b></TD>
+	<TD><b>OU</b></TD>
 	</TR>
 
-
 	<TR VALIGN=TOP>
-		<TD>Sujet</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
+		<TD>Sujet</TD>
+		<TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
 	</TR>
 	<tr>
-		<TD>
-			<input type="hidden" name="type" value="intra">
-			<input type="submit" class="button" value="Chercher">
-		</TD>
-		<TD>
-			<div align="right"><INPUT TYPE="reset"  VALUE= "effacer" class="button"></div>
+		<TD colspan=3>
+			<table width="100%" cellpadding=0 cellspacing=0>
+				<tr align="center">
+					<td>
+						<input type="hidden" name="type" value="intra">
+						<input type="submit" class="button" value="Lancer la recherche">
+					</td>
+					<td>
+						<INPUT TYPE="reset"  VALUE= "Effacer" class="button">
+					</td>
+					<td>
+						<a href="/cgi-bin/koha/shelves.pl" class="button">Rayonnages virtuels</a>
+					</td>
+				</tr>
+			</table>
 		</TD>
 	</TR>
 </TABLE>
-</FORM>
-<p>
-<a href=/cgi-bin/koha/shelves.pl>Etag&egrave;res virtuelles</a>
-</CENTER>
-
+	</FORM>
+	<p>
+	</CENTER>
 <!--#include virtual="/includes/cat-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/cmsdsearchresults.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/cmsdsearchresults.tmpl
index 23330e5289..02ff98ceea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/cmsdsearchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/cmsdsearchresults.tmpl
@@ -1,28 +1,29 @@
 <html>
-<head><title>R&eacute;sultats de la recherche</title>
+<head><title>Résultats de recherche</title>
 </head>
 <body>
-<TMPL_INCLUDE NAME="searchheader.tmpl">
+<!-- TMPL_INCLUDE NAME="searchheader.tmpl" -->
 <table border=0 cellspacing=0 cellpadding=0>
 <tr bgcolor=#ccccff><th>Titre</th><th>Auteur</th><th>Dewey</th></tr>
-<TMPL_LOOP NAME=SEARCH_RESULTS>
+<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
   <tr>
-  <td><TMPL_VAR NAME=title></td>
-  <td><TMPL_VAR NAME=author></td>
-  <td align=right><TMPL_VAR NAME=dewey></td>
+  <td><!-- TMPL_VAR NAME=title --></td>
+  <td><!-- TMPL_VAR NAME=author --></td>
+  <td align=right><!-- TMPL_VAR NAME=dewey --></td>
   </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 <tr><td colspan=3 bgcolor=#ccccff>
     <table border=0 cellpadding=0 cellspacing=0 width=100%>
     <tr><td align=left>
-    <a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="prevstartfrom">>R&eacute;sultats pr&eacute;c&eacute;dents</a>
+    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->>Previous Records</a>
     </td><td align=right>
-    <a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="nextstartfrom">>R&eacute;sultats suivants</a>
+    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->>Next Records</a>
     </td></tr>
     </table>
 </td></tr>
 </table>
-<br>R&eacute;sultats <TMPL_VAR NAME="startfrom"> &agrave; <TMPL_VAR NAME="endat"> sur <TMPL_VAR NAME="numrecords"> enregistrements.
+<br>
+Résultats <i><!-- TMPL_VAR NAME="startfrom" --></i> à <i><!-- TMPL_VAR NAME="endat" --></i> sur <i><!-- TMPL_VAR NAME="numrecords" --></i> enregistrements.
 <hr>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail-opac.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail-opac.tmpl
index 2c001c446b..ff21d4e5eb 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail-opac.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail-opac.tmpl
@@ -1,75 +1,69 @@
-<TMPL_INCLUDE NAME="opac-top.inc">
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
 
-
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
-<TMPL_VAR NAME="class"></em></font><p>
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+<!-- TMPL_VAR NAME="class" --></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------BIBLIO RECORD TABLE--------->
+<!-----------------Notice bibliographique TABLE--------->
 <tr valign="top">
 
 <td bgcolor="#99cccc">
-<b>NOTICE</b>
+<b>Notice bibliographique</b>
 
-<TMPL_VAR NAME="biblionumber">
+<!-- TMPL_VAR NAME="biblionumber" -->
 </td>
 </tr>
 <tr valign="top">
 <td>
 <br>
 <FONT SIZE=2  face="arial, helvetica">
-<b>Sous-titre:</b> <TMPL_VAR NAME="subtitle"><br>
-<b>Auteur:</b> <TMPL_VAR NAME="author"><br>
-<b>Autre auteur:</b> <TMPL_VAR NAME="additional"><br>
-<b>Collection:</b> <TMPL_VAR NAME="seriestitle"><br>
-<b>Sujet:</b> <TMPL_VAR NAME="subject"><br>
-<b>Date de publi.:</b> <TMPL_VAR NAME="copyrightdate"><br>
-<b>Notes:</b> <TMPL_VAR NAME="notes"><br>
-<b>Unititle:</b> <TMPL_VAR NAME="unititle"><br>
-<b>P&eacute;rio.:</b> <TMPL_VAR NAME="serial"><br>
-<b>Nombre d'ex.:</b> <TMPL_VAR NAME="count">
+<b>Sous-titre:</b> <!-- TMPL_VAR NAME="subtitle" --><br>
+<b>Auteur:</b> <!-- TMPL_VAR NAME="author" --><br>
+<b>Auteur supplémentaire:</b> <!-- TMPL_VAR NAME="additional" --><br>
+<b>Titre Séries:</b> <!-- TMPL_VAR NAME="seriestitle" --><br>
+<b>Sujet:</b> <!-- TMPL_VAR NAME="subject" --><br>
+<b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br>
+<b>Titre uniforme:</b> <!-- TMPL_VAR NAME="unititle" --><br>
+<b>Périodiques:</b> <!-- TMPL_VAR NAME="serial" --><br>
+<b>Nombre total d'ouvrages:</b> <!-- TMPL_VAR NAME="count" -->
 <p>
 </font></td>
 </tr>
 </table>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 <center>
 <table border=0 cellspacing=0 cellpadding=2>
 <tr bgcolor="#99cccc">
-<td>Type de doc.</td>
-<td>Cote</td>
+<td>Catég ouvrage</td>
+<td>Catégorie</td>
 <td>Localisation</td>
-<td>Retour le</td>
-<td>Derni&egrave;re transaction</td>
+<td>Date de retour</td>
+<td>Vu</td>
 </tr>
-<TMPL_LOOP NAME="ITEM_RESULTS">
+<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 <tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td><TMPL_VAR NAME="class"></td>
-<td><TMPL_VAR NAME="branchname"></td>
-<td><TMPL_VAR NAME="datedue"></td>
-<td><TMPL_VAR NAME="datelastseen"></td>
+<td><!-- TMPL_VAR NAME="itemtype" --></td>
+<td><!-- TMPL_VAR NAME="class" --></td>
+<td><!-- TMPL_VAR NAME="branchname" --></td>
+<td><!-- TMPL_VAR NAME="datedue" --></td>
+<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 </tr>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="WEB_RESULTS">
+<!-- /TMPL_LOOP -->
+<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
 <tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td>Site web</td>
-<td>disponible</td>
-<td>en ligne</td>
+<td><!-- TMPL_VAR NAME="itemtype" --></td>
+<td>Site Web</td>
+<td>En ligne</td>
+<td>Disponible</td>
 <td></td>
 <td><a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR
-NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR
-NAME="biblioitemnumber">">http://<TMPL_VAR NAME="url"></a></td>
+NAME="itemnumber>&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<TMPL_VAR
+NAME="biblioitemnumber">">http://<!-- TMPL_VAR NAME="url" --></a></td>
 </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 </table>
 <p>
 </center>
@@ -77,4 +71,4 @@ NAME="biblioitemnumber">">http://<TMPL_VAR NAME="url"></a></td>
 <p />
 <p />
 
-<TMPL_INCLUDE NAME="opac-bottom.inc">
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
index 84dff0bd4f..b7f96504fd 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
@@ -1,115 +1,100 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<!--
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
--->
-
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-
-<p><font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
-<TMPL_VAR NAME="class"></em></font>
-<TMPL_IF NAME="norequests">
-<TMPL_ELSE>
-	<a href=request.pl?bib=<TMPL_VAR NAME="biblionumber"> class="button">R&eacute;servations</a>
-</TMPL_IF>
-</p>
-<table cellspacing="0" cellpadding="5" border="1" align="left" width="220">
-	<!-----------------BIBLIO RECORD TABLE--------->
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<!-- TMPL_IF NAME="norequests" -->
+	<!-- TMPL_ELSE -->
+		<table border=0 cellpadding=10 align=right>
+		<tr>
+			<td>
+				<a class="button" href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Requests</a>
+			</td>
+		</tr>
+		</table>
+	<!-- /TMPL_IF -->
+	<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+	<!-- TMPL_VAR NAME="class" --></em></font><p>
+	<table cellspacing="0" cellpadding="5" border="1" align="left" width="220">
+	<!-----------------Notice bibliographique TABLE--------->
 	<tr valign="top">
 		<td bgcolor="#cccc99" background="/images/background-mem.gif">
-			<b>Notice N° <TMPL_VAR NAME="biblionumber"></b>
+			<b>Notice bibliographique <!-- TMPL_VAR NAME="biblionumber" --></b>
 		</td>
 	</tr>
 	<tr valign="top">
 		<td>
-			<br/><a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">" class="button">MARC</a><br/><br/>
+			<br/><a href="MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">MARC</a><br/><br/>
 			<FONT SIZE=2  face="arial, helvetica">
-			<TMPL_IF name="subtitle"><b>Sous-titre:</b></TMPL_IF> <TMPL_VAR NAME="subtitle">
-			<TMPL_IF name="author"><b>Auteur:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></TMPL_IF><br>
-			<TMPL_IF name="additional"><b>Autre Auteur:</b><TMPL_VAR NAME="additional"><br></TMPL_IF>
-			<TMPL_IF name="publishercode"><b>Publié par :</b></TMPL_IF> <TMPL_VAR NAME="publishercode">
-			<TMPL_IF name="publicationyear"><b>en </b></TMPL_IF><TMPL_VAR NAME="publicationyear">
-			<TMPL_IF name="pages">, </TMPL_IF><TMPL_VAR name="pages">
-			<TMPL_IF name="size">, </TMPL_IF><TMPL_VAR name="size"><br/>
-			<TMPL_IF name="collection"><b>Collection:</b></TMPL_IF> <TMPL_VAR NAME="seriestitle"><br/>
-			<TMPL_IF name="subject"><b>Sujet:</b></TMPL_IF> <TMPL_VAR NAME="subject"><br/>
-			<TMPL_IF name="copyrightdate"><b>Ann&eacute;e:</b></TMPL_IF> <TMPL_VAR NAME="copyrightdate"><br/>
-			<TMPL_IF name="notes"><b>Notes:</b></TMPL_IF> <TMPL_VAR NAME="notes"><br/>
-			<TMPL_IF name="unititle"><b>Titre uniforme:</b></TMPL_IF> <TMPL_VAR NAME="unititle"><br/>
-			<TMPL_IF name="serial"><b>P&eacute;riodique:</b><TMPL_VAR NAME="serial"></TMPL_IF><br/>
-			<TMPL_IF name="dewey"><b>Côte dewey :</b></TMPL_IF><TMPL_VAR name="dewey"><br/>
-			<TMPL_IF name="url"><b>URL :</b> <a hre="<TMPL_VAR name="url"><TMPL_VAR NAME="url"></a></TMPL_IF><br>
-			<b>Nbre total d'exemplaires:</b> <TMPL_VAR NAME="count">
-			<p>
+			<!-- TMPL_IF name="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subtitle" --><b>Sous-titre:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="author" --><b>Auteur:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="additional" --><b>Auteur supplémentaire:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="publishercode" --><b>Publié par :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="publicationyear" --><b>en </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
+			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subject" --><b>Sujet:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="copyrightdate" --><b>Année :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="unititle" --><b>Titre uniforme:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF name="serial" --><b>Périodiques:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<b>Nombre total d'ouvrages:</b> <!-- TMPL_VAR NAME="count" -->
 			</font>
 		</td>
 	</tr>
-</table>
-</TMPL_LOOP>
+	</table>
+<!-- /TMPL_LOOP -->
 <!-- FIXME - The help box overflows on the right. I think this is
      because it is specified as "width=70%", which the browser
-     interprets as 70% of the width of the browser window. However,
+     interprets as 70% sur the width sur the browser window. However,
      leaving out the "width=70%" makes the help box abut the "biblio
      record" box. I think the fix is to put all three boxes in a
-     table, for layout, and make the help box as wide as it wants to
+     table, for layout, et make the help box as wide as it wants to
      be. -->
 
 <center>
 <table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor="#cccc99" background="/images/background-mem.gif">
-<td>Type de document</td>
-<td>Cote</td>
-<td>Localisation</td>
-<td>Retour pr&eacute;vu</td>
-<td>Derni&egrave;re transaction</td>
-<td>Code-barres</td>
-<td>Volume</td>
-</tr>
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<tr>
-<td><TMPL_VAR NAME="description"></td>
-<td><a href=/cgi-bin/koha/search.pl?dewey=<TMPL_VAR NAME="dewey" ESCAPE=URL>><TMPL_VAR NAME="class"></a></td>
-<td><TMPL_VAR NAME="branchname"></td>
-<td><TMPL_VAR NAME="datedue"></td>
-<td><TMPL_VAR NAME="datelastseen"></td>
-<td><a href="/cgi-bin/koha/moredetail.pl?type=<TMPL_VAR NAME="type">&item=<TMPL_VAR NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">"><TMPL_VAR NAME="barcode"></a></td>
-<td><TMPL_VAR NAME="volumeddesc"></td>
-<TMPL_IF NAME="type">
-<td><a href=/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=<TMPL_VAR
-NAME="biblioitemnumber">&item=<TMPL_VAR NAME="itemtype">>Fix Itemtype</a></td>
-</TMPL_IF>
-</tr>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="WEB_RESULTS">
-<tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td>Site web</td>
-<td>disponible</td>
-<td>en ligne</td>
-<td></td>
-<td><a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR
-NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR
-NAME="biblioitemnumber">">http://<TMPL_VAR NAME="url"></a></td>
-</tr>
-</TMPL_LOOP>
+	<tr bgcolor="#cccc99" background="/images/background-mem.gif">
+		<th>Catég ouvrage</th>
+		<th>Localisation</th>
+		<th>Date de retour</th>
+		<th>Vu</th>
+		<th>Code barre</th>
+		<td>Volume</td>
+	</tr>
+	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="bulk" --> <!-- TMPL_VAR NAME="bulk" --><!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="datedue" --></td>
+			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
+			<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+			<!-- TMPL_IF NAME="type" -->
+				<td>
+					<a href=/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&item=<!-- TMPL_VAR NAME="itemtype" -->>Fix Itemtype</a>
+				</td>
+			<!-- /TMPL_IF -->
+		</tr>
+	<!-- /TMPL_LOOP -->
+	<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td>Site Web</td>
+			<td>En ligne</td>
+			<td>Disponible</td>
+			<td></td>
+			<td>
+				<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">http://<!-- TMPL_VAR NAME="url" --></a>
+			</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
 </table>
 <p>
-<table border="0" cellspacing="0" cellpadding="5" width=70%>
-<tr valign="top">
-<td bgcolor="99cc33" background="/images/background-mem.gif"
-colspan="2"><p><b>HELP</b><br>
-<b>Mettre &agrave; jour la notice pour tous les exemplaires:</b> cliquez sur le bouton <b>Modifier</b>
-      [&agrave; gauche] pour modifier la notice.  Tout changement sera r&eacute;percut&eacute; sur la notice de <b>tous</b> les exemplaires ci-dessus. <p>
-<b>Mettre &agrave; jour la notice pour UN ou QUELQUES exemplaires:</b>
-Si certains exemplaires ci-dessus doivent avoir une notice diff&eacute;rente, ou sont li&eacute;s &agrave; la mauvaise notice, vous devez utiliser le module
-<a
-href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">acquisitions</a>. Vous devrez "re-commander" les exemplaires, et les effacer de cette notice.
-<p /></tr>
-</table>
 </center>
 <br clear=all>
 <p />
@@ -118,30 +103,31 @@ href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">acquisitions</a>. Vous d
 <table border="1" cellspacing="0" cellpadding="5" width="90%">
 <tr valign="top">
 <td bgcolor="$main"
-background="/images/background-mem.gif"><b>R&eacute;sum&eacute;</b></td>
+background="/images/background-mem.gif"><b>Résumé</b></td>
 </tr>
 <tr valign="top">
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<td><TMPL_VAR NAME="abstract"></td>
-</TMPL_LOOP>
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+<td><!-- TMPL_VAR NAME="abstract" --></td>
+<!-- /TMPL_LOOP -->
 </tr>
 </table>
 <p />
 <table border="1" cellspacing="0" cellpadding="5" width="90%">
 <tr valign="top">
-<td bgcolor="$main" background="/images/background-mem.gif"><b>Liens vers des sites web associ&eacute;s<b></td>
+<td bgcolor="$main" background="/images/background-mem.gif"><b>Links to
+Associated Websites<b></td>
 </tr>
-<TMPL_LOOP NAME="SITE_RESULTS">
+<!-- TMPL_LOOP NAME="SITE_RESULTS" -->
 <tr>
-<td><b>Titre:</b> <TMPL_VAR name="title"><br>
-<b>Description:</b> <TMPL_VAR name="description"><br>
-<b>URL:</b><a href="http://<TMPL_VAR name="url">">http://<TMPL_VAR
+<td><b>Titre:</b> <!-- TMPL_VAR name="title" --><br>
+<b>Description:</b> <!-- TMPL_VAR name="description" --><br>
+<b>URL:</b><a href="http://<!-- TMPL_VAR name="url" -->">http://<TMPL_VAR
 name="url"></a><br>
 </td>
 </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 </table>
 
 -->
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detailprint.tmpl
new file mode 100644
index 0000000000..cfb56cb90b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detailprint.tmpl
@@ -0,0 +1,52 @@
+<html>
+<body onLoad="window.print();self.close();">
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<table cellspacing="0" cellpadding="1" border="1" width=500>
+	<tr valign="top">
+		<td bgcolor="#cccc99" background="/images/background-mem.gif">
+			<b>Notice bibliographique <!-- TMPL_VAR NAME="biblionumber" --></b>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td>
+			<!-- TMPL_VAR NAME="author" --><br>
+			<b><!-- TMPL_VAR NAME="title" --></b><!-- TMPL_VAR NAME="subtitle" --><br>
+			<!-- TMPL_VAR NAME="additional" --><br>
+			<!-- TMPL_IF name="publishercode" --><b>Publié par :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="publicationyear" --><b>en </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
+			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subject" --><b>Sujet:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="copyrightdate" --><b>Année :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="unititle" --><b>Titre uniforme:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br>
+			</font>
+		</td>
+	</tr>
+	</table>
+<!-- /TMPL_LOOP -->
+
+<table border=0 cellspacing=0 cellpadding=2>
+	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" -->, <!-- TMPL_VAR NAME="bulk" --></td>
+			<td><!-- TMPL_VAR NAME="barcode" --></td>
+			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+<SCRIPT>
+function docprint() {
+	window.print();
+	window.close();
+}
+</SCRIPT>
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/moredetail.tmpl
index c8c6810b4b..66a0615e8a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/moredetail.tmpl
@@ -1,96 +1,96 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
 <center>
 <br>
-<TMPL_LOOP NAME="BIBITEM_DATA">
+<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
 <table border=0 cellpadding=10 align=right>
 <tr>
 	<td>
-		<a class="button" href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">>R&eacute;servations</a>
+		<a class="button" href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Requests</a>
 	</td>
 </tr>
 </table>
 <h1><a
-href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra><TMPL_VAR NAME="title">
-(<TMPL_VAR NAME="author">)</a></h1><P>
+href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra><!-- TMPL_VAR NAME="title" -->
+(<!-- TMPL_VAR NAME="author" -->)</a></h1><P>
 <p>
 <form action=/cgi-bin/koha/modbibitem.pl>
-<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>
-<input type=hidden name=biblio value=<TMPL_VAR NAME="biblionumber">>
+<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
+<input type=hidden name=biblio value=<!-- TMPL_VAR NAME="biblionumber" -->>
 <!-------------------BIBLIO ITEM------------>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
 <TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"
-><B><TMPL_VAR NAME="biblioitemnumber"> GROUPE - <TMPL_VAR NAME="description"> </b> </TD>
+<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"
+><B><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP - <!-- TMPL_VAR NAME="description" --> </b> </TD>
 </TR>
 <tr VALIGN=TOP  >
 <TD width=210 >
-<INPUT TYPE="image" name="submit"  VALUE="modify" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png">
-<INPUT TYPE="image" name="delete"  VALUE="delete"border=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png">
+<INPUT TYPE="image" name="submit"  VALUE="modifier" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
+<INPUT TYPE="image" name="delete"  VALUE="delete"border=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
 <br>
 <FONT SIZE=2  face="arial, helvetica">
-<b>num&eacute;ro de notice:</b> <TMPL_VAR NAME="biblionumber"><br>
-<b>Type de document:</b> <TMPL_VAR NAME="itemtype"><br>
-<b>URL :</b> <TMPL_VAR NAME="url"><br>
-<b>Dur&eacute;e de pr&ecirc;t :</b> <TMPL_VAR NAME="loanlength"><br>
-<b>Co&ucirc;t du pr&ecirc;t :</b> <TMPL_VAR NAME="rentalcharge"><br>
-<b>Cote :</b> <TMPL_VAR NAME="classification"><TMPL_VAR NAME="dewey"><TMPL_VAR NAME="subclass"><br>
-<b>ISBN:</b> <TMPL_VAR NAME="isbn"><br>
-<b>Editeur :</b> <TMPL_VAR NAME="publishercode"> <br>
-<b>Lieu :</b> <TMPL_VAR NAME="place"><br>
-<b>Date:</b> <TMPL_VAR NAME="publicationyear"><br>
-<b>Volume :</b> <TMPL_VAR NAME="volumeddesc"><br>
-<b>Pages :</b> <TMPL_VAR NAME="pages"><br>
-<b>Ill :</b> <TMPL_VAR NAME="illus"><br>
-<b>Taille :</b> <TMPL_VAR NAME="size"><br>
-<b>Notes :</b> <TMPL_VAR NAME="bnotes"><br>
-<b>Nbre d'exemplaires :</b> <TMPL_VAR NAME="count">
+<b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
+<b>Catég ouvrage:</b> <!-- TMPL_VAR NAME="itemtype" --><br>
+<b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
+<b>Durée de prêt:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
+<b>Coût du prêt:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
+<b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --><br>
+<b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
+<b>Editeur:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
+<b>Lieu:</b> <!-- TMPL_VAR NAME="place" --><br>
+<b>Date:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
+<b>Volume:</b> <!-- TMPL_VAR NAME="volumeddesc" --><br>
+<b>Pages:</b> <!-- TMPL_VAR NAME="pages" --><br>
+<b>Ill.:</b> <!-- TMPL_VAR NAME="illus" --><br>
+<b>Taille:</b> <!-- TMPL_VAR NAME="size" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
+<b>Nombre d'ouvrages:</b> <!-- TMPL_VAR NAME="count" -->
 </font>
 </TD>
 </tr>
 </table>
 </form>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="ITEM_DATA">
-<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=16 height=300 align=left>
+<!-- /TMPL_LOOP -->
+<!-- TMPL_LOOP NAME="ITEM_DATA" -->
+<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=16 height=300 align=left>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
 <TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>CODE-BARRES
-<TMPL_VAR NAME="barcode"></b></TD>
+<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>CODE BARRE
+<!-- TMPL_VAR NAME="barcode" --></b></TD>
 </TR>
 <tr VALIGN=TOP>
 <TD width=220>
 <form action=/cgi-bin/koha/moditem.pl method=post>
-<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>
-<input type=hidden name=item value=<TMPL_VAR NAME="itemnumber">>
-<input type=hidden name=type value=<TMPL_VAR NAME="type">>
-<INPUT TYPE="image" name="submit"  VALUE="modify" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png">
-<INPUT TYPE="image" name="delete"  VALUE="delete" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png">
+<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
+<input type=hidden name=item value=<!-- TMPL_VAR NAME="itemnumber" -->>
+<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
+<INPUT TYPE="image" name="submit"  VALUE="modifier" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
+<INPUT TYPE="image" name="delete"  VALUE="delete" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
 <br>
 <FONT SIZE=2  face="arial, helvetica">
-<b>Localisation d'origine :</b> <TMPL_VAR NAME="homebranch"><br>
-<b>Derni&egrave;re transaction :</b> <TMPL_VAR NAME="datelastseen"><br>
-<b>Dernier emprunt :</b> <TMPL_VAR NAME="timestamp0"><br>
+<b>Annexe propriétaire:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+<b>Vu:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+<b>Dernier prêt:</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
 <!-- on issue bit -->
-<TMPL_VAR NAME="issue">
+<!-- TMPL_VAR NAME="issue" -->
 <!-- after -->
-<b>Dernier emprunteur 1 :</b> <TMPL_VAR NAME="card0"><br>
-<b>Last Borrower 2 :</b> <TMPL_VAR NAME="card1"><br>
-<b>Localisation actuelle :</b> <TMPL_VAR NAME="holdingbranch"><br>
-<b>Prix de remplacement :</b> <TMPL_VAR NAME="replacementprice"><br>
-<b>Exemplaire perdu :</b> <TMPL_VAR NAME="itemlost"><br>
-<b>Pay&eacute; :</b> <TMPL_VAR NAME="paidfor"><br>
-<b>Notes:</b> <TMPL_VAR NAME="itemnotes"><br>
-<b>Prolongations :</b> <TMPL_VAR NAME="renewals"><br>
-<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<TMPL_VAR NAME="ordernumber">&biblio=<TMPL_VAR NAME="biblionumber">&invoice=<TMPL_VAR NAME="booksellerinvoicenumber">&catview=yes">
+<b>Dernier emprunteur 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+<b>Dernier emprunteur 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+<b>Annexe:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+<b>Prix Remplacement:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+<b>Ouvrage perdu:</b> <!-- TMPL_VAR NAME="itemlost" --><br>
+<b>Payé pour:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
+<b>Renouvellements:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=oui">
 Accession</a>
-Date:<TMPL_VAR NAME="dateaccessioned"><br>
-<b>Cancelled: <TMPL_VAR NAME="wthdrawn"><br>
+Date:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
+<b>Annulé: <!-- TMPL_VAR NAME="wthdrawn" --><br>
 <b><a
-href=/cgi-bin/koha/bookcount.pl?&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">&itm=<TMPL_VAR NAME="itemnumber">>
-Nbre total de prets :</a></b> <TMPL_VAR NAME="issues"><br>
-<b>Num&eacute;ro de groupe :</b> <TMPL_VAR NAME="biblioitemnumber"> <br>
-<b>Num&eacute;ro de notice :</b> <TMPL_VAR NAME="biblionumber"> <br>
+href=/cgi-bin/koha/bookcount.pl?&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&itm=<!-- TMPL_VAR NAME="itemnumber" -->>Total
+Prêts:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
+<b>N° Groupe:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
+<b>N° Biblio:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
 
 
 
@@ -99,10 +99,10 @@ Nbre total de prets :</a></b> <TMPL_VAR NAME="issues"><br>
 </tr>
 </table>
 </form>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 
 <p>
 </form>
 </center>
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
index 3d17e49b54..a77f9809bb 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
@@ -1,114 +1,101 @@
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
+<!-- TMPL_IF NAME="opac" -->
+	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
 <center>
 
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
 
+<!-- TMPL_IF NAME=searchdesc -->
+	Recherche effectuée sur <b><!-- TMPL_VAR NAME=searchdesc --></b>
+<!-- TMPL_ELSE -->
+	Vous n'avez pas spécifié de critère<br>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=searchdesc>
-    Votre recherche : <b><TMPL_VAR NAME=searchdesc></b>
-<TMPL_ELSE>
-    Vous n'avez sp&eacute;cifi&eacute; aucun crit&egrave;re de recherche<br>
-</TMPL_IF>
-
-<TMPL_VAR NAME=numrecords> r&eacute;sultats trouv&eacute;s
+<!-- TMPL_VAR NAME=numrecords --> Résultats trouvés
 <p>
+<!-- Row sur numbers corresponding to search result pages -->
+<!-- TMPL_IF NAME=displayprev -->
+	<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/prev.gif border=0></a>
+<!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+<!-- /TMPL_IF -->
+<!-- TMPL_LOOP NAME=numbers -->
+	<!-- TMPL_IF NAME=highlight -->
+	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif>
+	<!-- TMPL_ELSE -->
+	<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0></a>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+<!-- TMPL_IF NAME=displaynext -->
+	<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/next.gif border=0></a>
+<!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+<!-- /TMPL_IF -->
 
-
-    <!-- Row of numbers corresponding to search result pages -->
-	<TMPL_IF NAME=displayprev>
-		<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/prev.gif border=0></a>
-	<TMPL_ELSE>
-		<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-	</TMPL_IF>
-	<TMPL_LOOP NAME=numbers>
-		<TMPL_IF NAME=highlight>
-		<img src=<TMPL_VAR name="themelang">/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
-		<TMPL_ELSE>
-		<a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
-		</TMPL_IF>
-	</TMPL_LOOP>
-	<TMPL_IF NAME=displaynext>
-		<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/next.gif border=0></a>
-	<TMPL_ELSE>
-		<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-	</TMPL_IF>
-    <p>
-
-
-
-<!-- Search Results Table -->
-
-<TMPL_IF NAME=numrecords>
-
-    <table border=0 cellspacing=0 cellpadding=2 width=90%>
-    <tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>>
-	    <th align=left>Titre</th><th align=left>Auteur</th><th>Ann&eacute;e</th><th>Nbre d'exemplaires</th><th>Localisation</th>
-	  <TMPL_IF NAME="opac">
-	  <TMPL_ELSE>
-	    <th>&nbsp;</th>
-	  </TMPL_IF>
-    </tr>
-
-
-
-<!-- Actual Search Results -->
-
-    <TMPL_LOOP NAME=SEARCH_RESULTS>
-      <tr>
-      <td><a href=/cgi-bin/koha/<TMPL_VAR name="script">?type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>&bib=<TMPL_VAR NAME=biblionumber ESCAPE=HTML>><TMPL_VAR NAME=title></a></td>
-      <td><a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME=authorhtmlescaped>&type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><TMPL_VAR NAME=author></a></td>
-      <td align=center> <TMPL_VAR NAME=copyrightdate> </td>
-      <td align=center> <TMPL_VAR NAME=itemcount> </td>
-      <td> <TMPL_VAR NAME=location> </td>
-      <TMPL_IF NAME="opac">
-      <TMPL_ELSE>
-	<td> <a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">>R&eacute;servation</a></td>
-      </TMPL_IF>
-      </tr>
-    </TMPL_LOOP>
-
-
-
-    <tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE>bgcolor=#ccccff background="/images/background-mem.gif"</TMPL_IF>><td colspan=6>
-	<table border=0 cellpadding=0 cellspacing=0 width=100%">
-	<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE>bgcolor=#ccccff background="/images/background-mem.gif"</TMPL_IF>><td align=left>
-	<TMPL_IF NAME=displayprev>
-		<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>R&eacute;sultats pr&eacute;c&eacute;dents</a>
-	<TMPL_ELSE>
-	    &nbsp;
-	</TMPL_IF>
-	</td><td align=right>
-	<TMPL_IF NAME=displaynext>
-		<a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>R&eacute;sultats suivants</a>
-	<TMPL_ELSE>
-	    &nbsp;
-	</TMPL_IF>
-	</td></tr>
-	</table>
-    </td></tr>
-    </table>
-
-    <br>
-    R&eacute;sultats <TMPL_VAR NAME="startfrom"> &agrave; <TMPL_VAR NAME="endat"> sur <TMPL_VAR NAME="numrecords"> enregistrements.
-    <hr>
-
-    Essayez une nouvelle <a href=/cgi-bin/koha/catalogue-home.pl>recherche</a>
-
-<TMPL_ELSE>
-    Essayez une nouvelle <a href=/cgi-bin/koha/catalogue-home.pl>recherche</a>
-</TMPL_IF>
-
-
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-bottom.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-bottom.inc">
-</TMPL_IF>
+<p>
+<!-- Résultats de recherche Table -->
+<!-- TMPL_IF NAME=numrecords -->
+<table border=0 cellspacing=0 cellpadding=2 width=90%>
+<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE --> background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
+	<th align=left>Titre</th><th align=left>Auteur</th><th>&copy;</th><th>Nombre d'ouvrages</th><th>Localisation</th>
+	<!-- TMPL_IF NAME="opac" -->
+	<!-- TMPL_ELSE -->
+	<th>&nbsp;</th>
+	<!-- /TMPL_IF -->
+</tr>
+<!-- Actual Résultats de recherche -->
+<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+	<tr>
+		<td><a href=/cgi-bin/koha/<!-- TMPL_VAR name="script" -->?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&bib=<!-- TMPL_VAR NAME=biblionumber ESCAPE=URL -->><!-- TMPL_VAR NAME=title --></a></td>
+		<td><a href=/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME=authorhtmlescaped -->&type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><!-- TMPL_VAR NAME=author --></a></td>
+		<td align=center> <!-- TMPL_VAR NAME=copyrightdate --> </td>
+		<td align=center> <!-- TMPL_VAR NAME=itemcount --> </td>
+		<td> <!-- TMPL_VAR NAME=location --> </td>
+		<!-- TMPL_IF NAME="opac" -->
+		<!-- TMPL_ELSE -->
+			<td> <a href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Réservation</a></td>
+		<!-- /TMPL_IF -->
+	</tr>
+<!-- /TMPL_LOOP -->
+
+<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
+	<td colspan=6>
+		<table border=0 cellpadding=0 cellspacing=0 width=100%">
+			<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
+			<td align=left>
+				<!-- TMPL_IF NAME=displayprev -->
+				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->>Previous Records</a>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!-- /TMPL_IF -->
+			</td>
+			<td align=right>
+				<!-- TMPL_IF NAME=displaynext -->
+				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->>Next Records</a>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!-- /TMPL_IF -->
+			</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+</table>
+
+<br>
+Résultats <b><!-- TMPL_VAR NAME="startfrom" --></b> à <b><!-- TMPL_VAR NAME="endat" --></b> sur <b><!-- TMPL_VAR NAME="numrecords" --></b> enregistrements.
+<hr>
+
+Essayer une autre <a href=/cgi-bin/koha/catalogue-home.pl>recherche</a>
+
+<!-- TMPL_ELSE -->
+    Essayer une autre <a href=/cgi-bin/koha/catalogue-home.pl>recherche</a>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl
index a194052b0e..c8efda116e 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl
@@ -1,41 +1,51 @@
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
-
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="opac" -->
+	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
 
 <center>
 
 <table border=0 cellspacing=0 cellpadding=2>
-<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>>
-<th>Sujet</th></tr>
-<TMPL_LOOP NAME=SEARCH_RESULTS>
-  <tr>
-  <td><a href=/cgi-bin/koha/search.pl?type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>&subjectitems=<TMPL_VAR NAME=subject2 ESCAPE=HTML>><TMPL_VAR NAME=subject></a></td>
-  </tr>
-</TMPL_LOOP>
-<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>><td colspan=4>
-    <table border=0 cellpadding=0 cellspacing=0 width=100%>
-    <tr><td align=left>
-    <a href=search.pl?<TMPL_LOOP name=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>startfrom=<TMPL_VAR NAME="prevstartfrom">>R&eacute;sultats pr&eacute;c&eacute;dents</a>
-    </td><td align=right>
-    <a href=search.pl?<TMPL_LOOP name=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>startfrom=<TMPL_VAR NAME="nextstartfrom">>R&eacute;sultats suivants</a>
-    </td></tr>
-    </table>
-</td></tr>
+<!-- TMPL_IF NAME="opac" -->
+	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
+<!-- TMPL_ELSE -->
+	<tr background="/images/background-mem.gif">
+<!-- TMPL_ELSE -->
+		<th>Sujet</th>
+	</tr>
+<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+	<tr>
+		<td>
+			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME=subject --></a>
+		</td>
+	</tr>
+<!-- /TMPL_LOOP -->
+<!-- TMPL_IF NAME="opac" -->
+	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
+<!-- TMPL_ELSE -->
+	<tr background="/images/background-mem.gif">
+<!-- /TMPL_IF -->
+		<td colspan=4>
+			<table border=0 cellpadding=0 cellspacing=0 width=100%>
+			<tr>
+				<td align=left>
+					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
+				</td>
+				<td align=right>
+					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
+				</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
 </table>
 <br>
-R&eacute;sultats <TMPL_VAR NAME="startfrom"> &agrave; <TMPL_VAR NAME="endat"> sur <TMPL_VAR NAME="numrecords"> r&eacute;sultats.
+Résultats <b><!-- TMPL_VAR NAME="startfrom" --></b> à <b><!-- TMPL_VAR NAME="endat" --> sur <!-- TMPL_VAR NAME="numrecords" --></b> enregistrements.
 <hr>
 
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-bottom.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-bottom.inc">
-</TMPL_IF>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl b/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl
index 1ac60cd51a..361d53c6c3 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl
@@ -1,33 +1,32 @@
-<HTML>
-
-<TMPL_VAR NAME=startmenuissue>
-
-<p> Chaque champ doit &ecirc;tre rempli avec le montant de l'amende, le d&eacute;lai 
-  et le cycle<br>
-  (par ex. 1,7,7 = &euro; 1.- d'amende, apr&egrave;s 7 jours, tous les 7 jours). 
-<p>
-
-<table>
-  <tr bgcolor="white">
-    <TMPL_LOOP NAME=firstrowloop>
-      <td><TMPL_VAR NAME=description></td>
-    </TMPL_LOOP>
-  </tr>
-  <form action=/cgi-bin/koha/updatecharges.pl method=post>
-  <TMPL_LOOP NAME=tablebodyloop>
-    <tr bgcolor="whitw">
-      <td><TMPL_VAR NAME=description></td>
-      <TMPL_LOOP NAME=rowloop>
-        <td><input type=text name="<TMPL_VAR NAME=name>" value="<TMPL_VAR NAME=value>" size=6></td>
-      </TMPL_LOOP>
-    </tr>
-  </TMPL_LOOP>
-</form></table>
-
-<input type=submit value="Envoyer">
-
-
-<TMPL_VAR NAME=endmenuissue>
-
-</body>
+<HTML>
+
+<!-- TMPL_VAR NAME=startmenuissue -->
+
+<p>
+Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité<br>
+ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours.<p>
+
+<table>
+  <tr bgcolor="white">
+    <!-- TMPL_LOOP NAME=firstrowloop -->
+      <td><!-- TMPL_VAR NAME=description --></td>
+    <!-- /TMPL_LOOP -->
+  </tr>
+  <form action=/cgi-bin/koha/updatecharges.pl method=post>
+  <!-- TMPL_LOOP NAME=tablebodyloop -->
+    <tr bgcolor="whitw">
+      <td><!-- TMPL_VAR NAME=description --></td>
+      <!-- TMPL_LOOP NAME=rowloop -->
+        <td><input type=text name="<!-- TMPL_VAR NAME=name -->" value="<!-- TMPL_VAR NAME=value -->" size=6></td>
+      <!-- /TMPL_LOOP -->
+    </tr>
+  <!-- /TMPL_LOOP -->
+</table>
+
+<input type=submit>
+</form>
+
+<!-- TMPL_VAR NAME=endmenuissue -->
+
+</body>
 </HTML>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl
index 9d9a67ab3a..588c7f324a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl
@@ -1,159 +1,162 @@
-<TMPL_INCLUDE Name="circulation-top.inc">
+<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
 <table align=right cellpadding=10><tr><td>
-<a href=circulation.pl class="button">Prêt</a> &nbsp
-<a href=returns.pl class="button">Retours</a>
+<a class="button" href=circulation.pl>
+Emprunteur suivant</a>
+<a class="button" href=returns.pl>
+Retours
 </td></tr></table>
 
-<h1>Circulation: Transferts</h1>
-<b>Annexe :</b> <TMPL_VAR Name="genbrname"><br>
-<b>Imprimante :</b> <TMPL_VAR Name="genprname"> <a href=selectbranchprinter.pl>Modifier</a>
-<input type=hidden name=branch value=<TMPL_VAR Name="branch">>
-<input type=hidden name=printer value=<TMPL_VAR Name="printer">>
+<h1>Circulation: Transferts</h1><br>
+<b>Annexe:</b> <!-- TMPL_VAR Name="genbrname" --> &nbsp
+<b>Imprimante:</b> <!-- TMPL_VAR Name="genprname" --><br>
+<a href=selectbranchprinter.pl>Changer Paramètres</a>
+<input type=hidden name=branch value=<!-- TMPL_VAR Name="branch" -->>
+<input type=hidden name=printer value=<!-- TMPL_VAR Name="printer" -->>
 <p>
 
-<TMPL_IF Name="found">
+<!-- TMPL_IF Name="found" -->
 	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-	<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Réservation</font></th></tr>
+	<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Réservation trouvée</font></th></tr>
 	<tr><td> <font color='red' size='+2'>
-		<TMPL_IF Name="reserved">Reservé :</font>  Réservation trouvée pour <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onClick="openWindow(this,'Member', 480, 640); return false;"><TMPL_VAR Name="borcnum"></a>).</TMPL_IF>
-		<TMPL_IF Name="waiting"> Exemplaire en attente :</font><br>
-    			L'exemplaire est marqué en attente à <TMPL_VAR Name="branchname"> pour <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onClick="openWindow(this,'Member', 480, 640); return false;"><TMPL_VAR Name="borcnum"></a>).<br></TMPL_IF>
+		<!-- TMPL_IF Name="reserved" -->Réservé:</font> Réservation trouvée pour <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onClick="openWindow(this,'Lecteur', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="waiting" --> Ouvrage marqué en attente:</font><br>
+    Ouvrage est marqué en attente à <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onClick="openWindow(this,'Lecteur', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<br><!-- /TMPL_IF -->
 		<table border=1 cellpadding=5 cellspacing=0>
 		<tr><td>
-			<TMPL_IF Name="reserved">Marquer reservation et transférer exemplaire à <b><TMPL_VAR Name="branchname"> </b>: </TMPL_IF>
-			<TMPL_IF Name="waiting">Supprimer réservation et transférer : </TMPL_IF>
+			<!-- TMPL_IF Name="reserved" -->Changer Réserver en "en attente" et transférer le livre vers <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="waiting" -->Annuler réservation et tenter un transfert: <!-- /TMPL_IF -->
 		</td>
 		<td>
 			<form method=post action='branchtransfers.pl'>
-				<TMPL_LOOP Name="trsfitemloop">
-					<input type=hidden name=bc-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-					<input type=hidden name=fb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="frombrcd">>
-					<input type=hidden name=tb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="tobrcd">>
-				</TMPL_LOOP>
-				<input type=hidden name=itemnumber value=<TMPL_VAR Name="itemnumber">>
-				<input type=hidden name=borrowernumber value=<TMPL_VAR Name="bornum">>
-				<TMPL_IF Name="waiting"><input type=hidden name=barcode value=<TMPL_VAR Name="barcode">>
+				<!-- TMPL_LOOP Name="trsfitemloop" -->
+					<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+					<input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
+					<input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
+				<!-- /TMPL_LOOP -->
+				<input type=hidden name=itemnumber value=<!-- TMPL_VAR Name="itemnumber" -->>
+				<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
+				<!-- TMPL_IF Name="waiting" --><input type=hidden name=barcode value=<!-- TMPL_VAR Name="barcode" -->>
 					<input type=hidden name=request value='KillWaiting'>
-					<input type=submit value="Cancel">
-				</TMPL_IF>
-				<TMPL_IF Name="reserved"><input type=hidden name=request value='SetWaiting'>
-					<input type=submit value="Waiting"></TMPL_IF>
+					<input type=submit value="Annuler">
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="reserved" --><input type=hidden name=request value='SetWaiting'>
+					<input type=submit value="En attente"><!-- /TMPL_IF -->
 			</form>
 		</td></tr>
-		<TMPL_IF Name="reserved"><tr><td>supprimer réservation et transférer:</td>
+		<!-- TMPL_IF Name="reserved" --><tr><td>Annuler réservation et tenter un transfert:</td>
 			<td>
 			<form method=post action='branchtransfers.pl'>
 
-			<TMPL_LOOP Name="trsfitemloop">
-				<input type=hidden name=bc-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-				<input type=hidden name=fb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="frombrcd">>
-				<input type=hidden name=tb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="tobrcd">>
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP Name="trsfitemloop" -->
+				<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+				<input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
+				<input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
+			<!-- /TMPL_LOOP -->
 
-			<input type=hidden name=biblionumber value=<TMPL_VAR Name="biblionumber">>
-			<input type=hidden name=borrowernumber value=<TMPL_VAR Name="bornum">>
-			<input type=hidden name=tobranchcd value=<TMPL_VAR Name="tobranchcd">>
-			<input type=hidden name=barcode value=<TMPL_VAR Name="barcode">>
+			<input type=hidden name=biblionumber value=<!-- TMPL_VAR Name="biblionumber" -->>
+			<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
+			<input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobranchcd" -->>
+			<input type=hidden name=barcode value=<!-- TMPL_VAR Name="barcode" -->>
 			<input type=hidden name=request value='KillReserved'>
-			<input type=submit value="Cancel">
+			<input type=submit value="Annuler">
 			</form>
-		</TMPL_IF>
+		<!-- /TMPL_IF -->
 		</td></tr>
-		<tr><td>Ignorer et retourner au transfert: </td>
+		<tr><td>Ignorer et retourner aux transferts: </td>
 			<td>
 			<form method=post action='branchtransfers.pl'>
-			<input type=hidden name=tobranchcd value=<TMPL_VAR Name="tobranchcd">>
+			<input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobranchcd" -->>
 			<input type=hidden name=barcode value=0>
-			<TMPL_LOOP Name="trsfitemloop">
-				<input type=hidden name=bc-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-				<input type=hidden name=fb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="frombrcd">>
-				<input type=hidden name=tb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="tobrcd">>
-			</TMPL_LOOP>
-			<input type=submit value="Ignore">
+			<!-- TMPL_LOOP Name="trsfitemloop" -->
+				<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+				<input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
+				<input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
+			<!-- /TMPL_LOOP -->
+			<input type=submit value="Ignorer">
 			</form>
 			</td>
 		</tr></table>
 	</td></tr></table>
 
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-	<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Messages</font></th></tr>
+	<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Messages</font></th></tr>
 	<tr><td>
-	<TMPL_IF Name="reqmessage">
-		<TMPL_IF Name="cancelled">
+	<!-- TMPL_IF Name="reqmessage" -->
+		<!-- TMPL_IF Name="cancelled" -->
 			Réservation annulée<br>
-		</TMPL_IF>
-		<TMPL_IF Name="setwaiting">
-			Exemplaire marqué en attente au site : <TMPL_VAR Name="reqbrchname"><br>
-		</TMPL_IF>
-	</TMPL_IF>
-	<TMPL_LOOP Name="errmsgloop">
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="setwaiting" -->
+			Ouvrage doit être en attente à l'annexe: <!-- TMPL_VAR Name="reqbrchname" --><br>
+		<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
+	<!-- TMPL_LOOP Name="errmsgloop" -->
 		<font color='red' size='+2'>
-		<TMPL_IF Name="errbadcode">
-			Pas d'exemplaire avec le code barre : <TMPL_VAR Name="msg">
-		</TMPL_IF>
-		<TMPL_IF Name="errispermanent">
-			Renvoyer exemplaire à son propriétaire : <TMPL_VAR Name="msg">
-		</TMPL_IF>
-		<TMPL_IF Name="errdesteqholding">
-			L'exemplaire est déjà noté arrivé.
-		</TMPL_IF>
-		<TMPL_IF Name="errwasreturned">
-			Exemplaire emprunté par <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">"
-						onClick="openWindow(this,'Member', 480, 640); return false;"><TMPL_VAR Name="borcnum"></a>
-<TMPL_VAR Name="name"> et rendu
-		</TMPL_IF>
+		<!-- TMPL_IF Name="errbadcode" -->
+			No Ouvrage with barcode: <!-- TMPL_VAR Name="msg" -->
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="errispermanent" -->
+			Please return item to home branch: <!-- TMPL_VAR Name="msg" -->
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="errdesteqholding" -->
+			Ouvrage is already at destination branch.
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="errwasreturned" -->
+			Ouvrage was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
+onClick="openWindow(this,'Lecteur', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>
+<!-- TMPL_VAR Name="name" --> et a été retourné.
+		<!-- /TMPL_IF -->
 		</font>
 		<BR>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	</td></tr></table>
-	<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=24 height=24>
+	<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=24 height=24>
 	<form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
 	<table border=1 cellpadding=5 cellspacing=0 align=left>
-	<tr><td colspan=2 align=center background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<font color=black><b>Selectionner site</b></font></td></tr>
-	<tr><td>Site destination :</td>
+	<tr><td colspan=2 align=center background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+	<font color=black><b>Sélectionner une annexe</b></font></td></tr>
+	<tr><td>Annexe de destination:</td>
 		<td><select name=tobranchcd>
-			<TMPL_LOOP Name="branchoptionloop">
-				<option value=<TMPL_VAR Name="code"> <TMPL_VAR Name="selected">><TMPL_VAR Name="name"> <br>
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP Name="branchoptionloop" -->
+				<option value=<!-- TMPL_VAR Name="code" --> <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --> <br>
+			<!-- /TMPL_LOOP -->
 		</select></td></tr></table>
 
-	<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=24 height=50 align=left>
+	<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=24 height=50 align=left>
 
 	<table border=1 cellpadding=5 cellspacing=0 ><tr>
-	<td colspan=2 align=center background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<font color=black><b>Code barre de l'exemplaire</b></font></td></tr>
-	<tr><td>Code barre exemplaire:</td><td><input name=barcode size=10></td></tr>
+	<td colspan=2 align=center background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+	<font color=black><b>Entrer Code barre du livre</b></font></td></tr>
+	<tr><td>Code barre d'un ouvrage:</td><td><input name=barcode size=10></td></tr>
 	</table>
-	<input type=hidden name=tobranchcd value=<TMPL_VAR Name="tobrancd">>
+	<input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobrancd" -->>
 
-	<TMPL_LOOP Name="trsfitemloop">
-		<input type=hidden name=bc-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-		<input type=hidden name=fb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="frombrcd">>
-		<input type=hidden name=tb-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="tobrcd">>
-	</TMPL_LOOP>
+	<!-- TMPL_LOOP Name="trsfitemloop" -->
+		<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+		<input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
+		<input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
+	<!-- /TMPL_LOOP -->
 
 	</form>
-	<TMPL_IF Name="transferred">
+	<!-- TMPL_IF Name="transferred" -->
 		<p>
 		<table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-		<tr><th colspan=6  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font color=black>Exemplaires transférés</font></th></tr>
-		<tr><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Type</th><th>de</th><th>à</th></tr>
-		<TMPL_LOOP Name="trsfitemloop">
-			<tr><td bgcolor=<TMPL_VAR Name="color"> align=center>
-			<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionumber">&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"><TMPL_VAR Name="barcode"></a></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="title"></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="author"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="itemtype"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="frbrname"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="tobrname"></td>
+		<tr><th colspan=6  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font color=black>Ouvrages transférés</font></th></tr>
+		<tr><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Saisir</th><th>De</th><th>à</th></tr>
+		<!-- TMPL_LOOP Name="trsfitemloop" -->
+			<tr><td align=center bgcolor=<!-- TMPL_VAR Name="color" -->>
+			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;"><!-- TMPL_VAR Name="barcode" --></a></td>
+			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="title" --></td>
+			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="author" --></td>
+			<td align=center bgcolor=<!-- TMPL_VAR Name="color" --> ><!-- TMPL_VAR Name="itemtype" --></td>
+			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="frbrname" --></td>
+			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="tobrname" --></td>
 			</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 		</table>
-	</TMPL_IF>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 
 
-<TMPL_INCLUDE Name="circulation-bottom.inc">
+<!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl
index 246eb832c9..cf0a9f01e5 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl
@@ -1,105 +1,103 @@
-<TMPL_INCLUDE NAME="circulation-top.inc">
+<!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
 
-<TMPL_IF name="borrowernumber">
-	<table align="right" cellpadding=10>
+<!-- TMPL_IF name="borrowernumber" -->
+	<table align="right" cellpadding="10">
 		<tr>
 			<td>
-				<a class="button" href=circulation.pl?borrnumber=<TMPL_VAR name="borrowernumber">&branch=<TMPL_VAR name="branch">&printer=<TMPL_VAR name="printer">&print=yes>
-				Suivant</a>&nbsp;
-				<a class="button" href=returns.pl>
+				<a class="button" href="circulation.pl?branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=oui">
+				Emprunteur suivant</a>&nbsp;
+				<a class="button" href="returns.pl">
 				Retours</a>&nbsp;
-				<a class="button" href=branchtransfers.pl>
+				<a class="button" href="branchtransfers.pl">
 				Transferts</a>
 			</td>
 		</tr>
 	</table>
-	<h1>Circulation: Retours</h1><br>
-	<b>Annexe:</b> <TMPL_VAR name="branchname"><br>
-	<b>Imprimante:</b> <TMPL_VAR name="printername"><br>
-	<a href=selectbranchprinter.pl>Modification param&egrave;tres</a></td>
-	<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-	<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-	<p>
-<TMPL_ELSE>
-	<table align="right" cellpadding=10>
+	<h1>Circulation: Prêts</h1>
+	<i>Annexe:</i> <!-- TMPL_VAR name="branchname" --> <i>Imprimante:</i> <!-- TMPL_VAR name="printername" --> <a href="selectbranchprinter.pl" class="button">Changer Paramètres</a>
+	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+<!-- TMPL_ELSE -->
+	<table align="right" cellpadding="10">
 		<tr>
 			<td>
-				<a href=returns.pl class="button">
+				<a href="returns.pl" class="button">
 					Retours
 				</a>
 				&nbsp;
-				<a href=branchtransfers.pl class="button">
+				<a href="branchtransfers.pl" class="button">
 					Transferts
 				</a>
 			</td>
 		</tr>
 	</table>
-	<h1>Circulation: Emprunts</h1>
-	<b>Annexe :</b> <TMPL_VAR name="branchname"> <br>
-	<b>Imprimante :</b> <TMPL_VAR name="printername"> <a href=selectbranchprinter.pl>Modifier</a></td>
-	<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-	<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-	<p>
-</TMPL_IF>
+	<h1>Circulation: Prêts</h1><br>
+	<b>Annexe:</b> <!-- TMPL_VAR name="branchname" --> <br>
+	<b>Imprimante:</b> <!-- TMPL_VAR name="printername" --><br>
+	<a href="selectbranchprinter.pl" class="button">Changer Paramètres</a>
+	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+	<p>&nbsp;</p>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="question">
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
+<!-- TMPL_IF name="question" -->
+	<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
 		<tr>
-			<th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<font size=+2 color=red><b>Question</b></font>
+			<th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<font size="+2" color="red"><b>Question sur le prêt</b></font>
 			</th>
 		</tr>
 		<tr>
 			<td>
-				<table border=0 cellpadding=10>
+				<table border="0" cellpadding="10">
 					<tr>
 						<td>
-							Demande d'emprunt de <TMPL_VAR name="title">
-							par <TMPL_VAR name="author"> to <TMPL_VAR name="firstname"> <TMPL_VAR name="surname">.
-							<p><TMPL_VAR name="question">
+							Attempting to issue <!-- TMPL_VAR name="title" -->
+							by <!-- TMPL_VAR name="author" --> to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->.
+							<p><!-- TMPL_VAR name="question" -->
 						</td>
 					</tr>
 				</table>
 			</td>
 		</tr>
 		<tr>
-			<td align=center>
-				<table border=0>
+			<td align="center">
+				<table border="0">
 					<tr>
 						<td>
-							<form method=get>
-							<input type=hidden name=borrnumber value=<TMPL_VAR name="borrowernumber">>
-							<input type=hidden name=barcode value=<TMPL_VAR name="barcode">>
-							<input type=hidden name=questionnumber value=<TMPL_VAR name="questionnumber">>
-							<input type=hidden name=day value=<TMPL_VAR name="day">>
-							<input type=hidden name=month value=<TMPL_VAR name="month">>
-							<input type=hidden name=year value=<TMPL_VAR name="year">>
-							<input type=hidden name=stickyduedate value=<TMPL_VAR name="stickyduedate">>
-							<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-							<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-							<TMPL_LOOP NAME="responseloop">
-							<input type=hidden name="<TMPL_VAR NAME="name">" value="<TMPL_VAR NAME="value">">
-							</TMPL_LOOP>
-							<input type=hidden name=answer value=Y>
-							<input type=submit value=Yes>
+							<form method="get">
+							<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR name="borrowernumber" -->">
+							<input type="hidden" name="barcode" value="<!-- TMPL_VAR name="barcode" -->">
+							<input type="hidden" name="questionnumber" value="<!-- TMPL_VAR name="questionnumber" -->">
+							<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->">
+							<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->">
+							<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->">
+							<input type="hidden" name="stickyduedate" value="<!-- TMPL_VAR name="stickyduedate" -->">
+							<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+							<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+							<!-- TMPL_LOOP NAME="responseloop" -->
+							<input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
+							<!-- /TMPL_LOOP -->
+							<input type="hidden" name="answer" value="Y">
+							<input type="submit" value="Oui">
 							</form>
 						</td>
 						<td>
-							<form method=get>
-							<input type=hidden name=borrnumber value=<TMPL_VAR name="borrowernumber">>
-							<input type=hidden name=barcode value=<TMPL_VAR name="barcode">>
-							<input type=hidden name=questionnumber value=<TMPL_VAR name="questionnumber">>
-							<input type=hidden name=day value=<TMPL_VAR name="day">>
-							<input type=hidden name=month value=<TMPL_VAR name="month">>
-							<input type=hidden name=year value=<TMPL_VAR name="year">>
-							<input type=hidden name=stickyduedate value=<TMPL_VAR name="stickyduedate">>
-							<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-							<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-							<TMPL_LOOP NAME="responseloop">
-							<input type=hidden name="<TMPL_VAR NAME="name">" value="<TMPL_VAR NAME="value">">
-							</TMPL_LOOP>
-							<input type=hidden name=answer value=N>
-							<input type=submit value=No>
+							<form method="get">
+							<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR name="borrowernumber" -->">
+							<input type="hidden" name="barcode" value="<!-- TMPL_VAR name="barcode" -->">
+							<input type="hidden" name="questionnumber" value="<!-- TMPL_VAR name="questionnumber" -->">
+							<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->">
+							<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->">
+							<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->">
+							<input type="hidden" name="stickyduedate" value="<!-- TMPL_VAR name="stickyduedate" -->">
+							<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+							<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+							<!-- TMPL_LOOP NAME="responseloop" -->
+							<input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
+							<!-- /TMPL_LOOP -->
+							<input type="hidden" name="answer" value="N">
+							<input type="submit" value="No">
 							</form>
 						</td>
 					</tr>
@@ -108,112 +106,112 @@
 		</tr>
 	</table>
 	</td>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="rejected">
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
-		<tr><th><font color=black size=5>Erreur emprunt</font></th></tr>
-		<tr><td><font color=red size=5><TMPL_VAR name="rejected"></font></td></tr>
+<!-- TMPL_IF name="rejected" -->
+	<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
+		<tr><th><font color="black" size="5">Erreur prêt d'un livre</font></th></tr>
+		<tr><td><font color="red" size="5"><!-- TMPL_VAR name="rejected" --></font></td></tr>
 	</table>
 	<br>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="message">
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-		<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif">Messages</th></tr>
-		<tr><td><TMPL_VAR name="message"></td></tr>
+<!-- TMPL_IF name="message" -->
+	<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
+		<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">Messages</th></tr>
+		<tr><td><!-- TMPL_VAR name="message" --></td></tr>
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="CGIselectborrower">
-	<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-	<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-	<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-	<table border=1 cellspacing=0 cellpadding=5 bgcolor="#dddddd">
+<!-- TMPL_IF name="CGIselectborrower" -->
+	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+	<table border="1" cellspacing="0" cellpadding="5" bgcolor="#dddddd">
 		<tr>
-			<th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<font color=black><b>Selectionner lecteur</b></font>
+			<th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<font color="black"><b>Sélectionner un emprunteur</b></font>
 			</th>
 		</tr>
 		<tr>
-			<td align=center>
-				<TMPL_VAR name="CGIselectborrower">
+			<td align="center">
+				<!-- TMPL_VAR name="CGIselectborrower" -->
 				<br>
-				<input type=submit>
+				<input type="submit" value="OK" class="button">
 			</td>
 		</tr>
 	</table>
-<TMPL_ELSE>
-    <TMPL_IF NAME="borrowernumber">
+<!-- TMPL_ELSE -->
+    <!-- TMPL_IF NAME="borrowernumber" -->
     
-    <TMPL_ELSE>
-	<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
+    <!-- TMPL_ELSE -->
+	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+	<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
 		<tr>
-			<th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<font color=black><b>entrer un numéro de carte lecteur<br> ou une partie de son nom</b></font>
+			<th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<font color="black"><b>Entrer N° carte de lecteur<br> ou partie du nom</b></font>
 			</th>
 		</tr>
 		<tr>
 			<td>
-				<input name=findborrower>
-				<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-				<input type=hidden name=printer value=<TMPL_VAR name="printer">>
+				<input name="findborrower">
+				<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+				<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
 			</td>
 		</tr>
 	</table>
 	</form>
-     </TMPL_IF>
-</TMPL_IF>
-<TMPL_IF name="borrowernumber">
+     <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="borrowernumber" -->
 <table border="1" width="100%">
 <tr>
 <td>
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<table border=1 cellpadding=5>
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+<table border="1" cellpadding="2">
 	<tr>
-	<td align=center valign=top>
-		<table border=0 cellspacing=0 cellpadding=5>
+	<td align="center" valign="top">
+		<table border="0" cellspacing="0" cellpadding="5">
 			<tr>
-				<th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-					<font color=black><b>Code barre exemplaire</b></font>
+				<th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+					<font color="black"><b>Entrer Code barre du livre</b></font>
 				</th>
 			</tr>
 			<tr>
-				<td align=center>
-					<table border=0>
+				<td align="center">
+					<table border="0">
 						<tr>
-							<td>code barre :</td>
-							<td><input name=barcode size=10></td>
-							<td><input type=submit value=Issue></td>
+							<td>Code barre d'un ouvrage:</td>
+							<td><input name="barcode" size="10"></td>
+							<td><input type="submit" value="Prêt" class="button"></td>
 						</tr>
 						<tr>
-							<td colspan=3 align=center>
-								<table border=0 cellpadding=0 cellspacing=0>
+							<td colspan="3" align="center">
+								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td>
-											<select name=day><option value=0>Jour<TMPL_VAR name="dayoptions"></select>
+											<select name="day"><option value="0">Jour<!-- TMPL_VAR name="dayoptions" --></select>
 										</td>
 										<td>
-											<select name=month><option value=0>Mois<TMPL_VAR name="monthoptions"></select>
+											<select name="month"><option value="0">Mois<!-- TMPL_VAR name="monthoptions" --></select>
 										</td>
 										<td>
-											<select name=year><option value=0>Année<TMPL_VAR name="yearoptions"></select>
+											<select name="year"><option value="0">Année<!-- TMPL_VAR name="yearoptions" --></select>
 										</td>
 									</tr>
 								</table>
-								<input type=checkbox name=stickyduedate <TMPL_VAR name="selected">> Fixer date retour
+								<input type="checkbox" name="stickyduedate" <!-- TMPL_VAR name="selected" -->> Sticky Date de retour
 							</td>
 						</tr>
 					</table>
-					<input type=hidden name=borrnumber value=<TMPL_VAR name="borrowernumber">>
-					<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-					<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-					<input type=hidden name=print value=maybe>
-					<TMPL_IF name="CHARGES">
-						<input type=hidden name=charges value=yes>
-						<input type=hidden name=oldamount value=<TMPL_VAR name="amountold">>
-					</TMPL_IF>
+					<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR name="borrowernumber" -->">
+					<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+					<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+					<input type="hidden" name="print" value="peut-être">
+					<!-- TMPL_IF name="FRAIS" -->
+						<input type="hidden" name="charges" value="oui">
+						<input type="hidden" name="oldamount" value="<!-- TMPL_VAR name="amountold" -->">
+					<!-- /TMPL_IF -->
 				</td>
 			</tr>
 		</table>
@@ -223,89 +221,98 @@
 </form>
 </td>
 <td>
-<table border=1 cellpadding=5 cellspacing=0 align=right>
-    <tr><td colspan=2><font color=black><b>Informations lecteur</b></font></td></tr>
-    <tr><td colspan=2>
-    <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR name="borrowernumber">" onClick="openWindow(this,'Member', 480, 640)">
-		<TMPL_VAR name="firstname"> <TMPL_VAR name="surname">
-    </a> <br> Catégorie: <TMPL_VAR name="categorycode">
+<table border="1" cellpadding="2" cellspacing="0" align="right">
+    <tr><td colspan="2"><font color="black"><b>Informations emprunteur</b></font></td></tr>
+    <tr><td colspan="2">
+    <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this,'Lecteur', 480, 640)">
+		<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
+    </a> <br> Category: <!-- TMPL_VAR name="categorycode" -->
     </td></tr>
-<TMPL_IF name="noissues">
-	<TMPL_IF name="charges">
-		<tr><td valign=top><font color=red>Frais</font></td><td bgcolor=<TMPL_VAR name=color>><a href=/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR name="borrowernumber"> onClick=\"openWindow(this, 'Payment', 480,640)\">Paiement</a></td></tr>
-	<TMPL_ELSE>
-		<tr><td valign=top><font color=red><TMPL_VAR name="flag"></font></td><td bgcolor=<TMPL_VAR name="color"><TMPL_VAR name="message"></td></tr>
-	</TMPL_IF>
-<TMPL_ELSE>
-		<TMPL_IF name="charges">
-			<tr><td valign=top>Frais</td><td><a href=/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR name="borrowernumber"> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>
-		</TMPL_IF>
-		<TMPL_IF name="waiting">
+<!-- TMPL_IF name="noissues" -->
+<!-- TMPL_IF NAME="gna" -->
+<tr><td valign="top"><font color="red">GNA</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Emprunteur is gone with no address</td></tr>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="lost" -->
+<tr><td valign="top"><font color="red">PERDU</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Emprunteur's card is lost</td></tr>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="dbarred" -->
+<tr><td valign="top"><font color="red">DBARRED</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Emprunteur is debarred</td></tr>
+<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="charges" -->
+		<tr><td valign="top"><font color="red">FRAIS</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->><a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
+	<!-- TMPL_ELSE -->
+		<tr><td valign="top"><font color="red"><!-- TMPL_VAR name="flag" --></font></td><td bgcolor=<!-- TMPL_VAR name="color" --><!-- TMPL_VAR name="message" --></td></tr>
+	<!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+		<!-- TMPL_IF name="charges" -->
+			<tr><td valign=top>FRAIS</td><td><a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="waiting" -->
 			<tr>
-			<td valign=top>En attente</td>
+			<td valign="top">EN ATTENTE</td>
 			<td>
-			<TMPL_LOOP name="itemswaiting">
-				<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR name="biblionumber">&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\"><TMPL_VAR name="barcode">}</a><TMPL_VAR name="title"> (<TMPL_VAR name="branchname">)<br>
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP name="itemswaiting" -->
+				<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640)"><!-- TMPL_VAR name="barcode" --></a> <!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="branchname" -->)<br>
+			<!-- /TMPL_LOOP -->
 			</td>
 			</tr>
-		</TMPL_IF>
-			<TMPL_IF name="odues">
-				<TMPL_IF name="nonreturns">
-					<tr><td valign=top>Retards</td><td>Oui, voir ci-dessous</td></tr>
-				</TMPL_IF>
-			</TMPL_IF>
-			<TMPL_IF name="notes">
-					<tr><td valign=top>Notes</td><td><TMPL_VAR name="notesmsg"></td></tr>
-			</TMPL_IF>
-</TMPL_IF>
+		<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="odues" -->
+				<!-- TMPL_IF name="nonreturns" -->
+					<tr><td valign="top"><font color="red">RETARDS</font></td><td><font color="red">Oui, voir plus bas</font></td></tr>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="notes" -->
+					<tr><td valign="top">NOTES</td><td><!-- TMPL_VAR name="notesmsg" --></td></tr>
+			<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 </table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 </table>
-<p clear=all><br><br>
-<TMPL_IF name="todayissues">
-<table border=1 cellpadding=5 cellspacing=0 width=80%>
+<br/>
+<!-- TMPL_IF name="todayissues" -->
+<table border="1" cellpadding="5" cellspacing="0" width="100%">
 	<tr>
-		<th colspan=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<font color=black>
-			<b>Emprunts du jour</b></font>
+		<th colspan="5" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+			<font color="black">
+			<b>Prêts d'aujourd'hui</b></font>
 		</th>
 	</tr>
 	<tr>
-		<th>Retour pour le</th><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Classe</th>
+		<th>Date de retour</th><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Catégorie</th>
 	</tr>
-	<TMPL_LOOP name="todayissues">
-	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
-	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"><TMPL_VAR NAME="barcode"></a></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dewey"> <TMPL_VAR NAME="subclass"></td></tr>
-	</TMPL_LOOP>
+	<!-- TMPL_LOOP name="todayissues" -->
+	    <tr><td align="center" bgcolor=<!-- TMPL_VAR NAME="tcolor" -->><!-- TMPL_VAR NAME="dd" --></td>
+	    <td align="center" bgcolor=<!-- TMPL_VAR NAME="tcolor" -->>
+	    <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a></td>
+	    <td bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="title" --></td>
+	    <td bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="author" --></td>
+	    <td align="center" bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="dewey" --> <!-- TMPL_VAR NAME="subclass" --></td></tr>
+	<!-- /TMPL_LOOP -->
 </table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="previssues">
-	<table border=1 cellpadding=5 cellspacing=0 width=80%>
+<!-- TMPL_IF name="previssues" -->
+	<table border="1" cellpadding="5" cellspacing="0" width="80%">
 		<tr>
-			<th colspan=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<font color=black>
-				<b>Autres emprunts</b></font>
+			<th colspan="5"  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<font color="black">
+				<b>Prêts précédents</b></font>
 			</th>
 		</tr>
 		<tr>
-			<th>Retour pour le</th><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Classe</th>
+			<th>Date de retour</th><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Catégorie</th>
 		</tr>
-	<TMPL_LOOP name="previssues">
-	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
-	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"><TMPL_VAR NAME="barcode"></a></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>
-	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dewey"> <TMPL_VAR NAME="subclass"></td></tr>
-	</TMPL_LOOP>
+	<!-- TMPL_LOOP name="previssues" -->
+	    <tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="dd" --></td>
+	    <td align="center" bgcolor="<!-- TMPL_VAR NAME="tcolor" -->">
+	    <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a></td>
+	    <td bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="title" --></td>
+	    <td bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="author" --></td>
+	    <td align="center" bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="dewey" --> <!-- TMPL_VAR NAME="subclass" --></td></tr>
+	<!-- /TMPL_LOOP -->
 
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE name="circulation-bottom.inc" -->
 
-<TMPL_INCLUDE name="circulation-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl
index 237507595f..6e67c30f63 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl
@@ -1,237 +1,240 @@
-<TMPL_INCLUDE Name="circulation-top.inc">
+<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
 <table align="right" cellpadding=10><tr><td>
-<a href=circulation.pl class="button">Prêts</a></a>
-&nbsp<a href=branchtransfers.pl class="button">Transfers</a>
+	<a class="button" href=circulation.pl>
+	Prêts</a>&nbsp;
+	<a class="button" href=branchtransfers.pl>
+	Transferts</a>
 </td></tr></table>
-<h1>Circulation: Retours</h1>
-<b>Annexe :</b> <TMPL_VAR Name="genbrname"><br>
-<b>Imprimante :</b> <TMPL_VAR Name="genprname"> <a href=selectbranchprinter.pl>Modifier</a>
-<input type=hidden name=branch value=<TMPL_VAR Name="branch">>
-<input type=hidden name=printer value=<TMPL_VAR Name="printer">>
+<h1>Circulation: Retours</h1><br>
+<b>Annexe:</b> <!-- TMPL_VAR Name="genbrname" --> &nbsp;
+<b>Imprimante:</b> <!-- TMPL_VAR Name="genprname" --><br>
+<a href=selectbranchprinter.pl>Changer Paramètres</a>
+<input type=hidden name=branch value=<!-- TMPL_VAR Name="branch" -->>
+<input type=hidden name=printer value=<!-- TMPL_VAR Name="printer" -->>
 <p>
 
 <table cellpadding=5 cellspacing=0 width=100%>
 
-<TMPL_IF Name="found">
+<!-- TMPL_IF Name="found" -->
 	<tr>
 	<td colspan=2>
 		<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-		<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Réservations trouvées</font></th></tr>
+		<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Réservation trouvée</font></th></tr>
 		<tr><td>
-		<TMPL_IF Name="waiting">
-			<font color='red' size='+2'>Exemplaires en attente :</font><br>
-		L'exemplaire <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <br>
-		est en attente à <b><TMPL_VAR Name="branchname"></b> pour <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member'); return false;"><TMPL_VAR Name="borcnum"></a>).
+		<!-- TMPL_IF Name="waiting" -->
+			<font color='red' size='+2'>Ouvrage marqué en attente:</font><br>
+		Ouvrage <!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->) <br>
+	est marqué en attente à <b><!-- TMPL_VAR Name="branchname" --></b> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Lecteur'); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).
 			<center><form method=post action='returns.pl'>
-			<TMPL_LOOP Name="inputloop">
-				<input type=hidden name=ri-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-				<input type=hidden name=dd-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="duedate">>
-				<input type=hidden name=bn-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="bornum">>
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP Name="inputloop" -->
+				<input type=hidden name=ri-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+				<input type=hidden name=dd-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="duedate" -->>
+				<input type=hidden name=bn-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="bornum" -->>
+			<!-- /TMPL_LOOP -->
 			<input type=hidden name=barcode value=0>
 			<input type=submit value="OK">
 			</form></center>
-		</TMPL_IF>
-		<TMPL_IF Name="diffbranch">
-			<font color='red' size='+2'>Item marked Waiting:</font><br>
-		L'exemplaire : <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">)<br>
-		doit être transféré à <b><TMPL_VAR Name="branchname"></b> <br>
-		pour être emprunté par <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member'); return false;"><TMPL_VAR Name="borcnum"></a>).
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="diffbranch" -->
+			<font color='red' size='+2'>Ouvrage marqué en attente:</font><br>
+    Ouvrage: <!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->)<br>
+ doit être transféré vers <b><!-- TMPL_VAR Name="branchname" --></b> <br>
+pour être retiré à <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Lecteur'); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).
 			<center><form method=post action='returns.pl'>
-			<TMPL_LOOP Name="inputloop">
-				<TMPL_UNLESS Name="first">
-					<input type=hidden name=ri-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-					<input type=hidden name=dd-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="duedate">>
-					<input type=hidden name=bn-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="bornum">>
-				</TMPL_UNLESS>
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP Name="inputloop" -->
+				<!-- TMPL_UNLESS Name="first" -->
+					<input type=hidden name=ri-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+					<input type=hidden name=dd-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="duedate" -->>
+					<input type=hidden name=bn-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="bornum" -->>
+				<!-- /TMPL_UNLESS -->
+			<!-- /TMPL_LOOP -->
 			<input type=hidden name=barcode value=0>
 			<input type=submit value="OK">
 			</form></center>
-		</TMPL_IF>
-		<TMPL_IF Name="reserved">
-			<font color='red' size='+2'>Reservation trouvée :</font> Exemplaire : <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item'); return false;"><TMPL_VAR Name="itembarcode"></a> <br>
-			pour <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member'); return false"><TMPL_VAR Name="borcnum"></a>) Pour être ramassé à <b><TMPL_VAR Name="branchname"></b>.
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="reserved" -->
+			<font color='red' size='+2'>Réservation trouvée:</font> Ouvrage: <!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra', 'Ouvrage'); return false;"><!-- TMPL_VAR Name="itembarcode" --></a> <br>
+			for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Lecteur'); return false"><!-- TMPL_VAR Name="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR Name="branchname" --></b>.
 			<table cellpadding=5 cellspacing=0>
-			<tr><td valign="top">Modifier statut ("attente") et imprimer <a href="" onClick='alert(document.forms[0].resslip.value); return false'>déplacer</a>?: </td>
+			<tr><td valign="top">Mettre le statut "Attente" et imprimer<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
 			<td valign="top">
 			<form method=post action='returns.pl'>
-			<TMPL_LOOP Name="inputloop">
-				<input type=hidden name=ri-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-				<input type=hidden name=dd-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="duedate">>
-				<input type=hidden name=bn-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="bornum">>
-			</TMPL_LOOP>
-			<input type=hidden name=itemnumber value=<TMPL_VAR Name="itemnumber">>
-			<input type=hidden name=borrowernumber value=<TMPL_VAR Name="borrowernumber">>
-			<input type=hidden name=resbarcode value=<TMPL_VAR Name="barcode">>
+			<!-- TMPL_LOOP Name="inputloop" -->
+				<input type=hidden name=ri-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+				<input type=hidden name=dd-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="duedate" -->>
+				<input type=hidden name=bn-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="bornum" -->>
+			<!-- /TMPL_LOOP -->
+			<input type=hidden name=itemnumber value=<!-- TMPL_VAR Name="itemnumber" -->>
+			<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
+			<input type=hidden name=resbarcode value=<!-- TMPL_VAR Name="barcode" -->>
 			<input type=hidden name=resslip value="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Date: <TMPL_VAR Name="today">
+Date: <!-- TMPL_VAR Name="today" -->
 
-Exemplaire réservé :<TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">)
-Code barre : <TMPL_VAR Name="itembarcode">
-Type : <TMPL_VAR Name="itemtype">
-Provenant de : <TMPL_VAR Name="branchname">
+ITEM RESERVED:<!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->)
+barcode: <!-- TMPL_VAR Name="itembarcode" -->
+itemtype: <!-- TMPL_VAR Name="itemtype" -->
+COLLECT AT: <!-- TMPL_VAR Name="branchname" -->
 
-Emprunté par :
-<TMPL_VAR Name="bortitle"> <TMPL_VAR Name="borfirstname"> <TMPL_VAR Name="borsurname">
-carte N°: <TMPL_VAR Name="borcnum">
-Tel : <TMPL_VAR Name="borphone">
-<TMPL_VAR Name="borstraddress">
-<TMPL_VAR Name="borsub">
-<TMPL_VAR Name="bortown">
-<TMPL_VAR Name="boremail">
+BORROWER:
+<!-- TMPL_VAR Name="bortitle" --> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
+card number: <!-- TMPL_VAR Name="borcnum" -->
+Téléphone: <!-- TMPL_VAR Name="borphone" -->
+<!-- TMPL_VAR Name="borstraddress" -->
+<!-- TMPL_VAR Name="borsub" -->
+<!-- TMPL_VAR Name="bortown" -->
+<!-- TMPL_VAR Name="boremail" -->
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ">
-			<input type=submit value="Print">
+			<input type=submit value="Imprimer">
 			</form>
 			</td></tr>
 			</table>
-		</TMPL_IF>
+		<!-- /TMPL_IF -->
 		</td></tr></table>
 	</td>
 	</tr>
 	<tr>
 	<td colspan=2>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 	<td valign=top align=left>
 		<form method=post action=/cgi-bin/koha/circ/returns.pl>
 			<table border=1 cellpadding=5 cellspacing=0>
-			<tr><td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<font color=black><b>code barre exemplaire</b></font></td></tr>
-			<tr><td>code barre :</td><td><input name=barcode size=10></td></tr>
+			<tr><td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+			<font color=black><b>Entrer Code barre du livre</b></font></td></tr>
+			<tr><td>Code barre d'un ouvrage:</td><td><input name=barcode size=10></td></tr>
 			</table>
-			<TMPL_LOOP Name="inputloop">
-				<input type=hidden name=ri-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-				<input type=hidden name=dd-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="duedate">>
-				<input type=hidden name=bn-<TMPL_VAR Name="counter"> value=<TMPL_VAR Name="bornum">>
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP Name="inputloop" -->
+				<input type=hidden name=ri-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
+				<input type=hidden name=dd-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="duedate" -->>
+				<input type=hidden name=bn-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="bornum" -->>
+			<!-- /TMPL_LOOP -->
 		</form>
 	</td>
 	<td valign=top align=left>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 		<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-		<tr><th  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Messages</font></th></tr>
+		<tr><th  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Messages</font></th></tr>
 		<tr><td>
-			<TMPL_LOOP Name="errmsgloop">
+			<!-- TMPL_LOOP Name="errmsgloop" -->
 				<font color='red' size='+2'>
-				<TMPL_IF Name="badbarcode">
-					code barre inconnu: <TMPL_VAR Name="msg">
-				</TMPL_IF>
-				<TMPL_IF Name="ispermanent">
-					Retourner à <TMPL_VAR Name="msg">
-				</TMPL_IF>
-				<TMPL_IF Name="notissued">
-					Pas emprunté.
-				</TMPL_IF>
-				<TMPL_IF Name="waslost">
-					Exemplaire perdu. Marqué retrouvé.
-				</TMPL_IF>
-				<TMPL_IF Name="withdrawn">
-					Exemplaire éliminé
-				</TMPL_IF>
+				<!-- TMPL_IF Name="badbarcode" -->
+					No Ouvrage with barcode: <!-- TMPL_VAR Name="msg" -->
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="ispermanent" -->
+					Please return to  <!-- TMPL_VAR Name="msg" -->
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="notissued" -->
+					Not On Prêt.
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="waslost" -->
+					Ouvrage was lost, now found.
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="withdrawn" -->
+					Ouvrage Annulé
+				<!-- /TMPL_IF -->
 				</font>
 				<BR>
-			</TMPL_LOOP>
+			<!-- /TMPL_LOOP -->
 		</td></tr></table>
 	</td>
 	</tr>
-<TMPL_IF Name="returned">
+<!-- TMPL_IF Name="returned" -->
 	<tr>
 	<td valign=top align=left>
 		<table border=1 cellpadding=5 cellspacing=0>
-		<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<font color=black>Retour d'exemplaire</font></th></tr>
+		<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<font color=black>Information sur un ouvrage retrouvée</font></th></tr>
 		<tr><td>
-		Titre: <TMPL_VAR Name="itemtitle"><br>
+		Titre: <!-- TMPL_VAR Name="itemtitle" --><br>
 		</td></tr>
 		</table>
 	</td>
 	<td valign=top align=left>
 		<table border=1 cellpadding=5 cellspacing=0>
-		<tr><td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<font color=black><b>Information emprunteur</b></font></td></tr>
+		<tr><td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<font color=black><b>Informations Emprunteur</b></font></td></tr>
 		<tr><td colspan=2>
-		<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="ribornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="ribornum">','Member'); return false;"><TMPL_VAR Name="riborcnum"></a>
-		<TMPL_VAR Name="riborsurname">, <TMPL_VAR Name="ribortitle"> <TMPL_VAR Name="riborfirstname"><br>
+		<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->','Lecteur'); return false;"><!-- TMPL_VAR Name="riborcnum" --></a>
+		<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" --><br>
 		</td></tr>
-		<TMPL_IF Name="flagset">
-			<tr><td  background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2>
-			<b>indicateurs</b></td></tr>
-			<TMPL_LOOP Name="flagloop">
-				<tr><td valign=top><TMPL_IF Name="redfont"><font color="red"></TMPL_IF><TMPL_VAR Name="flag"><TMPL_IF Name="redfont"></font></TMPL_IF></td>
-				<TMPL_IF Name="charges">
-					<td bgcolor=<TMPL_VAR Name="color">><b><TMPL_VAR Name="msg"></b><a href="/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR Name="bornum">', 'Payment'); return false;">Paiement</a></td></tr>
-				</TMPL_IF>
-				<TMPL_IF Name="waiting">
-					<td bgcolor=<TMPL_VAR Name="color">>
-					<TMPL_LOOP Name="itemloop">
-						<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra','Item'); return false;"><TMPL_VAR Name="barcode"></a><TMPL_VAR Name="title">(<TMPL_VAR Name="brname">)<br>
-					</TMPL_LOOP>
+		<!-- TMPL_IF Name="flagset" -->
+			<tr><td  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2>
+			<b>Drapeaux</b></td></tr>
+			<!-- TMPL_LOOP Name="flagloop" -->
+				<tr><td valign=top><!-- TMPL_IF Name="redfont" --><font color="red"><!-- /TMPL_IF --><!-- TMPL_VAR Name="flag" --><!-- TMPL_IF Name="redfont" --></font><!-- /TMPL_IF --></td>
+				<!-- TMPL_IF Name="charges" -->
+					<td bgcolor=<!-- TMPL_VAR Name="color" -->><b><!-- TMPL_VAR Name="msg" --></b><a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Payment'); return false;">Payment</a></td></tr>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="waiting" -->
+					<td bgcolor=<!-- TMPL_VAR Name="color" -->>
+					<!-- TMPL_LOOP Name="itemloop" -->
+						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra','Ouvrage'); return false;"><!-- TMPL_VAR Name="barcode" --></a><!-- TMPL_VAR Name="title" -->(<!-- TMPL_VAR Name="brname" -->)<br>
+					<!-- /TMPL_LOOP -->
 					</td></tr>
-				</TMPL_IF>
-				<TMPL_IF Name="overdue">
-					<td bgcolor=<TMPL_VAR Name="color">>
-					<TMPL_LOOP Name="itemloop">
-					<font color=red><TMPL_VAR Name="duedate"></font>
-						<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra', 'Item'); return false;">
-							<TMPL_VAR Name="barcode">
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="overdue" -->
+					<td bgcolor=<!-- TMPL_VAR Name="color" -->>
+					<!-- TMPL_LOOP Name="itemloop" -->
+					<font color=red><!-- TMPL_VAR Name="duedate" --></font>
+						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra', 'Ouvrage'); return false;">
+							<!-- TMPL_VAR Name="barcode" -->
 						</a>
-						<TMPL_VAR Name="title">
+						<!-- TMPL_VAR Name="title" -->
 						<br>
-					</TMPL_LOOP>
+					<!-- /TMPL_LOOP -->
 					</td></tr>
-				</TMPL_IF>
-				<TMPL_IF Name="other">
-					<td bgcolor=<TMPL_VAR Name="color">><b><TMPL_VAR Name="msg"></b></td></tr>
-				</TMPL_IF>
-			</TMPL_LOOP>
-		</TMPL_IF>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="other" -->
+					<td bgcolor=<!-- TMPL_VAR Name="color" -->><b><!-- TMPL_VAR Name="msg" --></b></td></tr>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_IF -->
 	</td>
 	<tr>
-</TMPL_IF>
-<TMPL_IF Name="returneditems">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF Name="returneditems" -->
     <tr><td colspan=2>
 		<table border=1 cellpadding=5 cellspacing=0>
-		<tr><th colspan=6 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<font color=black>Exemplaires rendus</font></th></tr>
-		<tr><th>Retour pour le</th><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Type</th><th>Emprunteur</th></tr>
-		<TMPL_LOOP Name="returneditemloop">
-			<tr><td bgcolor=<TMPL_VAR Name="color">>
-				<TMPL_IF Name="duedate">
-					<TMPL_IF Name="early">
+		<tr><th colspan=6 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<font color=black>Ouvrages rendus</font></th></tr>
+		<tr><th>Date de retour</th><th>Code barre</th><th>Titre</th><th>Auteur</th><th>Saisir</th><th>Emprunteur</th></tr>
+		<!-- TMPL_LOOP Name="returneditemloop" -->
+			<tr><td bgcolor=<!-- TMPL_VAR Name="color" -->>
+				<!-- TMPL_IF Name="duedate" -->
+					<!-- TMPL_IF Name="early" -->
 						<font color=red>
-					</TMPL_IF>
-						<TMPL_VAR Name="year">/<TMPL_VAR Name="month">/<TMPL_VAR Name="day">
-					<TMPL_IF Name="early">
+					<!-- /TMPL_IF -->
+						<!-- TMPL_VAR Name="year" -->/<!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" -->
+					<!-- TMPL_IF Name="early" -->
 						</font>
-					</TMPL_IF>
-				<TMPL_ELSE>
-					Non emprunté
-				</TMPL_IF>
+					<!-- /TMPL_IF -->
+				<!-- TMPL_ELSE -->
+					Pas en prêt.
+				<!-- /TMPL_IF -->
 			</td>
-			<td bgcolor=<TMPL_VAR Name="color">> align=center>
-			<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item'); return false;"><TMPL_VAR Name="barcode"></a></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemtitle"></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemauthor"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="itemtype"></td>
-			<td bgcolor=<TMPL_VAR Name="color">>
-			<TMPL_IF Name="duedate">
-				<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">','Member'); return false;">
-  					<TMPL_VAR Name="borcnum">
-				</a> <TMPL_VAR Name="borfirstname"> <TMPL_VAR Name="borsurname">
-			<TMPL_ELSE>
-				<TMPL_VAR Name="bornum">
-			</TMPL_IF>
+			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->>>
+			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra', 'Ouvrage'); return false;"><!-- TMPL_VAR Name="barcode" --></a></td>
+			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="itemtitle" --></td>
+			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="itemauthor" --></td>
+			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="itemtype" --></td>
+			<td bgcolor=<!-- TMPL_VAR Name="color" -->>
+			<!-- TMPL_IF Name="duedate" -->
+				<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->','Lecteur'); return false;">
+					<!-- TMPL_VAR Name="borcnum" -->
+				</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
+			<!-- TMPL_ELSE -->
+				<!-- TMPL_VAR Name="bornum" -->
+			<!-- /TMPL_IF -->
 			</td></tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 		</table>
 	</td></tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 </table>
 
-<TMPL_INCLUDE Name="circulation-bottom.inc">
+<!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl
new file mode 100644
index 0000000000..ccdb5a7d36
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl
@@ -0,0 +1,42 @@
+<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
+
+<h1>Circulation: Sélectionner imprimante et Paramètres de l'annexe</h1><br>
+
+<center>
+<form method=post action=/cgi-bin/koha/circ/circulation.pl>
+<table border=1 cellpadding=5 cellspacing=0>
+<tr><td colspan=2 bgcolor=<!-- TMPL_VAR Name="headerbackgroundcolor" --> align=center background=<!-- TMPL_VAR Name="backgroundimage" -->>
+<font color=black><b>Définissez une annexe et une imprimante</b></font></td></tr>
+<tr><td>
+<!--branchselection-->
+<!-- TMPL_IF Name="onebranch" -->
+Annexe: <!-- TMPL_VAR Name="branchname" --><br>
+<!-- TMPL_ELSE -->
+	<select name=branch>
+	<!-- TMPL_LOOP Name="branchloop" -->
+		<option value=<!-- TMPL_VAR Name="value" --><!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+	<!-- /TMPL_LOOP -->
+	</select>
+<!-- /TMPL_IF -->
+</td>
+<td>
+<!--printerselection-->
+<!-- TMPL_IF Name="oneprinter" -->
+Imprimante: <!-- TMPL_VAR Name="printername" --><br>
+<!-- TMPL_ELSE -->
+	<select name=printer>
+	<!-- TMPL_LOOP Name="printerloop" -->
+		<option value=<!-- TMPL_VAR Name="value" --><!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+	<!-- /TMPL_LOOP -->
+	</select>
+<!-- /TMPL_IF -->
+</td></tr>
+</table>
+<input type="hidden" name="setcookies" value=1>
+<input type="submit" value="Submit" type="changesettings">
+</form>
+</center>
+
+
+<!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/default.tmpl b/koha-tmpl/intranet-tmpl/default/fr/default.tmpl
index ff35ad98be..284f374399 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/default.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/default.tmpl
@@ -1,35 +1,28 @@
-<TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-top.inc">
+<!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-top.inc" -->
 <center>
 
 <table border=0 cellspacing=0 cellpadding=2>
 <tr bgcolor=#ccccff background="/images/background-mem.gif">
-	  <th>Titre</th>
-	  <th>Auteur</th>
-	  <th>Nbre de doc.</th>
-	  <th>Localisation</th>
-	</tr>
-<TMPL_LOOP NAME=SEARCH_RESULTS>
+<th>Titre</th><th>Auteur</th><th>Nombre d'ouvrages</th><th>Biblionumber</th></tr>
+<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
   <tr>
-  <td><a href=/cgi-bin/koha/detail.pl?type=intra&bib=><TMPL_VAR NAME=biblionumber ESCAPE=HTML>><TMPL_VAR NAME=title></a></td>
-  <td> <TMPL_VAR NAME=author> </td>
-  <td align=center> <TMPL_VAR NAME=itemcount> </td>
-  <td> <TMPL_VAR NAME=biblionumber> </td>
+  <td><a href=/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME=biblionumber ESCAPE=HTML -->><!-- TMPL_VAR NAME=title --></a></td>
+  <td> <!-- TMPL_VAR NAME=author --> </td>
+  <td align=center> <!-- TMPL_VAR NAME=itemcount --> </td>
+  <td> <!-- TMPL_VAR NAME=biblionumber --> </td>
   </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 <tr bgcolor=#ccccff backgound="/images/background-mem.gif"><td colspan=4>
     <table border=0 cellpadding=0 cellspacing=0 width=100% background="/images/background-mem.gif">
-    <tr>
-			<td align=left> <a href=search.pl?template=><TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="prevstartfrom">>R&eacute;sultats 
-			  pr&eacute;c&eacute;dants</a> </td>
-			<td align=right> <a href=search.pl?template=><TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="nextstartfrom">>R&eacute;sultats 
-			  suivants</a> </td>
-		  </tr>
+    <tr><td align=left>
+    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->>Previous Records</a>
+    </td><td align=right>
+    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->>Next Records</a>
+    </td></tr>
     </table>
 </td></tr>
 </table>
 <br>
-  R&eacute;sultats <TMPL_VAR NAME="startfrom"> &agrave; <TMPL_VAR NAME="endat"> 
-  sur <TMPL_VAR NAME="numrecords"> enregistrements. 
-  <hr>
-<TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-bottom.inc">
-</center>
+Résultats <i><!-- TMPL_VAR NAME="startfrom" --></i> à </i><!-- TMPL_VAR NAME="endat" --></i> sur <i><!-- TMPL_VAR NAME="numrecords" --></i> enregistrements.
+<hr>
+<!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl
new file mode 100644
index 0000000000..e697cc5c2b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl
@@ -0,0 +1,15 @@
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
+<center>
+<h1>Exporter une notice biblio MARC</h1><br /><br /><br />
+Exporter en format MARC les les biblios suivants :
+<form method="post">
+<p>du N° Biblio : <input type="text" name="start_bib">
+to biblio number : <input type="text" name="end_bib"></p>
+<input type="hidden" name="op" value="export">
+<input type="submit" value="Export">
+</form>
+
+<p>(Laisser blanc pour tout exporter)</p>
+<p>Note: les ouvrages en sont PAS exportés par cet outil</p>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl
index c40b64e61e..585142ba1d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl
@@ -1,57 +1,60 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-<h1>syst&egrave;me d'importation de notices MARC</h1>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<h1>Système d'acquisition MARC</h1>
 
 <table bgcolor="#ffcc00" width="80%" cellpadding="3">
 	<tr valign="center">
-	<td><font size="4">Importer dans le r&eacute;voir</font></td>
+	<td><font size="4">Importer vers le réservoir</font></td>
 	</tr>
 </table>
 
-<TMPL_IF name="uploadmarc">
-<p>R&eacute;sultats de l'importation :</p>
+<!-- TMPL_IF name="uploadmarc" -->
+<p>Résultats de l'importation :</p>
 <ul>
-	<p><TMPL_VAR name="imported"> notices import&eacute;es</p>
-	<p><TMPL_VAR name="alreadyindb"> pas import&eacute; : d&eacute;j&agrave; dans la base</p>
-	<p><TMPL_VAR name="alreadyinfarm"> pas import&eacute; : d&eacute;j&agrave;dans le r&eacute;servoir</p>
-	<p><TMPL_VAR name="notmarcrecord"> pas import&eacute; : ne semble pas au format MARC (ou ISBN/ISSN manquent) !</p>
-	<p><TMPL_VAR name="total">  notices trait&eacute;es</p>
+	<p><!-- TMPL_VAR name="imported" --> notices importées</p>
+	<p><!-- TMPL_VAR name="alreadyindb" --> pas importé, car déjà existant dans la base de données</p>
+	<p><!-- TMPL_VAR name="alreadyinfarm" --> pas importé, car déjà existant dans le réservoir</p>
+	<p><!-- TMPL_VAR name="notmarcrecord" --> pas importé, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) !</p>
+	<p><!-- TMPL_VAR name="total" -->  enregistrements étudiés</p>
 	<p><a href="/cgi-bin/koha/admin-home.pl">Retour</a>
 </ul>
-<TMPL_ELSE>
-<ul>S&eacute;lectionnez un fichier &agrave; importer dans le r&eacute;servoir. Il sera trait&eacute;, et pour chaque ISBN trouv&eacute;, une nouvelle notice sera cr&eacute;e dans le r&eacute;servoir. Si un ISBN existe d&eacute;j&agrave; dans le r&eacute;servoir, vous pouvez choisir ou bien d'ignorer la nouvelle notice, ou bien d'&eacute;craser l'ancienne.<br/>
-Vous pouvez nommer cette importation. Cela peut &ecirc;tre utile, lorsque vous cre nouvel ISez une notice, de se souvenir de l'origine des donne nouvel ISes MARC propos&eacute;es !<br/>
-Bien s&ucirc;r, si l'ISBN existe d&eacute;j&agrave; dans la base de donn&eacute;es active, la notice sera ignor&eacute;e.<br/></ul>
-<form method="post" action="<TMPL_VAR name="SCRIPT_NAME">" enctype="multipart/form-data">
+<!-- TMPL_ELSE -->
+<ul>
+	<li>Sélectionner un fichier à importer dans le réservoir. Il sera analysé et pour chaque ISBN trouvé, une entrée enfant sera créée dans le réservoir.</li>
+	<li>Si un ISBN existe déjà dans le réservoir, vous pouvez soit ignorer le nouveau, soit écrire par dessus l'ancien.</li>
+	<li>Vous pouvez nommer ce fichier d'importation. Cela peut servir lors de la création de notice biblio pour se souvenir d'où viennent les données MARC par défaut.</li>
+	<li>Si l'ISBN existe déjà dans la base active, la notice biblio sera ignorée.</li>
+</ul>
+<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
 <table cellpadding="3" border=0>
 	<tr valign="top">
-		<td>S&eacute;lectionnez le fichier &agrave; importer :</td>
+		<td>Sélectionner le fichier à importer:</td>
 		<td>
 			<input type="file" name="uploadmarc"/><br/>
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>Nom de cette importation :</td>
+		<td>Nom de ce fichier d'importation:</td>
 		<td>
 			<input type="text" name="filename"/><br/>
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>encodage (MARC21 or UNIMARC)</td>
+		<td>Codage des caractères (MARC21 ou UNIMARC)</td>
 		<td>
 			<select name="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>Si l'ISBN existe d&eacute;j&agrave; dans le r&eacute;servoir : </td>
-		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignorer celui-ci, conserver celui qui existe d&eacute;j&agrave;<br/>
-			<input type="radio" name="overwrite_biblio" value="1">Ecraser celui qui existe d&eacute;j&agrave; par celui-ci</td>
+		<td>Si un ISBN existe déjà dans le réservoir: </td>
+		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignorer celui-là, conserver l'existant<br/>
+			<input type="radio" name="overwrite_biblio" value="1">Ecrire par dessus l'actuel avec cet</td>
 	</tr>
 	<tr valign="top">
 		<td>&nbsp; </td>
-		<td><input type="submit" value="import"></td>
+		<td><input type="submit" value="Importer"></td>
 	</tr>
 
 </table>
 </form>
-</TMPL_IF>
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc
index 6210f746ab..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc
@@ -7,13 +7,14 @@
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc
index 2ceb26638d..3740af1be0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc
@@ -2,11 +2,11 @@
 
 <html>
 <head>
-<title>KOHA: INTRANET: Parameters</title>
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/common-style.css">
+<title>KOHA: INTRANET: Paramètres</title>
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 
 </head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
+<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" Alink="#cc3300"
 marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 
 <style>
@@ -32,7 +32,7 @@ a.about:hover {
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
 <tr height="45">
 	<td valign="bottom" align="left">
-		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
+		<table bgcolor="#dddddd" width="100%" cellpadding=0 cellspacing=0>
 		<tr>
 			<td>
 			<div id="menubar">
@@ -49,16 +49,16 @@ a.about:hover {
 						<a class="members" href="/cgi-bin/koha/members-home.pl">Lecteurs</a>
 					</td>
 					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisition</a>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
 					</td>
 					<td>
 						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
 					</td>
 					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Etats</a>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a>
 					</td>
 					<td>
-						<a class="parameters" href="/cgi-bin/koha/admin-home.pl" alt="Paramètres">Paramètres</a>
+						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Paramètres</a>
 					</td>
 					<td>
 						<a class="about" href="/cgi-bin/koha/about.pl">A propos</a>
@@ -71,8 +71,8 @@ a.about:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinusername">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc
index b6ac211088..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc
@@ -1,22 +1,22 @@
-<!-- saas@users.sf.net 21-APR-2002 renamed "aquisitions" to "acquisitions" -->
-
 <br clear=all>
 <p> &nbsp; </p>
 
+
 </BLOCKQUOTE>
+
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
 
 </HTML>
-
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc
index 2478e87ba6..4c9a7a3d17 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Acquisitions</title>
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/common-style.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
 marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
@@ -47,13 +47,13 @@ a.acquisition:hover {
 						<a class="members" href="/cgi-bin/koha/members-home.pl">Lecteurs</a>
 					</td>
 					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisition</a>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
 					</td>
 					<td>
 						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
 					</td>
 					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Etats</a>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a>
 					</td>
 					<td>
 						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Paramètres</a>
@@ -69,8 +69,8 @@ a.acquisition:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinusername">
-    <p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Quitter</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> à Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc
index 6210f746ab..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc
@@ -7,13 +7,14 @@
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc
index ca69d57e0b..6f0fbffa17 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc
@@ -13,7 +13,7 @@ window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 // end hiding -->
 </script>
 
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/common-style.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 <style>
 a.catalogue {
 	font-weight: normal;
@@ -61,13 +61,13 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 						<a class="members" href="/cgi-bin/koha/members-home.pl">Lecteurs</a>
 					</td>
 					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisition</a>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
 					</td>
 					<td>
 						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
 					</td>
 					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Etats</a>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a>
 					</td>
 					<td>
 						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Paramètres</a>
@@ -83,16 +83,19 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 					<td width="100"></td>
 					<td><b>options &gt;&gt;&nbsp;&nbsp;</b></td>
 					<td>
-						<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet" class="submenu">Recherche simple</a>
+						<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet" class="submenu">Recherche rapide</a>
 					</td>
 					<td>
 						<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet" class="submenu2">Recherche MARC</a>
 					</td>
 					<td>
-						<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="submenu">Ajout notice</a>
+						<a href="/cgi-bin/koha/shelves.pl" class="submenu">Rayonnages virtuels</a>
 					</td>
 					<td>
-						<a href="/cgi-bin/koha/maint/catmaintain.pl" target="window0" class="submenu2">Maintenance catalogue</a>
+						<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="submenu2">Ajouter une notice biblio</a>
+					</td>
+					<td>
+						<a href="/cgi-bin/koha/maint/catmaintain.pl" target="window0" class="submenu">Maintenance Cat</a>
 					</td>
 				</tr>
 			</table>
@@ -101,8 +104,8 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinusername">
-    <p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> à Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc
index d3360254a3..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc
@@ -1,18 +1,20 @@
 <br clear=all>
 <p> &nbsp; </p>
 
+
 </BLOCKQUOTE>
 
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc
index f0377b5c5d..c37c190393 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc
@@ -13,11 +13,10 @@ window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 function focusOnFirst (){
 document.forms[0].elements[0].focus();
 }
-
 // end hiding -->
 </script>
 
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/common-style.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 <style>
 a.circulation {
 	font-weight: normal;
@@ -60,13 +59,13 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 onLoad="javascript:focusOn
 						<a class="members" href="/cgi-bin/koha/members-home.pl">Lecteurs</a>
 					</td>
 					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisition</a>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
 					</td>
 					<td>
 						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
 					</td>
 					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Etats</a>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a>
 					</td>
 					<td>
 						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Paramètres</a>
@@ -88,7 +87,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 onLoad="javascript:focusOn
 						<a href="/cgi-bin/koha/circ/returns.pl" class="submenu2">Retours</a>
 					</td>
 					<td>
-						<a href="/cgi-bin/koha/circ/branchtransfers.pl" class="submenu">Transferts</a>
+						<a href="/cgi-bin/koha/circ/branchtransfers.pl" class="submenu">Transferts entre annexes</a>
 					</td>
 				</tr>
 			</table>
@@ -98,8 +97,8 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 onLoad="javascript:focusOn
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinusername">
-    <p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> à Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/fr/includes/common-style.css
index 2f3742dd72..4175d95cfe 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/common-style.css
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/common-style.css
@@ -1,9 +1,9 @@
 .button {
 	text-align: center;
 	font: 1.2em sans-serif;
-	padding: 10px 15px;
+	padding: 3px;
 	border-style: solid;
-	border-width: 2px;
+	border-width: 1px;
 	border-color: black;
 	text-decoration: none;
 	color: black;
@@ -12,7 +12,10 @@
 	background-color:#FFFFFF;
 	background-image:url("/intranet-tmpl/default/en/images/background-mem.gif");
 }
-
+#problem {
+	color: red;
+	font-weight:bold;
+}
 #menubar {
 	border-top:1px solid #666666;
 	font: 1.2em sans-serif;
@@ -23,6 +26,12 @@
 	background-color:#EEEEEE;
 	border-left:1px solid #000000;
 }
+a {
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: none;
+}
 a.submenu {
 	font-weight: normal;
 	text-decoration: none;
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc
index 655adef110..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc
@@ -10,9 +10,11 @@
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc
index f2243afca7..8ea1835849 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc
@@ -4,7 +4,7 @@
 
 <html>
 <head>
-<title>KOHA: INTRANET: Issues & Returns</title>
+<title>KOHA: INTRANET: Prêts & Retours</title>
 
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
@@ -14,10 +14,10 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 
 <!--HDL Colours
 
-	Yellow = ffcc00 
+	Yellow = ffcc00
 	light blue = ccccff
 	bright blue links = 0000ff
-	aubergine = 663266 
+	aubergine = 663266
 	light green/grey = cccc99
 
 
@@ -26,307 +26,306 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 <!------------------------MENUS-------------------------------->
 
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr valign=top bgcolor=ffcc00  >
-
-	<td COLSPAN=3>
-	<table cellpadding=0 cellspacing=0  border=0 height=29>
 	<tr valign=top bgcolor=ffcc00  >
-	<td background="/images/issues-spot-1.gif" width="224" 
-	height="29"><font size=1 face="arial"><img src="/images/holder.gif" width=210 height=4 alt=" " hspace=0 vspace=0><br>
-	<img src="/images/holder.gif" 
-	width=35 height=21 align=left alt=" " hspace=0 vspace=0>KOHA: <A HREF="/cgi-bin/koha/mainpage.pl">HDL INTRANET</A><br>
-	<img src="/images/holder.gif" width=210 height=1 alt=" " hspace=0 vspace=0></FONT></td>
-	
-	</TR></TABLE></TD>
-
-<TD COLSPAN=3 align=right><font size=1 face="arial" color="white">I 1 &nbsp; &nbsp; </font></TD>
-
-
-</tr>
-
-
-<TR VALIGN=TOP BGCOLOR="ffcc00"><TD  COLSPAN=6><img src="/images/holder.gif"  WIDTH=1  HEIGHT=12  HSPACE=0 vspace=0></TD></TR>
-
-
-
-<tr valign=top bgcolor=ffcc00  >
-
-<TD><img src="/images/holder.gif" 
-	width=35 height=21 align=left alt=" " hspace=0 vspace=0></TD>
-<td>
-<font size=2>
-<form action=/cgi-bin/simple-redirect.pl method=post>
-<select>
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>ISSUES & RETURNS
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-) Issues
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - -  Issues Today			
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - -  Issues This Week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - -  Issues This Month		
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Returns
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Returns Today			
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Returns This Week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Returns This Month	
-
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Renewals
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Renewals Today
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Renewals This Week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Renewals This Month
-
-
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Overdue Books
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Overdue Today
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Money Recieved
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Today
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Year
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Lost Books
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Lost This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Lost This year
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
-</select>
-</form>
-</TD>
-<TD>
-
-<font size=2>
-
-<form name=choose2>
-<select name=dest size=1 onChange="leapto(this.form)">
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>CATALOGUE
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Search
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Full Add New
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Bibliography
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Add
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Modify		
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Delete
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this year
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Items
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Add
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Modify		
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Delete
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this year
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Stock Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Levin
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Books	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Talking Books
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Videos	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Shanon
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Books	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Talking Books
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Videos	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Foxton
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Books	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Talking Books
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Videos	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
-</select>
-</form>
-</TD>
-<TD>
-
-<font size=2>
-
-<form name=choose2>
-<select name=dest size=1 onChange="leapto(this.form)">
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>AQUISITIONS
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Orders
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Order Books
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Order Serials
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Order Other	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Cancel Order
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Ordered This Week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Ordered This Month		
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Ordered This year	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Suppliers
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Supplier Details
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - On Order with Supplier
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Supplier Resources
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Amazon.com			
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Whitcoulls CD
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Whitcoulls Website	
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Deliveries
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Accept Delivery
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-	
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Delivered This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Delivered This year
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Budget
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 1
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Year to Date
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; 
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 2
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Year to Date
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; 
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 4
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Year to Date
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; 
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 5
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Year to Date
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; 
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Total Budget
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Month
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Year to Date
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; 
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - End Of Year Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; 
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Next Years Commitment
-
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
-</select>
-</form>
-
-</TD>
-<TD>
-<font size=2>
-
-<form name=choose2>
-<select name=dest size=1 onChange="leapto(this.form)">
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>BORROWERS
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> New Borrower
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Setup
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Check if Expired
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Policy
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Total Borrowers			
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - New This Week
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - New This Month		
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - New This Year		
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Borrower Enquirey
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - All Books Out
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Overdues
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - History
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Messages
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Average Borrowings		<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Total Borrowings
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
-</select>
-</form>
-</TD>
-<TD>
-<font size=2>
-<form name=choose2>
-<select name=dest size=1 onChange="leapto(this.form)">
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>OTHER
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> OPAC
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Catalogue Search
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Renew Books		
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Member Details
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Update Details		
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Resources
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Fundview CD
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  Library Website
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  End of Year
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Stocktake
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Set New Budgets
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Audit Reports
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  Help
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Telnet Help
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Intranet Help
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Searching Help
-
-<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  Advanced Reports
-</select>
-</form>
-</td>
-</tr>
-
-<tr valign=top bgcolor=ffcc00 >
-<TD COLSPAN=4>&nbsp;</TD>
-	<td  ALIGN=RIGHT COLSPAN=2 >
-	<table cellpadding=0 cellspacing=0  border=0 height=29>
-
-<tr valign=top bgcolor=ffcc00 >
-	<td background="/images/issues-spot-2.gif" width="235" 
-	height="29"  ALIGN=RIGHT ><font size=1 face="arial"><img src="/images/holder.gif" width=223 height=12 alt=" " hspace=0 vspace=0><br>
-	<img src="/images/holder.gif" 
-	width=26 height=17 align=right alt=" " hspace=0 vspace=0>you are in <A HREF="index.html">ISSUES & RETURNS</a><br>
-	<img src="/images/holder.gif" width=223 height=1 alt=" " hspace=0 vspace=0></FONT></td>
-	
-	</TR></TABLE></TD>
-
-
-
-
-</tr>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images
-/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR>
-
+		<td COLSPAN=3>
+			<table cellpadding=0 cellspacing=0  border=0 height=29>
+				<tr valign=top bgcolor=ffcc00>
+					<td background="<!-- TMPL_VAR name="themelang" -->/images/issues-spot-1.gif" width="224" height="29">
+						<font size=1 face="arial">
+						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=210 height=4 alt=" " hspace=0 vspace=0>
+						<br>
+						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=35 height=21 align=left alt=" " hspace=0 vspace=0>
+						KOHA: <A HREF="/cgi-bin/koha/mainpage.pl">HDL INTRANET</A>
+						<br>
+						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=210 height=1 alt=" " hspace=0 vspace=0>
+						</FONT>
+					</td>
+				</TR>
+			</TABLE>
+		</TD>
+		<TD COLSPAN=3 align=right>
+			<font size=1 face="arial" color="white">I 1 &nbsp; &nbsp; </font>
+		</TD>
+	</tr>
+	<TR VALIGN=TOP BGCOLOR="ffcc00">
+		<TD  COLSPAN=6>
+			<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif"  WIDTH=1  HEIGHT=12  HSPACE=0 vspace=0>
+		</TD>
+	</TR>
+	<tr valign=top bgcolor=ffcc00>
+		<TD>
+			<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=35 height=21 align=left alt=" " hspace=0 vspace=0>
+		</TD>
+		<td>
+			<font size=2>
+			<form action=/cgi-bin/simple-redirect.pl method=post>
+			<select>
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>PRETS & RETOURS
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-) Prêts
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - -  Prêts Today
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - -  Prêts This Week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - -  Prêts This Mois
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Retours
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Retours Today
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Retours This Week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Retours This Mois
+
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Renouvellements
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Renouvellements Today
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Renouvellements This Week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Renouvellements This Mois
+
+
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Signaler retard Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Signaler retard Today
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Money Reçu
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Today
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Année
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Perdu Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Perdu This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Perdu This year
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
+			</select>
+			</form>
+		</TD>
+		<TD>
+			<font size=2>
+
+			<form name=choose2>
+			<select name=dest size=1 onChange="leapto(this.form)">
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>CATALOGUE
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Search
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Full Add New
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Bibliography
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Add
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Modifier
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Delete
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this month
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this year
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Ouvrages
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Add
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Modifier
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Delete
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this month
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Changes this year
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Stock Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Levin
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Talking Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Videos
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Shanon
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Talking Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Videos
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Foxton
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Talking Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Videos
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
+			</select>
+			</form>
+		</TD>
+		<TD>
+			<font size=2>
+
+			<form name=choose2>
+			<select name=dest size=1 onChange="leapto(this.form)">
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>ACQUISITIONS
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Orders
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Commande Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Commande Serials
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Commande Other
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Annuler Commande
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Ordered This Week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Ordered This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Ordered This year
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Suppliers
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Supplier Details
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - On Commande with Supplier
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Supplier Resources
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Amazon.com
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Whitcoulls CD
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Whitcoulls Site Web
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Deliveries
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Accept Delivery
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Delivered This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Delivered This year
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Budget
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 1
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Année to Date
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 2
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Année to Date
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 4
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Année to Date
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Book Budget 5
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Année to Date
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Total Budget
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Année to Date
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - End Of Année Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp;
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Next Years Commitment
+
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
+			</select>
+			</form>
+		</TD>
+		<TD>
+			<font size=2>
+
+			<form name=choose2>
+			<select name=dest size=1 onChange="leapto(this.form)">
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>EMPRUNTEURS
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> New Emprunteur
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Setup
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Check if Expired
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Policy
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Total Borrowers
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - New This Week
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - New This Mois
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - New This Année
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Emprunteur Enquirey
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - All Books Out
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Overdues
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - History
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Messages
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Average Borrowings		<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Total Borrowings
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Advanced Reports
+			</select>
+			</form>
+		</TD>
+		<TD>
+			<font size=2>
+			<form name=choose2>
+			<select name=dest size=1 onChange="leapto(this.form)">
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=57>AUTRE
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> OPAC
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Recherche Catalogue
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Renouveler Books
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Lecteur Details
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - - Mettre à jour Details
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-> Resources
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Fundview CD
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  Library Site Web
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  End sur Année
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Stocktake
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Set New Budgets
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Audit Reports
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>-----------------------------------
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  Help
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Telnet Help
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Intranet Help
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43>&nbsp; &nbsp; - Searching Help
+
+			<option value=/cgi-bin/tododisplay.pl?user=Rachel&todo=43> ->  Advanced Reports
+			</select>
+			</form>
+		</td>
+	</tr>
+	<tr valign=top bgcolor=ffcc00 >
+		<TD COLSPAN=4>&nbsp;</TD>
+		<td  ALIGN=RIGHT COLSPAN=2 >
+			<table cellpadding=0 cellspacing=0  border=0 height=29>
+				<tr valign=top bgcolor=ffcc00 >
+					<td background="<!-- TMPL_VAR name="themelang" -->/images/issues-spot-2.gif" width="235" height="29"  ALIGN=RIGHT >
+						<font size=1 face="arial">
+						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=223 height=12 alt=" " hspace=0 vspace=0>
+						<br>
+						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=26 height=17 align=right alt=" " hspace=0 vspace=0>you are in <A HREF="index.html">PRETS & RETOURS</a><br>
+						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=223 height=1 alt=" " hspace=0 vspace=0></FONT>
+					</td>
+				</TR>
+			</TABLE>
+		</TD>
+	</tr>
+	<TR VALIGN=TOP BGCOLOR="000000">
+		<TD  COLSPAN=6>
+			<img src="<!-- TMPL_VAR name="themelang" -->/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0>
+		</TD>
+	</TR>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinusername">
-	<p align=left>Connecté en tant que : <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/userpage.pl>Se connecter</a> à Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc
index de1193d642..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/members-bottom.inc
@@ -1,16 +1,20 @@
 <br clear=all>
 <p> &nbsp; </p>
 
+
 </BLOCKQUOTE>
-<center>
+
+<CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc
new file mode 100644
index 0000000000..b146fa83bf
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc
@@ -0,0 +1,91 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<html>
+<head>
+<title>KOHA: INTRANET: Lecteurs</title>
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+</head>
+<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
+marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
+
+<style>
+a.members {
+	font-weight: normal;
+	text-decoration: none;
+	background-color: #86c268;
+	cursor: hand;
+	color:#FFFFFF;
+	padding:4px;
+	font-weight: bold;
+	}
+a.members:hover {
+	background-color: #86c268;
+	color: #FFFFFF;
+	text-decoration: none;
+	font-weight: bold;
+	}
+</style>
+
+<!------------------------MENUS-------------------------------->
+<table cellpadding=0 cellspacing=0 width="100%" border=0>
+<tr height="65">
+	<td valign="bottom" align="left">
+		<table width="100%" cellpadding=0 cellspacing=0>
+		<tr>
+			<td>
+			<div id="menubar">
+			<table cellpadding=0 cellspacing=0  border=0 height=29 width=70%>
+				<tr>
+					<td class="koha"><b>KOHA</b></td>
+					<td>
+						<a class="home" href="/cgi-bin/koha/mainpage.pl">Accueil</a>
+					</td>
+					<td>
+						<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a>
+					</td>
+					<td>
+						<a class="members" href="/cgi-bin/koha/members-home.pl">Lecteurs</a>
+					</td>
+					<td>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
+					</td>
+					<td>
+						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+					</td>
+					<td>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a>
+					</td>
+					<td>
+						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Paramètres</a>
+					</td>
+					<td>
+						<a class="about" href="/cgi-bin/koha/about.pl">A propos</a>
+					</td>
+				</TR>
+			</TABLE>
+			</div>
+			<table cellpadding=0 cellspacing=0  border=0 height=29>
+				<tr>
+					<td width="100"></td>
+					<td><b>options &gt;&gt;&nbsp;&nbsp;</b></td>
+					<td>
+						<a href="/cgi-bin/koha/members-home.pl" class="submenu">Adresse Lecteur</a>
+					</td>
+					<td>
+						<a href="/cgi-bin/koha/simpleredirect.pl?type=Add&chooseform=adult" class="submenu2">Ajouter un lecteur</a>
+					</td>
+					<td>
+						<a href="/cgi-bin/koha/simpleredirect.pl?type=Add&chooseform=organisation" class="submenu">Ajouter une organisation</a>
+					</td>
+				</tr>
+			</table>
+		</td></tr></table>
+	</TD>
+</tr>
+</table>
+<BLOCKQUOTE>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/opac-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/opac-bottom.inc
index a5f27a98f5..0fd4e3bf7f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/opac-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/opac-bottom.inc
@@ -6,8 +6,9 @@
 
 <font size=2  face="arial, helvetica">
 
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Recherche</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Zone Lecteur</a> ||
+<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Recherche Catalogue</a> ||
+<!--<A HREF="/cgi-bin/koha/members-home.pl">Lecteurs Aire</a> || -->
+<A HREF="/join.html">S'inscrire</a> ||
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a>
 
 </font>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc
index 65e1cd828a..6ce14fcb23 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc
@@ -3,7 +3,7 @@
 
 <html>
 <head>
-<title>KOHA: OPAC Catalogue Search</title>
+<title>KOHA: OPAC Recherche Catalogue</title>
 
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"
@@ -27,43 +27,43 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
 <tr BGCOLOR="#339999" >
 
-        <td valign=bottom><img src="/images/inside-top-search.gif" 
-	width=349 height=50 alt="KOHA: Catalogue Search" hspace=0 vspace=0 border=0></td>
+        <td valign=bottom><img src="<!-- TMPL_VAR name="themelang" -->/images/inside-top-search.gif" 
+	width=349 height=50 alt="KOHA: Recherche Catalogue" hspace=0 vspace=0 border=0></td>
 
 
-        <td align=right><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" 		onMouseOver="document.mouseover.src='/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img 
-	src="/images/menu-search.gif" 
-	width=71 height=30 alt="Search" hspace=0 vspace=0 border=0 name="menu-search"></a>
+        <td align=right><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" 		onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img 
+	src="<!-- TMPL_VAR name="themelang" -->/images/menu-search.gif" 
+	width=71 height=30 alt="Chercher" hspace=0 vspace=0 border=0 name="menu-search"></a>
 	
 <!--	<a href="/member/"
-	onMouseOver="document.mouseover.src='/images/mouseover-member.gif'" 			onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-login.gif" 
-	width=111 height=30 alt="Member Login" hspace=0 vspace=0 border=0 name="menu-login"></a>
+	onMouseOver="document.mouseover.src='/images/mouseover-member.gif'" 			onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-connecter.gif" 
+	width=111 height=30 alt="Lecteur Identifiant" hspace=0 vspace=0 border=0 name="menu-connecter"></a>
 -->
-	<TMPL_IF NAME=loggedinusername>
+	<!-- TMPL_IF NAME="loggedinusername" -->
 	    <a href="/cgi-bin/koha/userpage.pl"
-	    onMouseOver="document.mouseover.src='/images/mouseover-mysettings.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'">
-	    <img src="/images/menu-mysettings.gif"
+	    onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-mysettings.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'">
+	    <img src="<!-- TMPL_VAR name="themelang" -->/images/menu-mysettings.gif"
 	    width=90 height=30 alt="My Settings" hspace=0 vspace=0 border=0 name="menu-mysettings"></a>
-	<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 	    <a href="/join.html"
-	    onMouseOver="document.mouseover.src='/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'">
-	    <img src="/images/menu-join.gif"
+	    onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'">
+	    <img src="<!-- TMPL_VAR name="themelang" -->/images/menu-join.gif"
 	    width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"></a>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 
 	<a href="/cgi-bin/koha/mainpage.pl"
-	onMouseOver="document.mouseover.src='/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-home.gif"
-	width=60 height=30 alt="Home" hspace=0 vspace=0 border=0 name="menu-home"></a></td>
+	onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'"><img src="<!-- TMPL_VAR name="themelang" -->/images/menu-home.gif"
+	width=60 height=30 alt="Accueil" hspace=0 vspace=0 border=0 name="menu-home"></a></td>
 
         </TR>
 
 
 <tr valign=top>
 
-        <td><img src="/images/inside-koha-bottom.gif"
+        <td><img src="<!-- TMPL_VAR name="themelang" -->/images/inside-koha-bottom.gif"
 	width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 ></td>
 
-        <td align=right><img src="/images/holder.gif"
+        <td align=right><img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif"
 	width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" ></a></td>
 
         </TR>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc
index 6210f746ab..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc
@@ -7,13 +7,14 @@
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
index 1037d23fd3..bb4ef0803e 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
@@ -2,8 +2,8 @@
 
 <html>
 <head>
-<title>KOHA: INTRANET: Parameters</title>
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/common-style.css">
+<title>KOHA: INTRANET: Paramètres</title>
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
 marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
@@ -30,7 +30,7 @@ a.parameters:hover {
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
 <tr height="65">
 	<td valign="bottom" align="left">
-		<table width="100%" cellpadding=0 cellspacing=0>
+		<table width="100%" cellpadding=0 cellspacing=0 height=60>
 		<tr>
 			<td>
 			<div id="menubar">
@@ -47,13 +47,13 @@ a.parameters:hover {
 						<a class="members" href="/cgi-bin/koha/members-home.pl">Lecteurs</a>
 					</td>
 					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisition</a>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
 					</td>
 					<td>
 						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
 					</td>
 					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Etats</a>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a>
 					</td>
 					<td>
 						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Paramètres</a>
@@ -72,7 +72,7 @@ a.parameters:hover {
 						<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Fonds</a>
 					</td>
 					<td>
-						<a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Valeurs auth</a>
+						<a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Valeur autorisée</a>
 					</td>
 					<td>
 						<a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thésaurus</a>
@@ -90,8 +90,8 @@ a.parameters:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinusername">
-    <p align=left>Connecté en tant que: <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> à Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc
index 6210f746ab..63633d40ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc
@@ -7,13 +7,14 @@
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl">Accueil</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Lecteurs</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Etats</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
+<A HREF="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
 <A HREF="/cgi-bin/koha/admin-home.pl">Paramètres</a> ||
-<A HREF="/help/">Aide</a>
+<A HREF="/cgi-bin/koha/about.pl">A propos</a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc
index 9122e9495f..cbc07dc9c4 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc
@@ -2,8 +2,8 @@
 
 <html>
 <head>
-<title>KOHA: INTRANET: Reports</title>
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/common-style.css">
+<title>KOHA: INTRANET: Rapports</title>
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
 marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
@@ -47,13 +47,13 @@ a.reports:hover {
 						<a class="members" href="/cgi-bin/koha/members-home.pl">Lecteurs</a>
 					</td>
 					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisition</a>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
 					</td>
 					<td>
 						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
 					</td>
 					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Etats</a>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a>
 					</td>
 					<td>
 						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Paramètres</a>
@@ -69,8 +69,8 @@ a.reports:hover {
 </tr>
 </table>
 <BLOCKQUOTE>
-<TMPL_IF NAME="loggedinusername">
-    <p align=left>Connecté en tant que: <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> à Koha</p>
-</TMPL_IF>
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Déconnecter</a>]</p>
+<!-- TMPL_ELSE -->
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>S'identifier</a> à Koha</p>
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl
index b649a51145..eb17d65a69 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl
@@ -1,195 +1,164 @@
-<HTML>
-<TITLE>Bienvenue sur l'Intranet Koha</TITLE>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>Bienvenue dans l'intranet de Koha </title>
 
 <style type="text/css">
 <!--
 input{font-size:16px}
-
 -->
-
 </style>
-<script language=javascript>
+
+<script language="JavaScript" type="text/javascript">
 <!--
 if (document.images){
-search=new Image;
-search.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-search.gif"
-members=new Image;
-members.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-member.gif"
-acquisitions=new Image;
-acquisitions.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-acquisitions.gif"
-reports=new Image;
-reports.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-reports.gif"
-circulation=new Image;
-circulation.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-circulation.gif"
-}
+	search=new Image;
+	search.src ="<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-search.gif"
+	members=new Image;
+	members.src ="<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-member.gif"
+	acquisitions=new Image;
+	acquisitions.src ="<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-acquisitions.gif"
+	reports=new Image;
+	reports.src ="<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-reports.gif"
+	circulation=new Image;
+	circulation.src ="<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-circulation.gif"
+	}
 //-->
 </script>
 
-</HEAD>
-
-<BODY
-	bgcolor="#99cc33"
-	text="black"
-	alink="#663366"
-	leftmargin=0
-	topmargin=0
-	marginheight=0
-	marginwidth=0 >
-
-<center>
-<table cellspacing=0 cellpadding=0 border=0 >
-
-  <tr valign=top >
-	<td background="<TMPL_VAR NAME='themelang'>/images/koha-front-background.gif"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
-	width=1 height=420 align=left alt=" " hspace=0 vspace=0 >
-	<table cellspacing=0 cellpadding=0 border=0 >
-		<!----ROW THAT SETS THE GRID FOR THE REST OF THE TABLE--->
-		<tr valign=top >
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=150 height=42
-			alt=" " hspace=0 vspace=0 ></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=30 height=42
-			alt=" " hspace=0 vspace=0 ></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=25 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=25 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=30 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=20 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=20 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=10 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=10 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=90 height=42
-			alt=" " hspace=0 vspace=0></td>
+</head>
+
+<body bgcolor="#99CC33" text="#000000" alink="#663366" leftmargin="0" topmargin="0" marginwidth="0">
+
+<table border="0" cellspacing="0" cellpadding="0" align="center">
+
+  <tr valign="top">
+	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/koha-front-background.gif"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left">
+	<table cellspacing=0 cellpadding=0 border="0" >
+		<!-- ROW THAT SETS THE GRID FOR THE REST OF THE TABLE -->
+		<tr valign="top">
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="150" height="42"
+			alt="" hspace="0" vspace="0" ></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="30" height="42"
+			alt="" hspace="0" vspace="0" ></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="25" height="42"
+			alt="" hspace="0" vspace="0"></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="25" height="42"
+			alt="" hspace="0" vspace="0"></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="30" height="42"
+			alt="" hspace="0" vspace="0"></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="20" height="42"
+			alt="" hspace="0" vspace="0"></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="20" height="42"
+			alt="" hspace="0" vspace="0"></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="10" height="42"
+			alt="" hspace="0" vspace="0"></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="10" height="42"
+			alt="" hspace="0" vspace="0"></td>
+			<td background=""><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="90" height="42"
+			alt="" hspace="0" vspace="0"></td>
 		</tr>
 
-<!--------CATALOGUE SEARCH----->
+<!-- CATALOGUE SEARCH -->
 
-		<tr valign=top >
-			<td background="" colspan=5><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
-			width=1 height=1 hspace=0 vspace=0></td>
+		<tr valign="top">
+			<td colspan="5"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0"></td>
 
-			<td background="" colspan=5><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" onMouseOver="if(document.images)document.search.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-search.gif'" 		onMouseOut="if(document.images)document.search.src='<TMPL_VAR NAME='themelang'>/images/front-search.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-search.gif" width=320 	height=37 name="search"
-			alt="Catalogue"
-			hspace=0 vspace=0 border=0></a></td>
+			<td colspan="5"><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet" onMouseOver="if(document.images)document.search.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-search.gif'" 		onMouseOut="if(document.images)document.search.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-search.gif'"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Recherche Catalogue" vspace="0" border="0"></a></td>
 		</tr>
-		<FORM ACTION="/cgi-bin/koha/loadmodules.pl" method=post>
-		<tr valign=top >
-			<td background="" rowspan=3 align="right" colspan=5>
-				<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
-				width=1 height=35
-				alt=" " hspace=0 vspace=0><br>
-				<img src="<TMPL_VAR NAME='themelang'>/images/koha-front-koha.gif" width=200 height=128
-				alt="Koha: Horowhenua Library Trust" hspace=0 vspace=0></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=3>
+
+
+		<tr valign="top">
+			<td rowspan="3" align="right" colspan="5">
+				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0"><br>
+				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/koha-front-koha.gif" width="200" height="128"
+				alt="Koha: Open Source Library System" hspace="0" vspace="0"></td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td colspan="3">
+		 <!-- TMPL_IF NAME="NOTMARC" -->
+		                <form action="/cgi-bin/koha/loadmodules.pl" method="post">
 				<input type="hidden" name="module" value="search">
 				<input type="hidden" name="type" value="intranet">
-				<input type=text size="27" name="keyword">
-				<input type=reset value="Effacer">
-				<br>
-				<font size=1 face="arial,helvetica" ><b>Apr&egrave;s la saisie, 
-				pressez la touche Entr&eacute;e.</b><br>
-				<a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet"> <font size=2 face="arial narrow,arial,helvetica"> 
-				Recherche avanc&eacute;e (Plus d'options)</font></a><font size=2 face="arial narrow,arial,helvetica"><br>
-
-			<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
-			alt=" " hspace=0 vspace=0></font></font></td>
+				<input type="text" name="keyword" size="27"><input type="reset" value="effacer"><br>
+
+			<font size="1" face="arial,helvetica,sans-serif" ><b>Saisissez une valeur et pressez la touche Entrée..</b></font><br>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">
+			<font size="2" face="arial narrow,arial,helvetica,sans-serif">
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-arrow-purple.gif" width="27" height="22"
+			alt="" hspace="0" vspace="0" border="0" align="middle" >Recherche avancée (plus d'options)</a></font><br>
+			</form>
+		  <!-- /TMPL_IF -->
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0"></td>
+		</tr>		
+
+		<!-- MEMBER SEARCH -->
+
+		<tr valign="top">
+			<td>&nbsp;</td>
+			<td colspan="4">
+				<a href="/cgi-bin/koha/members-home.pl" onMouseOver="if(document.images)document.member.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-member.gif'" 		onMouseOut="if(document.images)document.member.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-member.gif'">
+				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-member.gif" width="304" height="37" alt="Recherche Lecteur" name="member" hspace="0" vspace="0" border="0"></a>
+			</td>
 
 		</tr>
-		</form>
-
-		<!--------MEMBER SEARCH----->
-
-		<tr valign=top >
-			<td></td>
-			<form action="/cgi-bin/koha/member.pl" method=post >
-			<td background=""  colspan=4>
-				<a href="/cgi-bin/koha/members-home.pl" onMouseOver="if(document.images)document.member.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-member.gif'" 		onMouseOut="if(document.images)document.member.src='<TMPL_VAR NAME='themelang'>/images/front-member.gif'">
-				<img src="<TMPL_VAR NAME='themelang'>/images/front-member.gif" width=304		height=37 name="member"
-				alt="Lecteurs"
-				hspace=0 vspace=0 border=0>
-			</a></td>
-
-		</form></tr>
-		<tr valign=top >
-			<td></td>
-			<td></td>
-			<form action="/cgi-bin/koha/member.pl" method=post >
-
-			<td background="" colspan=3 >
-			<input type=text size="27" name="member">
-			    <input type=reset value="Effacer">
-				<br>
-				<font size=1 face="arial,helvetica" ><b>Apr&egrave;s la saisie, 
-				pressez la touche Entr&eacute;e.</b><br>
-				<img src="/images/holder.gif" width=1 height=12
-			alt=" " hspace=0 vspace=0></font></td>
-
-		</form></tr>
-
- <!--------ACQUISITIONS----->
-		<tr valign=top >
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=5><A href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" onMouseOver="if(document.images)document.acquisitions.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-acquisitions.gif'" 		onMouseOut="if(document.images)document.acquisitions.src='<TMPL_VAR NAME='themelang'>/images/front-acquisitions.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-acquisitions.gif" width=320 		height=36 name="acquisitions"
-			alt="Acquisitions"
-			hspace=0 vspace=0 border=0></a><br>
-			<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=12
-			alt=" " hspace=0 vspace=0 ></td>
-
-
+		<tr valign="top">
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<form action="/cgi-bin/koha/member.pl" method="post">
+
+			<td colspan="3">
+			<input type="text" size="27" name="member">
+			<input type="reset" value="effacer"><br>
+			<font size="1" face="arial,helvetica,sans-serif"><b>Saisissez une valeur et pressez la touche Entrée..</b></font><br>
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0"></td>
+			</form>
 		</tr>
 
+ <!-- ACQUISITIONS -->
+		<tr valign="top">
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td colspan="5"><A href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" onMouseOver="if(document.images)document.acquisitions.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-acquisitions.gif'" 		onMouseOut="if(document.images)document.acquisitions.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-acquisitions.gif'"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Acquisitions" hspace="0" vspace="0" border="0"></a><br>
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" ></td>
+
 
-<!--------REPORTS----->
-		<tr valign=top >
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=6> <A href="/cgi-bin/koha/reports-home.pl" onMouseOver="if(document.images)document.reports.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-reports.gif'" 		onMouseOut="if(document.images)document.reports.src='<TMPL_VAR NAME='themelang'>/images/front-reports.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-reports.gif" width=346 		height=37 name="reports"
-			alt="Etats" hspace=0 vspace=0 border=0></a><br>
-			<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=12 alt=" " hspace=0 vspace=0 ></td>
 		</tr>
 
-<!--------ADMIN----->
-		<tr valign=top >
 
-			<td></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=7> <A href="/cgi-bin/koha/admin-home.pl" onMouseOver="if(document.images)document.admin.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-admin.gif'" 		onMouseOut="if(document.images)document.admin.src='<TMPL_VAR NAME='themelang'>/images/front-admin.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-admin.gif" width=346 		height=37 name="admin"
-			alt="Param&egrave;tres"
-			hspace=0 vspace=0 border=0></a><br>
-			<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=12
-			alt=" " hspace=0 vspace=0 ></td>
+<!-- REPORTS -->
+		<tr valign="top">
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td colspan=6> <A href="/cgi-bin/koha/reports-home.pl" onMouseOver="if(document.images)document.reports.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-reports.gif'" 		onMouseOut="if(document.images)document.reports.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-reports.gif'"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-reports.gif" width="346" height="37" name="reports" alt="Accounts et Reports" hspace="0" vspace="0" border="0"></a><br>
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" ></td>
+		</tr>
 
+<!-- ADMIN -->
+		<tr valign="top">
 
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td colspan="7"> <a href="/cgi-bin/koha/admin-home.pl" onMouseOver="if(document.images)document.admin.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-admin.gif'" 		onMouseOut="if(document.images)document.admin.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-admin.gif'"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Paramètres" border="0"></a><br>
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" ></td>
 		</tr>
 
-<!--------CIRCULATION----->
-		<tr valign=top >
+<!-- CIRCULATION -->
+		<tr valign="top">
 
-			<td></td>
-			<td background="" colspan=9> <A href="/cgi-bin/koha/circ/circulation.pl" onMouseOver="if(document.images)document.circulation.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-circulation.gif'" 		onMouseOut="if(document.images)document.circulation.src='<TMPL_VAR NAME='themelang'>/images/front-circulation.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-circulation.gif" width=346 		height=37 name="circulation"
-			alt="Circulation"
-			hspace=0 vspace=0 border=0></a>
+			<td>&nbsp;</td>
+			<td colspan="9"> <A href="/cgi-bin/koha/circ/circulation.pl" onMouseOver="if(document.images)document.circulation.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-mouseover-circulation.gif'" 		onMouseOut="if(document.images)document.circulation.src='<!-- TMPL_VAR NAME="themelang" -->/images/front-circulation.gif'"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Circulation" hspace="0" vspace="0" border="0"></a>
 			</td>
 		</tr>
 	</table>
 	</td>
 </tr>
 </table>
-</center>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl b/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl
index d0b2022c73..1f9c14a4ff 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl
@@ -1,32 +1,22 @@
-<TMPL_INCLUDE Name="members-top.inc">
-
-<Center>
-  <h3>Cr&eacute;dit manuel</h3>
-</center>
-<form action=/cgi-bin/koha/mancredit.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name="bornum" value="<TMPL_VAR Name="bornum">">
-<tr>
-	  <td><b>Num&eacute;ro de lecteur<b></b></b></td>
-	  <td><TMPL_VAR Name="bornum"></td></tr>
-<tr>
-	  <td><b>Type de cr&eacute;dit</b></td>
-	  <Td>
-<select name=type>
-<option value=C>Cr&eacute;dit</option>
-<option value=BAY>Baycorp Adjustment</option>
-<option value=WORK>Worked off</option>
-</select>
-</td></tr>
-<tr>
-	  <td><b>Num&eacute;ro de document</b></td>
-	  <td><input type=text name=itemnum></td></tr>
-<tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr>
-<tr>
-	  <td><b>Montant</b></td>
-	  <td><input type=text name=amount></td></tr>
-<tr><td><input type=submit name=add value=Ajouter></td></tr>
-</table>
-</form>
-
-<TMPL_INCLUDE Name="members-bottom.inc">
\ No newline at end of file
+<!-- TMPL_INCLUDE Name="members-top.inc" -->
+
+<Center><h3>Crédit manuel</h3></center>
+<form action=/cgi-bin/koha/mancredit.pl method=post>
+<table cellpadding=2 cellspacing=0 border=0>
+<input type=hidden name="bornum" value="<!-- TMPL_VAR Name="bornum" -->">
+<tr><td><b>N° Lecteur<b></td><td><!-- TMPL_VAR Name="bornum" --></td></tr>
+<tr><td><b>Saisir</b></td><Td>
+<select name=type>
+<option value=C>Crédit</option>
+<option value=BAY>Baycorp Adjustment</option>
+<option value=WORK>Débarasser</option>
+</select>
+</td></tr>
+<tr><td><b>Itemnumber</b></td><td><input type=text name=itemnum></td></tr>
+<tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr>
+<tr><td><b>Montant</b></td><td><input type=text name=amount></td></tr>
+<tr><td><input type=submit name=add value=Add></td></tr>
+</table>
+</form>
+
+<!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl
index a6bcac1453..05b8229d4e 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl
@@ -1,37 +1,25 @@
-<TMPL_INCLUDE Name="members-top.inc">
-
-<Center>
-  <h3>Facture manuelle</h3>
-</center>
-<form action=/cgi-bin/koha/maninvoice.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name=bornum value="<TMPL_VAR Name="bornum">">
-<tr>
-	  <td><b>Num&eacute;ro de lecteur<b></b></b></td>
-	  <td><TMPL_VAR Name="bornum"></td></tr>
-<tr>
-	  <td><b>Type de facture</b></td>
-	  <Td>
-<select name=type>
-<option value=L>Document perdu</option>
-<option value=F>Amende</option>
-<option value=A>Frais de gestion</option>
-<option value=N>Nouvelle carte</option>
-<option value=M>Divers</option>
-<option value=REF>Remboursement</option>
-</select>
-</td></tr>
-<tr>
-	  <td><b>Num&eacute;ro de document</b></td>
-	  <td><input type=text name=itemnum></td></tr>
-<tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr>
-<tr>
-	  <td><b>Montant</b></td>
-	  <td><input type=text name=amount></td></tr>
-<tr><td>
-		<input type=submit name=add value=Ajouter>
-	  </td></tr>
-</table>
-</form>
-
-<TMPL_INCLUDE Name="members-bottom.inc">
+<!-- TMPL_INCLUDE Name="members-top.inc" -->
+
+<Center><h3>Facture manuelle</h3></center>
+<form action=/cgi-bin/koha/maninvoice.pl method=post>
+<table cellpadding=2 cellspacing=0 border=0>
+<input type=hidden name=bornum value="<!-- TMPL_VAR Name="bornum" -->">
+<tr><td><b>N° Lecteur<b></td><td><!-- TMPL_VAR Name="bornum" --></td></tr>
+<tr><td><b>Saisir</b></td><Td>
+<select name=type>
+<option value=L>Document perdu</option>
+<option value=F>Amende</option>
+<option value=A>Frais de gestion de compte</option>
+<option value=N>Nouvelle carte</option>
+<option value=M>Divers</option>
+<option value=REF>Argent rendu</option>
+</select>
+</td></tr>
+<tr><td><b>Itemnumber</b></td><td><input type=text name=itemnum></td></tr>
+<tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr>
+<tr><td><b>Montant</b></td><td><input type=text name=amount></td></tr>
+<tr><td><input type=submit name=add value=Add></td></tr>
+</table>
+</form>
+
+<!-- TMPL_INCLUDE Name="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptBiblioitem.tmpl b/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptBiblioitem.tmpl
new file mode 100644
index 0000000000..02f120f5b2
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptBiblioitem.tmpl
@@ -0,0 +1,59 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<center>
+<!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
+     was in Perl.
+  -->
+<a href=$ENV{'SCRIPT_NAME'}?file=$file>Nouvelle notice</a> | <a href=marcimport.pl>Nouveau fichier</a><br>
+<!-- TMPL_IF name="BIBLIO_EXISTS" -->
+	<table border=0 width=50% cellpadding=10 cellspacing=0>
+		<tr>
+			<th background=/images/background-acq.gif>Notice déjà existante
+			</th>
+		</tr>
+		<tr>
+			<td bgcolor="#dddddd">
+				<!-- TMPL_VAR name="title" --> is already in the database with 
+				biblionumber <!-- TMPL_VAR name="biblionumber" --> et biblioitemnumber <!-- TMPL_VAR name="biblioitemnumber" -->
+			  </td>
+		</tr>
+	</table>
+	<p>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="BIBLIO_CREATE" -->
+    <table cellpadding=10 cellspacing=0 border=0 width=50%>
+		<tr>
+			<th background=/images/background-acq.gif>Notice enregistrée</th>
+		</tr>
+		<tr>
+			<td bgcolor=#dddddd>
+				<!-- TMPL_VAR name="title" -->has been entered into the database with biblionumber
+				<!-- TMPL_VAR name="biblionumber" --> et biblioitemnumber <!-- TMPL_VAR name="biblioitemnumber" --></td>
+		</tr>
+	  </table>
+<!-- /TMPL_IF -->
+    <table border=0 cellpadding=10 cellspacing=0>
+      <tr><th background=/images/background-acq.gif>
+	Ajouter un nouvel ouvrage pour <!-- TMPL_VAR name="title" -->
+      </th></tr>
+      <tr><td bgcolor=#dddddd>
+      <form>
+        <input type=hidden name=newitem value=1>
+        <input type=hidden name=biblionumber value="<!-- TMPL_VAR name="biblionumber" -->">
+        <input type=hidden name=biblioitemnumber value="<!-- TMPL_VAR name="biblioitemnumber" -->">
+        <input type=hidden name=file value="<!-- TMPL_VAR name="file" -->">
+        <table border=0>
+          <tr><td>CODE BARRE</td><td><input name=barcode size=10 value="<!-- TMPL_VAR name="barcode" -->">
+          Annexe propriétaire: <select name=homebranch><!-- TMPL_VAR name="branchselect" --></select>
+	  </td></tr>
+          <tr><td>Prix Remplacement:</td>
+	  <td><input name=replacementprice size=10></td></tr>
+          <tr><td>Notes</td>
+	  <td><textarea name=notes rows=4 cols=40 wrap=physical></textarea>
+	  </td></tr>
+        </table>
+        <p>
+        <input type=submit value="Ajouter un ouvrage">
+      </form>
+      </td></tr>
+    </table>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptItemCopy.tmpl b/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptItemCopy.tmpl
new file mode 100644
index 0000000000..d29bdfa004
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptItemCopy.tmpl
@@ -0,0 +1,27 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<center>
+<!-- TMPL_IF name="BARCODE_EXISTS" -->
+	<font color=red>Code barre <b><!-- TMPL_VAR name="barcode" --></b> a déjà été affecté.</font><p>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="ITEM_ERROR" -->
+	<font color=red>Erreur : <!-- TMPL_VAR name="error" --></font><p>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="ITEM_CREATED" -->
+	<table border=1 align=center cellpadding=10>
+		<tr><td bgcolor=yellow>
+			Ouvrage ajouté avec un code barre <!-- TMPL_VAR name="barcode" -->
+		</td></tr>
+	</table>
+<!-- /TMPL_IF -->
+<h1>Menu principal</h1>
+<ul>
+<!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
+     was in Perl.
+  -->
+<li><a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Recherche Z39.50</a>
+<!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
+     was in Perl.
+  -->
+<li><a href=$ENV{'SCRIPT_NAME'}?menu=uploadmarc>Charger des notices MARC</a>
+</ul>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptMarcUpload.tmpl b/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptMarcUpload.tmpl
new file mode 100644
index 0000000000..50680cd4aa
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptMarcUpload.tmpl
@@ -0,0 +1,41 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->>Menu principal</a></h1>
+<h2>Sélectionner un ensemble de notices MARC</h2>\n<ul>
+<!-- TMPL_LOOP name="marc" -->
+	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="id" -->&menu=<!-- TMPL_VAR name="menu" -->><!-- TMPL_VAR name="name" --></a></li>
+<!-- /TMPL_LOOP -->
+<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Recherche Z39.50</a>
+<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Charger des notices MARC</a>
+</ul>
+</ul>
+<p>
+<table border=1 bgcolor=#dddddd>
+	<tr><th bgcolor=#bbbbbb colspan=2>
+		Charger un ensemble de notices MARC</th>
+	</tr>
+	<tr>
+		<td>Charger un ensemble de notices MARC:</td>
+		<td>
+			<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR name="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc"/>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<input type=hidden name=menu value=<!-- TMPL_VAR name="menu" -->
+			Nommer cet ensemble de notices MARC:
+		</td>
+		<td>
+			<input type=text name=name>
+		</td>
+	</tr>
+	<tr>
+		<td colspan=2 align=center>
+			<input type=submit>
+		</td>
+	</tr>
+</table>
+</form>
+
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/marcimport/ListFileRecords.tmpl b/koha-tmpl/intranet-tmpl/default/fr/marcimport/ListFileRecords.tmpl
new file mode 100644
index 0000000000..43288424a2
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/marcimport/ListFileRecords.tmpl
@@ -0,0 +1,53 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1>Menu principal</h1>
+<ul>
+<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Recherche Z39.50</a>
+<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Charger des notices MARC</a>
+</ul>
+<center>
+<p>
+<!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
+     was in Perl.
+  -->
+<a href=$ENV{'SCRIPT_NAME'}?menu=$menu>Sélectionner un nouveau fichier</a>
+<p>
+<!-- TMPL_IF name="IS_MARC" -->
+	<table border=0 cellpadding=10 cellspacing=0>
+	<tr>
+		<th background=/images/background-acq.gif>
+		 	Sélectionner une notice à importer de <!-- TMPL_VAR name="recordsource" -->
+		</th>
+	</tr>
+	<tr>
+		<td bgcolor=#dddddd>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="IS_Z3950" -->
+<table border=0 cellpadding=10 cellspacing=0>
+<tr>
+		<td bgcolor=#dddddd>
+		<!-- TMPL_IF name="HAS_NUMRECORDS" -->
+	            <a name=SERVER-<!-- TMPL_VAR name="srvid" -->></a> " <!-- TMPL_VAR name="srvname" -->
+		<font size=-1>[Viewing <!-- TMPL_VAR name="startrecord" --> to <!-- TMPL_VAR name="highest" --> sur <!-- TMPL_VAR name="numrecords" --> enregistrements]  <!-- TMPL_VAR name="previous" --> | <!-- TMPL_VAR name="next" --> </font><br>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="PENDING" -->
+			<font color=red>Recherche en cours...</font>
+		<!-- TMPL_ELSE -->
+			<font color=red>en traitement... <!-- TMPL_VAR name="elapsedtime" --></font>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="NO_RECORDS" -->
+			<b>Pas de résultat trouvé pour cette demande <!-- TMPL_VAR name="id" --></b>
+		<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+	<!-- TMPL_LOOP name="LINES" -->
+<!--		<a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="file" -->&resultsid=<!-- TMPL_VAR name="resultsid" -->&<!-- TMPL_VAR name="searchfield" -->=<!-- TMPL_VAR name="searchvalue" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->&searchvalue=<!-- TMPL_VAR name="searchvalue" -->> -->
+		<a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="file" -->&numrecord=<!-- TMPL_VAR name="numrecord" -->>
+				<!-- TMPL_VAR name="title" -->
+				<!-- TMPL_VAR name="author" -->
+		</a>
+		<!-- TMPL_VAR name="donetext" --><br>
+	<!-- /TMPL_LOOP -->
+</td>
+</tr>
+</table>
+
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/marcimport/mainmenu.tmpl b/koha-tmpl/intranet-tmpl/default/fr/marcimport/mainmenu.tmpl
new file mode 100644
index 0000000000..e0507b3187
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/marcimport/mainmenu.tmpl
@@ -0,0 +1,7 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1>Menu principal</h1>
+<ul>
+<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Recherche Z39.50</a>
+<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Charger des notices MARC</a>
+</ul>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/marcimport/marcimportdetail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/marcimport/marcimportdetail.tmpl
new file mode 100644
index 0000000000..fe82e45370
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/marcimport/marcimportdetail.tmpl
@@ -0,0 +1,61 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<a href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>
+<img height=42  WIDTH=120 BORDER="0" src="/images/requests.gif" align="right" border="0"></a>
+<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+<!-- TMPL_VAR NAME="class" --></em></font><p>
+<!-- FIXME - "callpadding" should be "cellpadding", right? -->
+<table cellspacing="0" callpadding="5" border="1" align="left" width="220">
+<!-----------------old style RECORD TABLE--------->
+<center>
+<h1>Nouvelle notice</h1>
+Notice MARC complète disponible au fond
+<form method=post>
+<table border=1>
+	<tr bgcolor="#dddddd"><td>Titre</td><td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Sous-titre</td><td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#dddddd"><td>Auteur</td><td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Auteurs supplémentaires</td><td><textarea name="additionalauthors" rows=4 cols=20><!-- TMPL_VAR NAME="additionalauthors" --></textarea></td></tr>
+	<tr bgcolor="#dddddd"><td>Illustrateur</td><td><input type="text" name="illustrator" value="<!-- TMPL_VAR NAME="illustrator" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Copyright</td><td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" size=20 maxlenght=80></td></tr>
+	<tr bgcolor="#dddddd"><td>Titre Séries</td><td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Volume</td><td><input type="text" name="volume" value="<!-- TMPL_VAR NAME="volume" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#dddddd"><td>Nombre;LIMITED</td><td><input type="text" name="number" value="<!-- TMPL_VAR NAME="number" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Date Volume</td><td><input type="text" name="volumedate" value="<!-- TMPL_VAR NAME="volumedate" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#dddddd"><td>Description Volume</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Sujet</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Catég ouvrage</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
+	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size=40 maxlenght=40></td></tr>
+	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size=40 maxlenght=40></td></tr>
+	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size=40 maxlenght=40></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Dewey</td><td><input type="text" name="dewey" value="<!-- TMPL_VAR NAME="dewey" -->" size=8 maxlenght=10></td></tr>
+	<tr bgcolor="#dddddd"><td>Sous-classe</td><td><input type="text" name="subclass" value="<!-- TMPL_VAR NAME="subclass" -->" size=40 maxlenght=40></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Année de publication</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size=5 maxlenght=10></td></tr>
+	<tr bgcolor="#dddddd"><td>Editeur</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Lieu</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size=40 maxlenght=255></td></tr>
+	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size=5 maxlenght=10></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Taille</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size=40 maxlenght=40></td></tr>
+</table>
+<input type=submit>
+<input type="hidden" name="insertnewrecord" value=1>
+<!-- <input type="hidden" name="origisbn" value="<!-- TMPL_VAR name="qisbn" -->">
+<input type="hidden" name="origissn" value="<!-- TMPL_VAR name="qissn" -->">
+<input type="hidden" name="origlccn" value="<!-- TMPL_VAR name="qlccn" -->">
+<input type="hidden" name="origcontrolnumber" value="<!-- TMPL_VAR name="qcontrolnumber" -->"> -->
+<input type="hidden" name="file" value="<!-- TMPL_VAR name="file" -->">
+<input type="hidden" name="numrecord" value="<!-- TMPL_VAR name="numrecord" -->">
+</form>
+
+<!-- Notice MARC -->
+<table width=100% cellspacing=1 cellpading=1>
+<th colspan=4 background="/images/background-acq.gif">Notice MARC</th>
+<!-- TMPL_LOOP name="MARC" -->
+<tr bgcolor="<!-- TMPL_VAR name="color" -->">
+	<td width=5% align="right"><b><!-- TMPL_VAR name="tagid" --></b>&nbsp;</td>
+	<td width=3% align="right"><b><!-- TMPL_VAR name="subfield" --></b>&nbsp;</td>
+	<td width=48%><!-- TMPL_VAR name="tagmean" -->&nbsp;</td>
+	<td width=45% bgcolor="<!-- TMPL_VAR name="color" -->"><!-- TMPL_VAR name="tagvalue" -->&nbsp;</td>
+<tr>
+<!-- /TMPL_LOOP -->
+</table>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/marcimport/uploadmarc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/marcimport/uploadmarc.tmpl
new file mode 100644
index 0000000000..febd2c06f4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/marcimport/uploadmarc.tmpl
@@ -0,0 +1,42 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->>Menu principal</a></h1>
+<ul>
+	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Recherche Z39.50</a>
+	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Charger des notices MARC</a>
+</ul>
+<h2>Sélectionner un ensemble de notices MARC</h2><ul>
+<!-- TMPL_LOOP name="marc" -->
+	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="id" -->&menu=<!-- TMPL_VAR name="menu" -->><!-- TMPL_VAR name="name" --></a></li>
+<!-- /TMPL_LOOP -->
+</ul>
+<p>
+<table border=1 bgcolor=#dddddd>
+	<tr><th bgcolor=#bbbbbb colspan=2>
+		Charger un ensemble de notices MARC</th>
+	</tr>
+	<tr>
+		<td>Charger un ensemble de notices MARC:</td>
+		<td>
+			<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR name="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc"/>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<input type=hidden name=menu value=<!-- TMPL_VAR name="menu" -->>
+			Nommer cet ensemble de notices MARC:
+		</td>
+		<td>
+			<input type=text name=name>
+		</td>
+	</tr>
+	<tr>
+		<td colspan=2 align=center>
+			<input type=submit>
+		</td>
+	</tr>
+</table>
+</form>
+
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/member-flags.tmpl b/koha-tmpl/intranet-tmpl/default/fr/member-flags.tmpl
new file mode 100644
index 0000000000..9c843a9ed0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/member-flags.tmpl
@@ -0,0 +1,28 @@
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+
+<h2><!-- TMPL_VAR NAME=surname -->, <!-- TMPL_VAR NAME=firstname --></h2>
+<form method=post>
+	<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
+	<input type=hidden name=newflags value=1>
+	<table border=1>
+	<tr><th background=/koha/images/background-mem.gif colspan=3>DRAPEAUX</th></tr>
+	<!-- TMPL_LOOP NAME=loop -->
+		<tr>
+			<td>
+				<input type=checkbox name=flag-<!-- TMPL_VAR NAME=bit --> <!-- TMPL_VAR NAME=checked -->>
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME=flag -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME=flagdesc -->
+			</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+
+	<p>
+	<input type=submit value="Valider habilitations" class="button">
+</form>
+
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/imemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/imemberentry.tmpl
index bc7941136e..01b99e0dcb 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/imemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/imemberentry.tmpl
@@ -1,72 +1,72 @@
-<TMPL_INCLUDE name="members-top.inc">
+<!-- TMPL_INCLUDE name="members-top.inc" -->
 <BLOCKQUOTE>
 
-<TMPL_IF name="surname">
-	<h1>Editer organisme</h1><br>
-<TMPL_ELSE>
-	<h1>Ajouter un nouvel organisme</h1><br>
-</TMPL_IF>
+<!-- TMPL_IF name="surname" -->
+	<h1>Editer Institution</h1><br>
+<!-- TMPL_ELSE -->
+	<h1>Ajouter une nouvelle institution</h1><br>
+<!-- /TMPL_IF -->
 <form action=/cgi-bin/koha/newimember.pl method=post>
   <input type=hidden name=joining value="">
   <input type=hidden name=expiry value="">
-  <input type=hidden name=type value="borrowers">
-  <input type=hidden name=borrowernumber value="<TMPL_VAR NAME=member>">
+  <input type=hidden name=type value="emprunteurs">
+  <input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
   <input type=hidden name=updtype value=I>
 
   <table border=0 cellspacing=0 cellpadding=5>
 
     <tr valign=top>
-      <td ><input type=reset value="Clear all Fields"></td>
+      <td ><input type=reset value="Effacer tous les champs"></td>
     </tr>
 
     <tr align=right>
       <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
-        <STRONG>N&deg; de lecteur <TMPL_VAR NAME="member">, N&deg; de carte*</STRONG>
+        <STRONG>N° Lecteur <!-- TMPL_VAR NAME="member" -->, N° Carte*</STRONG>
       </TD>
-      <TD align=right><input type=text name=cardnumber_institution size=20 value=<TMPL_VAR NAME=cardnumber_institution>><br></td>
+      <TD align=right><input type=text name=cardnumber_institution size=20 value=<!-- TMPL_VAR NAME=cardnumber_institution -->><br></td>
     </TR>
 
     <tr><td>&nbsp;</TD></TR>
 
     <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-        <B>DETAILS SUR L'ORGANISME </b></td>
+      <td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+        <B>DETAILS INSTITUTION</b>
       </td>
-      <td  COLSPAN=2  ALIGN=RIGHT background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+      <td  COLSPAN=2  ALIGN=RIGHT background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
       </td>
     </tr>
 
     <tr valign=top bgcolor=white>
-      <td><FONT SIZE=2>Nom de l&quot;organisme</FONT></td>
+      <td><FONT SIZE=2>Nom Institution</FONT></td>
     </tr>
     <tr valign=top bgcolor=white>
-      <td colspan=3><input type=text name=institution_name size=50 value="<TMPL_VAR name="surname">"></td>
+      <td colspan=3><input type=text name=institution_name size=50 value="<!-- TMPL_VAR name="surname" -->"></td>
     </tr>
     <tr><td>&nbsp;</TD></TR>
 
     <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	  <B>ADRESSE DE L'ORGANISME</b></td>
+      <td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+	  <B>ADRESSE INSTITUTION</b>
       </td>
     </tr>
 
     <tr valign=top bgcolor=white>
 	<td ><FONT SIZE=2>Adresse postale*</FONT></td>
-	<td><FONT SIZE=2>Code postal / Ville*</FONT></td>
-	<td><FONT SIZE=2>Annexe</FONT></td>
+	<td><FONT SIZE=2>Code postal / Localité*</FONT></td>
+	<td><FONT SIZE=2>Aire</FONT></td>
     </tr>
     <tr valign=top bgcolor=white>
-	<td><input type=text name=address size=40 value="<TMPL_VAR name="streetaddress">"></td>
-	<td><input type=text name=zipcode size=20 value="<TMPL_VAR name="zipcode">"> <br/><input type=text name=city size=20 value="<TMPL_VAR name="city">"></td>
+	<td><input type=text name=address size=40 value="<!-- TMPL_VAR name="streetaddress" -->"></td>
+	<td><input type=text name=zipcode size=20 value="<!-- TMPL_VAR name="zipcode" -->"> <br/><input type=text name=city size=20 value="<!-- TMPL_VAR name="city" -->"></td>
 	<td>
-      	<TMPL_VAR name="CGIbranch">
+      	<!-- TMPL_VAR name="CGIbranch" -->
 	 </td>
     </tr>
     <tr><td>&nbsp;</TD></TR>
 
     <tr valign=top bgcolor="99cc33">
-      <td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	  <B>DETAILS DU CONTACT</b>
+      <td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+	  <B>DETAILS CONTACT</b>
       </td>
     </tr>
 
@@ -74,48 +74,48 @@
 	<td COLSPAN=3><FONT SIZE=2>Nom du contact*</td>
     </tr>
     <tr valign=top bgcolor=white>
-	<td COLSPAN=3><input type=text name=contactname size=40 value="<TMPL_VAR name="contactname">"></td>
+	<td COLSPAN=3><input type=text name=contactname size=40 value="<!-- TMPL_VAR name="contactname" -->"></td>
     </tr>
 
 
     <tr valign=top bgcolor=white>
-	<td><FONT SIZE=2>T&eacute;l&eacute;phone (HB)</td>
+	<td><FONT SIZE=2>Téléphone (day)</td>
 	<td><FONT SIZE=2>Fax</td>
-	<td><FONT SIZE=2>Email</td>
+	<td><FONT SIZE=2>E-mail</td>
     </tr>
     <tr valign=top bgcolor=white>
-	<td ><input type=text name=phoneday size=20 value="<TMPL_VAR name="phoneday">"></td>
-	<td><input type=text name=faxnumber size=20 value="<TMPL_VAR name="faxnumber">"></td>
-	<td ><input type=text name=emailaddress size=20 value="<TMPL_VAR name="emailaddress">"></td>
+	<td ><input type=text name=phoneday size=20 value="<!-- TMPL_VAR name="phoneday" -->"></td>
+	<td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR name="faxnumber" -->"></td>
+	<td ><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR name="emailaddress" -->"></td>
     </tr>
 
     <tr><td>&nbsp;</TD></TR>
 
     <tr valign=top bgcolor=white>
-	<td><FONT SIZE=2>Remarques</font></td>
+	<td><FONT SIZE=2>Notes</font></td>
     </tr>
     <tr valign=top bgcolor=white>
-	<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><TMPL_VAR name="altnotes"></textarea></td>
+	<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR name="altnotes" --></textarea></td>
     </tr>
 
     <tr><td>&nbsp;</TD></TR>
 
     <tr valign=top bgcolor="99cc33"  >
-	<td  COLSPAN=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>UTILISATION DE LA BIBLIOTHEQUE</B></td>
+	<td  COLSPAN=5  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>UTILISATION BIBLIOTHEQUE</B></td>
     </tr>
 
     <tr valign=top bgcolor=white>
-	<td ><FONT SIZE=2>Remarques</font></td>
+	<td ><FONT SIZE=2>Notes</font></td>
     </tr>
     <tr valign=top >
-	<td  COLSPAN=5><textarea name=borrowernotes wrap=physical cols=70 rows=3><TMPL_VAR name="borrowernotes"></textarea></td>
+	<td  COLSPAN=5><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR name="borrowernotes" --></textarea></td>
     </tr>
 
     <tr><td>&nbsp;</TD></TR>
 
     <tr valign=top bgcolor=white>
 	<td  COLSPAN=5 align=right >
-	  <input type=submit class="button" value="Save Changes" ALT="Add New Member" border=0 >
+	  <input type=submit class="button" value="Enregistrer changements" ALT="Ajouter un nouveau lecteur" border=0 >
       </td>
     </tr>
   </TABLE>
@@ -126,7 +126,7 @@
 <br clear=all>
 <p> &nbsp; </p>
 
-<TMPL_VAR NAME=endmenumember>
+<!-- TMPL_VAR NAME=endmenumember -->
 
 </body>
 </HTML>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl
index d02074baad..4c160c1acd 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl
@@ -1,92 +1,92 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<h1>Nouvelle inscription : jeune lecteur</h1><br>
+<h1>Ajouter un nouvel enfant </h1><br>
 <form action=/cgi-bin/koha/newjmember.pl method=post>
 	<!--<input type=hidden name=joining value="">
 	<input type=hidden name=expiry value="">
-	<input type=hidden name=type value="borrowers">-->
-	<input type=hidden name=borrowernumber value="<TMPL_VAR NAME=member>">
+	<input type=hidden name=type value="emprunteurs">-->
+	<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
 	<input type=hidden name=updtype value=I>
-	<input type=hidden name=area value="<TMPL_VAR NAME=area>">
-	<input type=hidden name=city value="<TMPL_VAR NAME=city>">
-	<input type=hidden name=physstreet value="<TMPL_VAR NAME=physstreet>">
-	<input type=hidden name=streetaddress value="<TMPL_VAR NAME=streetaddress>">
-	<input type=hidden name=streetcity value="<TMPL_VAR NAME=streetcity>">
-	<input type=hidden name=phone value="<TMPL_VAR NAME=phone>">
-	<input type=hidden name=phoneday value="<TMPL_VAR NAME=phoneday>">
-	<input type=hidden name=faxnumber value="<TMPL_VAR NAME=faxnumber>">
-	<input type=hidden name=emailaddress value="<TMPL_VAR NAME=emailaddress>">
-	<input type=hidden name=contactname value="<TMPL_VAR NAME=contactname>">
-	<input type=hidden name=altphone value"<TMPL_VAR NAME=altphone>">
+	<input type=hidden name=area value="<!-- TMPL_VAR NAME=area -->">
+	<input type=hidden name=city value="<!-- TMPL_VAR NAME=city -->">
+	<input type=hidden name=physstreet value="<!-- TMPL_VAR NAME=physstreet -->">
+	<input type=hidden name=streetaddress value="<!-- TMPL_VAR NAME=streetaddress -->">
+	<input type=hidden name=streetcity value="<!-- TMPL_VAR NAME=streetcity -->">
+	<input type=hidden name=phone value="<!-- TMPL_VAR NAME=phone -->">
+	<input type=hidden name=phoneday value="<!-- TMPL_VAR NAME=phoneday -->">
+	<input type=hidden name=faxnumber value="<!-- TMPL_VAR NAME=faxnumber -->">
+	<input type=hidden name=emailaddress value="<!-- TMPL_VAR NAME=emailaddress -->">
+	<input type=hidden name=contactname value="<!-- TMPL_VAR NAME=contactname -->">
+	<input type=hidden name=altphone value"<!-- TMPL_VAR NAME=altphone -->">
 
 	<table border=0 cellspacing=0 cellpadding=5 >
 	<tr valign=top bgcolor="99cc33" >
-		<td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<B>PARENT OR TUTEUR </b>
+		<td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+			<B>PARENT OU TUTEUR </b>
 		</td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td>
 		<SELECT NAME="title" SIZE="1">
-			<OPTION value=" ">No Title
-			<TMPL_LOOP NAME=titleloop>
-			<OPTION value="<TMPL_VAR NAME=title>"<TMPL_VAR NAME=selected>><TMPL_VAR NAME=title>
-			</TMPL_LOOP>
+			<OPTION value=" ">Pas de Titre
+			<!-- TMPL_LOOP NAME=titleloop -->
+			<OPTION value="<!-- TMPL_VAR NAME=title -->"<!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=title -->
+			<!-- /TMPL_LOOP -->
 		</SELECT>
 		</td>
-		<td><input type=text name=firstname_guardian size=20 value="<TMPL_VAR NAME=firstname>"></td>
-		<td colspan=2><input type=text name=surname_guardian size=20 value="<TMPL_VAR NAME=surname>"></td>
-		<td><input type=text name=guardian_number size=20 value="<TMPL_VAR NAME=cardnumber>"></td>
+		<td><input type=text name=firstname_guardian size=20 value="<!-- TMPL_VAR NAME=firstname -->"></td>
+		<td colspan=2><input type=text name=surname_guardian size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
+		<td><input type=text name=guardian_number size=20 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td><FONT SIZE=2>Titre</FONT></td>
-		<td><FONT SIZE=2>Nom*</FONT></td>
-		<td colspan=2><FONT SIZE=2>Pr&eacute;nom*</FONT></td>
-		<td><FONT SIZE=2>N° de carte</FONT></td>
+		<td><FONT SIZE=2>Prénoms*</FONT></td>
+		<td colspan=2><FONT SIZE=2>Nom*</FONT></td>
+		<td><FONT SIZE=2>N° Lecteur.</FONT></td>
 	</tr>
-	<TMPL_LOOP NAME=cmemloop>
+	<!-- TMPL_LOOP NAME=cmemloop -->
 	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<B>ENFANT <TMPL_VAR NAME=count></b>
+		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+			<B>ENFANT <!-- TMPL_VAR NAME=count --></b>
 		</td>
 	</TR>
 	<TR>
 		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
-			<STRONG>Lecteur N° <TMPL_VAR NAME=cmember></STRONG>, <b>N° de carte*</b></STRONG>
+			<STRONG>N° Lecteur <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>N° Carte*</b></STRONG>
 		</TD>
 		<TD>
-			<input type=text name=cardnumber_child_<TMPL_VAR NAME=i> size=20 value="<TMPL_VAR NAME=jcardnumber>"><br>
-			<input type=hidden name=bornumber_child_<TMPL_VAR NAME=i> value="<TMPL_VAR NAME=cmember>">
+			<input type=text name=cardnumber_child_<!-- TMPL_VAR NAME=i --> size=20 value="<!-- TMPL_VAR NAME=jcardnumber -->"><br>
+			<input type=hidden name=bornumber_child_<!-- TMPL_VAR NAME=i --> value="<!-- TMPL_VAR NAME=cmember -->">
 		</td>
 	</TR>
 	<tr bgcolor=white>
-		<td><input type=text name=firstname_child_<TMPL_VAR NAME=i> size=20 value=""></td>
-		<td><input type=text name=surname_child_<TMPL_VAR NAME=i> size=20 value=""></td>
-		<td><input type=text name=dateofbirth_child_<TMPL_VAR NAME=i> size=10 value=""></TD>
+		<td><input type=text name=firstname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
+		<td><input type=text name=surname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
+		<td><input type=text name=dateofbirth_child_<!-- TMPL_VAR NAME=i --> size=10 value=""></TD>
 		<TD>
-			<input type="radio" name="sex_child_<TMPL_VAR NAME=i>" value="F"><b>F</b>
-			<input type="radio" name="sex_child_<TMPL_VAR NAME=i>" value="M"><b>M*</b>
+			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="F"><b>F</b>
+			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="M"><b>M*</b>
 		</td>
-		<TD align=right><input type=text name=school_child_<TMPL_VAR NAME=i> size=20 value=""></TD>
+		<TD align=right><input type=text name=school_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></TD>
 	</tr>
 	<tr valign=top bgcolor=white>
+		<td><FONT SIZE=2><b>Prénom*</b></FONT></td>
 		<td><FONT SIZE=2><b>Nom*</b></FONT></td>
-		<td><FONT SIZE=2><b>Pr&eacute;nom*</b></FONT></td>
-		<td><FONT SIZE=2><b>Date de naissance<BR>(<TMPL_VAR NAME=dateformat>)*</b></FONT></td>
+		<td><FONT SIZE=2><b>Date de Naissance<BR>(<!-- TMPL_VAR NAME=dateformat -->)*</b></FONT></td>
 		<td><FONT SIZE=2>&nbsp;</FONT></td>
 		<td><FONT SIZE=2>Ecole</FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td  COLSPAN=5><textarea name=altnotes_child_<TMPL_VAR NAME=i> wrap=physical cols=70 rows=3></textarea></td>
+		<td  COLSPAN=5><textarea name=altnotes_child_<!-- TMPL_VAR NAME=i --> wrap=physical cols=70 rows=3></textarea></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td><FONT SIZE=2>Notes</font></td>
 	</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	<tr valign=top bgcolor=white>
-		<td colspan=2 align="center"><input type=reset value="Clear all Fields"></td>
+		<td colspan=2 align="center"><input type=reset value="Effacer tous les champs"></td>
 		<td  COLSPAN=3 align="center">
-			<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" ALT="Add New Member" border=0>
+			<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" ALT="Ajouter un nouveau lecteur" border=0>
 		</td>
 	</tr>
 
@@ -94,4 +94,4 @@
 </form>
 
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl
index 6d3ad1c700..a34f75e4d0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl
@@ -1,23 +1,23 @@
 <HTML>
 
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<TMPL_IF NAME=newpassword>
-Cliquer <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=member>">Ici</a> Pour voir la fiche
+<!-- TMPL_IF NAME=newpassword -->
+Clic <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME=member -->">ici</a> voir la suite des informations Lecteur.
 
-<TMPL_ELSE>
-	<h2><TMPL_VAR NAME="title"> <TMPL_VAR NAME="othernames"> <TMPL_VAR NAME="surname">, <TMPL_VAR NAME="firstname"></h2>
+<!-- TMPL_ELSE -->
+	<h2><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></h2>
 	<form method=post>
-	<input type=hidden name=member value=<TMPL_VAR NAME=member>>
-	<TMPL_IF NAME="warn">
-		Cet identifiant existe d&eacute;ja. Entrez en un autre.<br>
-	</TMPL_IF>
-	Identifiant utilisateur : <input name=newuserid size=20 value=<TMPL_VAR NAME=userid>> <br>
-	Nouveau mot de passe : <input name=newpassword size=20 value=<TMPL_VAR NAME=defaultnewpassword>>
+	<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
+	<!-- TMPL_IF NAME="warn" -->
+		Vous avez entered a UserID that already exists.  Please choose another one.<br>
+	<!-- /TMPL_IF -->
+	Nouvel identifiant utilisateur: <input name=newuserid size=20 value=<!-- TMPL_VAR NAME=userid -->> <br>
+	Nouveau Mot de passe: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->>
 	<p>
-	<input type=submit value="Confirm Password">
+	<input type=submit value="Confirmer Mot de passe" class="button">
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl
index 37e33464e8..e02495701b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl
@@ -1,48 +1,48 @@
-<TMPL_INCLUDE NAME="members-top.inc">
-<FONT SIZE=6><em>Chercher un lecteur</em></FONT><br>
+<HTML>
+
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+
+<h1>Recherche Lecteur</h1><br>
 
 <form action="/cgi-bin/koha/member.pl" method=post>
-  <input type=text name="member" value="<TMPL_VAR NAME=member>">
-  <input type=reset name="reset" value="clr">
+  <input type=text name="member" value="<!-- TMPL_VAR NAME=member -->">
+  <input type=reset name="reset" value="effacer">
 </form>
 
-Votre recherche <TMPL_VAR NAME=member>
-<p>
-<table cellpadding=0 cellspacing=0 width=100%>
+Votre recherche sur <!-- TMPL_VAR NAME=member --><p>
+<table>
   <tr bgcolor="#99cc33">
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Carte</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Pr&eacute;nom</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Nom</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Cat&eacute;gorie</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Adresse</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>OD/Issues</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Amendes</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Remarques</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Carte</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Nom</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Prénom</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Catégorie</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Adresse</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>OD/Prêts</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Frais</b></td>
+    <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Notes</b></td>
   </tr>
-
-  <TMPL_LOOP NAME=resultsloop>
-    <TMPL_IF NAME="background">
+  
+  <!-- TMPL_LOOP NAME=resultsloop -->
+    <!-- TMPL_IF NAME="background" -->
     <TR bgcolor="#ffffcc">
-    <TMPL_ELSE>
+    <!-- TMPL_ELSE -->
     <TR bgcolor=white>
-    </TMPL_IF>
-      <td><TMPL_VAR NAME=cardnumber></td>
-      <td><a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=borrowernumber>"><TMPL_VAR NAME=surname></a></td>
-      <td><TMPL_VAR NAME=firstname></td>
-      <td><TMPL_VAR NAME=categorycode></td>
-      <td><TMPL_VAR NAME=streetaddress> <TMPL_VAR NAME=city></td>
-      <td><TMPL_VAR NAME=odissue></td>
-      <td><TMPL_VAR NAME=fines></td>
-      <td><TMPL_VAR NAME=borrowernotes></td>
+    <!-- /TMPL_IF -->
+      <td><!-- TMPL_VAR NAME=cardnumber --></td>
+      <td><a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME=borrowernumber -->"><!-- TMPL_VAR NAME=surname --></td>
+      <td><!-- TMPL_VAR NAME=firstname --></a></td>
+      <td><!-- TMPL_VAR NAME=categorycode --></td>
+      <td><!-- TMPL_VAR NAME=streetaddress --> <!-- TMPL_VAR NAME=city --></td>
+      <td><!-- TMPL_VAR NAME=odissue --></td>
+      <td><!-- TMPL_VAR NAME=fines --></td>
+      <td><!-- TMPL_VAR NAME=borrowernotes --></td>
     </tr>
-  </TMPL_LOOP>
+  <!-- /TMPL_LOOP -->
 </table>
 
 <form action=/cgi-bin/koha/simpleredirect.pl method=post>
-<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png"  ALT="Ajout de lecteur" BORDER=0 ></a>
-<INPUT TYPE="radio" name="chooseform" value="adult" checked>
-  Adulte
-  <INPUT TYPE="radio" name="chooseform" value="organization" >
-  Organisme
+<input type=submit class="button" value="Ajouter un lecteur" title="Ajouter un lecteur" alt="Ajouter un lecteur">
+<INPUT TYPE="radio" name="chooseform" value="adult" checked>Adulte
+<INPUT TYPE="radio" name="chooseform" value="organisation" >Organisation
 </form>
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
index bdb46a885d..9741fcf68b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
@@ -1,203 +1,211 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<h1><TMPL_VAR NAME=header></h1><br>
+<!-- TMPL_IF NAME=addAction -->
+<h1>
+	Ajouter un lecteur
+</h1>
+<!-- TMPL_ELSE -->
+<h1>
+	Mise à jour du lecteur
+</h1>
+<!-- /TMPL_IF -->
+<br>
 
 <form action=/cgi-bin/koha/newmember.pl method=post>
-	<input type=hidden name=joining value="<TMPL_VAR NAME=dateenrolled>">
-	<input type=hidden name=expiry value="<TMPL_VAR NAME=expiry>">
-	<input type=hidden name=type value="borrowers">
-	<input type=hidden name=borrowernumber value="<TMPL_VAR NAME=member>">
-	<input type=hidden name=updtype value="<TMPL_VAR NAME=updtype>">
+	<input type=hidden name=joining value="<!-- TMPL_VAR NAME=dateenrolled -->">
+	<input type=hidden name=expiry value="<!-- TMPL_VAR NAME=expiry -->">
+	<input type=hidden name=type value="emprunteurs">
+	<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
+	<input type=hidden name=updtype value="<!-- TMPL_VAR NAME=updtype -->">
 
 	<table border=0 cellspacing=0 cellpadding=5 >
+
 	<tr valign=top>
-		<td COLSPAN=2>
-		<input type=reset value="Effacer tous les champs">
-		</td>
-		<td COLSPAN=3 ALIGN=RIGHT>
-			<font size="4" face="arial,helvetica">N&deg; de lecteur<TMPL_VAR NAME=member>, N&deg; de carte*
-			<input type=text name=cardnumber size=10 value="<TMPL_VAR NAME=cardnumber>">
-			<br>
-			</font>
-		</td>
+		<td COLSPAN=2><input type=reset value="Effacer tous les champs"></td>
+		<td COLSPAN=3 ALIGN=RIGHT><font size=4 face='arial,helvetica'>N° Lecteur <!-- TMPL_VAR NAME=member -->, N° Carte* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"><br></td>
 	</tr>
+
 	<tr valign=top>
-		<td COLSPAN=3 background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>DETAILS PERSONNELS LECTEUR</b></td>
-		<td COLSPAN=2 ALIGN=RIGHT background="<TMPL_VAR name="themelang">/images/background-mem.gif">*
-			<input type="radio" name="sex" value="F" <TMPL_IF NAME=female>checked</TMPL_IF>>F
-			<input type="radio" name="sex" value="M" <TMPL_UNLESS NAME=female>checked</TMPL_UNLESS>> M <B>Date de naissance</B> (jj/mm/aa)
-			<input type=text name=dateofbirth size=10 value="<TMPL_VAR NAME=dateofbirth>">
+		<td COLSPAN=3 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>DETAILS LECTEUR</b></td>
+		<td COLSPAN=2 ALIGN=RIGHT background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">*
+		<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME=female --> checked<!-- /TMPL_IF -->>F
+		<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME=female --> checked<!-- /TMPL_UNLESS -->> M
+		&nbsp; &nbsp;  <B>Date de Naissance</B> (<!-- TMPL_VAR NAME=dateformat -->)
+		<input type=text name=dateofbirth size=10 value="<!-- TMPL_VAR NAME=dateofbirth -->">
 		</td>
 	</tr>
 
 	<tr valign=top bgcolor=white>
 		<td><FONT SIZE=2>Titre</FONT></td>
 		<td><FONT SIZE=2>Initiales</FONT></td>
-		<td><font size="2">Pr&eacute;noms*</font></td>
-		<td><font size="2">Nom*</font></td>
-		<td><font size="2">Nom d'usage</font></td>
+		<td><FONT SIZE=2><b> Prénoms*</b></FONT></td>
+		<td><FONT SIZE=2><b> Nom*</b></FONT></td>
+		<td><FONT SIZE=2> Nom d'usage</FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td><TMPL_VAR name="Mr">
+		<td><!-- TMPL_VAR name="Mr" -->
 		<SELECT NAME="title">
-			<option<TMPL_VAR name="title_selected_ "> value=" ">Aucun</option>
-			<option value="Miss"<TMPL_VAR name="title_Mlle">>Mlle</option>
-			<option value="Mrs"<TMPL_VAR name="title_Mme">>Mme</option>
-			<option <TMPL_VAR name="title_M"> value="M" >M</option>
-			<option value="Dr" <TMPL_VAR name="title_Dr">>Dr</option>
+			<option<!-- TMPL_VAR name="title_selected_ " --> value=" ">Pas de Titre</option>
+			<option value="Miss"<!-- TMPL_VAR name="title_Miss" -->>Miss</option>
+			<option value="Mrs"<!-- TMPL_VAR name="title_Mrs" -->>Mrs</option>
+			<option value="Ms"<!-- TMPL_VAR name="title_Ms" -->>Ms</option>
+			<option <!-- TMPL_VAR name="title_Mr" --> value="Mr" >Mr</option>
+			<option value="Dr" <!-- TMPL_VAR name="title_Dr" -->>Dr</option>
+			<option value="Sir" <!-- TMPL_VAR name="title_Sir" -->>Sir</option>
 		</SELECT>
 		</td>
-		<td>
-		<input type=text name=initials size=5 value="<TMPL_VAR NAME=initials>">
-		</td>
-		<td>
-		<input type=text name=firstname size=20 value="<TMPL_VAR NAME=firstname>">
-		</td>
-		<td>
-		<input type=text name=surname size=20 value="<TMPL_VAR NAME=surname>">
-		</td>
-		<td>
-		<input type=text name=othernames size=20 value="<TMPL_VAR NAME=othernames>">
-		</td>
+		<td><input type=text name=initials size=5 value="<!-- TMPL_VAR NAME=initials -->"></td>
+		<td><input type=text name=firstname size=20 value="<!-- TMPL_VAR NAME=firstname -->"></td>
+		<td><input type=text name=surname size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
+		<td><input type=text name=othernames size=20 value="<!-- TMPL_VAR NAME=othernames -->"></td>
 	</tr>
 
-	<tr valign=top bgcolor=white> <TMPL_IF NAME=ethcatpopup><TMPL_VAR NAME=ethcatpopup>
-		<td colspan=2>&nbsp;</td>
-		<td colspan=2>&nbsp;</td>
-		<TMPL_ELSE>
-		<td colspan=2>&nbsp;</td>
-		<td colspan=2>&nbsp;</td>
-		</TMPL_IF>
-		<td><font size="2">Cat&eacute;gorie d'utilisateur*</font></td>
+
+	<tr valign=top bgcolor=white>
+		<!-- TMPL_IF NAME=ethcatpopup --><!-- TMPL_VAR NAME=ethcatpopup -->
+		<td colspan=2><FONT SIZE=2>Appartenance éthnique</FONT></td>
+		<td colspan=2><FONT SIZE=2>Notes appartenance ethnique</FONT></td>
+		<!-- TMPL_ELSE -->
+		<td colspan=2>&nbsp;</td><td colspan=2>&nbsp;</td>
+		<!-- /TMPL_IF -->
+		<td><FONT SIZE=2><b>Catégorie Lecteur*</b></FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td colspan=4>
-			<TMPL_VAR NAME=catcodepopup></td>
+		<td colspan=2>
+			<!-- TMPL_IF name="ethcatpopup" -->
+				<select name="ethnicity" size=1>
+					<!-- TMPL_LOOP NAME=ethnicityloop -->
+					<option value=<!-- TMPL_VAR NAME=value --><!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=label -->
+					<!-- /TMPL_LOOP -->
+				</select>
+			<!-- /TMPL_IF -->
+			</td>
+			<!-- TMPL_IF NAME=ethcatpopup --><!-- TMPL_VAR NAME=ethcatpopup -->
+			<td colspan=2><input type=text name=ethnicnotes size=40 ></td>
+			<!-- TMPL_ELSE -->
+			<td colspan=2>&nbsp;</td>
+			<!-- /TMPL_IF -->
+		<td><!-- TMPL_VAR NAME=catcodepopup --></td>
 	</tr>
 
+
 	<tr valign=top bgcolor="99cc33" >
-		<td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>ADRESSE DU LECTEUR</b></td>
+		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>ADRESSE LECTEUR</b></td>
 	</tr>
 
 	<tr valign=top bgcolor=white>
 		<td  COLSPAN=3><FONT SIZE=2><b>Adresse postale*</b></FONT></td>
-		<td><FONT SIZE=2><b>CP /Ville*</b></FONT></td>
-		<td><FONT SIZE=2>Annexe rattachement</FONT></td>
+		<td><FONT SIZE=2><b>Code postal / Localité*</b></FONT></td>
+		<td><FONT SIZE=2>Annexe d'inscription</FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=3><input type=text name=address size=40 value="<TMPL_VAR NAME=address>"></td>
+		<td COLSPAN=3><input type=text name=address size=40 value="<!-- TMPL_VAR NAME=address -->"></td>
 		<td>
-			<input type=text name="zipcode" size=20 value="<TMPL_VAR NAME="zipcode">"><br />
-			<input type=text name=city size=20 value="<TMPL_VAR NAME=city>">
+			<input type=text name="zipcode" size=20 value="<!-- TMPL_VAR NAME="zipcode" -->"><br />
+			<input type=text name=city size=20 value="<!-- TMPL_VAR NAME=city -->">
 		</td>
 		<td>
-			<TMPL_VAR name="CGIbranch">
+			<!-- TMPL_VAR name="CGIbranch" -->
 		</td>
 	</tr>
 
+
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=3><FONT SIZE=2>Autre adresse</FONT></td>
-		<td><FONT SIZE=2>CP / Ville</FONT></td>
+		<td COLSPAN=3><FONT SIZE=2>Adresse si différente</FONT></td>
+		<td><FONT SIZE=2>Code postal / Localité</FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=3><input type=text name=streetaddress size=40 value="<TMPL_VAR NAME=streetaddress>"></td>
+		<td COLSPAN=3><input type=text name=streetaddress size=40 value="<!-- TMPL_VAR NAME=streetaddress -->"></td>
 		<td>
-			<input type=text name="homezipcode" size=20 value="<TMPL_VAR NAME="homezipcode">"></br/>
-			<input type=text name=streetcity size=20 value="<TMPL_VAR NAME=streetcity>"></td>
+			<input type=text name="homezipcode" size=20 value="<!-- TMPL_VAR NAME="homezipcode" -->"></br/>
+			<input type=text name=streetcity size=20 value="<!-- TMPL_VAR NAME=streetcity -->"></td>
 	</tr>
 
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>CONTACTER LE LECTEUR</b></td>
+	<tr valign=top bgcolor=white>
+		<td COLSPAN=2 ><FONT SIZE=2>Téléphone personnel</td>
+		<td><FONT SIZE=2>Fax</td>
+		<td><FONT SIZE=2>E-mail</td>
+		<td><FONT SIZE=2>Ecriture d'un texte</td>
 	</tr>
+	<tr valign=top bgcolor=white>
+		<td COLSPAN=2><input type=text name=phone size=20 value="<!-- TMPL_VAR NAME=phone -->"></td>
+		<td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR NAME=faxnumber -->"></td>
+		<td><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR NAME=emailaddress -->"></td>
+		<td><input type=text name=textmessaging size=20 value="<!-- TMPL_VAR NAME=textmessaging -->"></td>
+	</tr>
+
 
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><font size="2">T&eacute;l&eacute;phone personnel</font></td>
-		<td><font size="2">T&eacute;l&eacute;phone professionnel</font></td>
-		<td><FONT SIZE=2>Fax</font></td>
-		<td><FONT SIZE=2>Email</font></td>
+		<td COLSPAN=2 ><FONT SIZE=2>Téléphone professionnel</td>
+		<td></td>
+		<td></td>
+		<td></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=2>
-		<input type=text name=phone size=20 value="<TMPL_VAR NAME=phone>">
-		</td>
-		<td>
-		<input type=text name=phoneday size=20 value="<TMPL_VAR NAME=phoneday>">
-		</td>
-		<td>
-		<input type=text name=faxnumber size=20 value="<TMPL_VAR NAME=faxnumber>">
-		</td>
-		<td>
-		<input type=text name=emailaddress size=20 value="<TMPL_VAR NAME=emailaddress>">
-		</td>
-		<td>
-		<input type=text name=textmessaging size=20 value="<TMPL_VAR NAME=textmessaging>">
-		</td>
+		<td COLSPAN=2><input type=text name=phoneday size=20 value="<!-- TMPL_VAR NAME=phoneday -->"></td>
+		<td></td>
+		<td></td>
+		<td></td>
 	</tr>
 
+
 	<tr valign=top bgcolor="99cc33">
-		<td  COLSPAN=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>AUTRE CONTACT</b></td>
+		<td  COLSPAN=5  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>AUTRE CONTACT</b></td>
 	</tr>
 
 	<tr valign=top bgcolor=white>
-		<td   COLSPAN=3 ><FONT SIZE=2>Nom*</font></td>
-		<td><font size="2">T&eacute;l&eacute;phone</font></td>
-		<td><FONT SIZE=2>Relation avec le lecteur*</font></td>
+		<td   COLSPAN=3 ><FONT SIZE=2><b> Nom*</b></td>
+		<td><FONT SIZE=2>Téléphone</td>
+		<td><FONT SIZE=2><b>Relation*</b></td>
 	</tr>
 	<tr valign=top bgcolor=white>
-		<td COLSPAN=3 >
-		<input type=text name=contactname size=40 value="<TMPL_VAR NAME=contactname>">
-		</td>
-		<td>
-		<input type=text name=altphone size=20 value="<TMPL_VAR NAME=altphone>">
-		</td>
+		<td COLSPAN=3 ><input type=text name=contactname size=40 value="<!-- TMPL_VAR NAME=contactname -->"></td>
+		<td><input type=text name=altphone size=20 value="<!-- TMPL_VAR NAME=altphone -->"></td>
 		<td>
 		<select name=altrelationship size=1>
-			<TMPL_LOOP NAME=relshiploop>
-			<OPTION <TMPL_VAR NAME=selected>><TMPL_VAR NAME=relationship>
-			</TMPL_LOOP>
+		<!-- TMPL_LOOP NAME=relshiploop -->
+			<OPTION <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=relationship -->
+		<!-- /TMPL_LOOP -->
 		</select>
 		</td>
 	</tr>
 
 	<tr valign=top bgcolor=white>
-		<td><font size="2">Remarques</font></td>
-		<td COLSPAN=4>
-		<textarea name=altnotes wrap=physical cols=70 rows=3><TMPL_VAR NAME=altnotes></textarea>
-		</td>
+		<td><FONT SIZE=2> Notes</font></td>
+		<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=altnotes --></textarea></td>
 	</tr>
 
+
 	<tr valign=top bgcolor="99cc33">
-		<td  COLSPAN=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>UTILISATION DE
-		LA BIBLIOTHEQUE</B></td>
+		<td  COLSPAN=5  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>UTILISATION BIBLIOTHEQUE</B></td>
 	</tr>
+
 	<tr valign=top >
-		<td><font size="2">Remarques</font></td>
-		<td COLSPAN=4>
-		<textarea name=borrowernotes wrap=physical cols=70 rows=3><TMPL_VAR NAME=borrowernotes></textarea>
-		</td>
-	</tr>
-	<tr>
-		<td>&nbsp; </TD>
-	</TR>
-	<TMPL_IF NAME=modify>
-	<tr>
-		<td COLSPAN=5><Font size=2>Indicateurs</font></td>
-	</tr>
-	<TMPL_LOOP NAME=flagloop>
-	<tr>
-		<td COLSPAN=2><TMPL_VAR NAME=html></td>
-		<td COLSPAN=3>
-		<input type=radio name="<TMPL_VAR NAME=name>" value="1" <TMPL_VAR NAME=yes>>Oui
-		<input type=radio name="<TMPL_VAR NAME=name>" value="0" <TMPL_VAR NAME=no>>Non </td>
+		<td><FONT SIZE=2> Notes</font></td>
+		<td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=borrowernotes --></textarea></td>
 	</tr>
-	</TMPL_LOOP> </TMPL_IF>
+
+	<!-- TMPL_IF NAME=modifier -->
+		<tr><td COLSPAN=5><Font size=2>DRAPEAUX</font></td></tr>
+		<!-- TMPL_LOOP NAME=flagloop -->
+		<tr>
+			<td COLSPAN=2><!-- TMPL_VAR NAME=html --></td>
+			<td COLSPAN=3><input type=radio name="<!-- TMPL_VAR NAME=name -->" value="1" <!-- TMPL_VAR NAME=oui -->>Oui
+			<input type=radio name="<!-- TMPL_VAR NAME=name -->" value="0" <!-- TMPL_VAR NAME=no -->>Non
+			</td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_IF -->
+
+
 	<tr>
 		<td></td>
 		<td>
-			<input type=hidden name=type value=<TMPL_VAR NAME="type">>
-			<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" ALT="Add New Member" border=0 ></td>
+			<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
+			<input type="submit" value="Enregistrer" class="button">
+		</td>
 	</tr>
-
 	</table>
 </form>
-<TMPL_INCLUDE NAME="members-bottom.inc">
+
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl
index c1af643ab4..5fd9fb4573 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl
@@ -1,28 +1,26 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<FONT SIZE=6><em>Lecteurs</em></FONT>
-<P>
-<table border=1 cellspacing=0 cellpadding=5 width="100%">
+<h1>Lecteurs</h1><P>
+
+
+<table border=1 cellspacing=0 cellpadding=10 height="100" >
 <tr VALIGN=TOP  >
-<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><FORM ACTION="/cgi-bin/koha/member.pl" method=post>
-        <FONT SIZE=4> <b>Chercher un lecteur</b></FONT>
-          <INPUT TYPE="text" size=50 name=member >
-          <BR>
-          Pour renouveler un utilisateur, voir, ajouter, modifier ou effacer des
-          enregistrements :<BR>
-          Entrez le nom d'un emprunteur ou une partie du nom ou bien son N&deg;
-          dans le champ ci dessus et tapez Entr&eacute;e </p>
-        </form></td><tr>
+<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><FORM ACTION="/cgi-bin/koha/member.pl" method=post><FONT SIZE=4>
+<b>Recherche Lecteur</B>
+</FONT>
+<INPUT TYPE="text" size=50 name=member >
+<p>Renouveler des ouvrages, voir ajouter, modifier et supprimer des lecteurs, tout commence par cette recherche. Saisir le numéro de carte ou le début du nom d'un lecteur</p>
+</td></form><tr>
 </table>
 
 <P>
 
-
-<table border=1 cellspacing=0 cellpadding=5 width="100%">
+<table border=1 cellspacing=0 cellpadding=10 height="100" >
 <tr VALIGN=TOP  >
-    <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><FONT SIZE=4>
-      <b>Parcourir la liste des lecteurs</B></FONT> </td>
-  <tr>
+<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><FONT SIZE=4>
+<b>Feuilleter les lecteurs</B> 
+</FONT>
+</td></form><tr>
 <TR VALIGN=TOP>
 <TD><CENTER><B>
 <A HREF="/cgi-bin/koha/member.pl?member=a">A</a> ||
@@ -53,21 +51,7 @@
 <A HREF="/cgi-bin/koha/member.pl?member=z">Z</a>
 
 </B>
-</center></TD></TR></TABLE>
-<br>
-<table border=1 cellspacing=0 cellpadding=5 width="100%">
-<tr VALIGN=TOP  >
-    <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><FONT SIZE=4>
-      <b>Ajouter un lecteur</B></FONT> </td>
-  <tr>
-<TR VALIGN=TOP>
-<TD>
-<form action=/cgi-bin/koha/simpleredirect.pl method=post>
-<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png"  ALT="Ajout de lecteur" BORDER=0 ></a>
-<INPUT TYPE="radio" name="chooseform" value="adult" checked>
-  Particulier
-  <INPUT TYPE="radio" name="chooseform" value="organization" >
-  Organisme/Entreprise
-</form>
-</td></tr></table>
-<TMPL_INCLUDE NAME="members-bottom.inc">
+</TD></TR></TABLE>
+
+<P>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
index e6429356ee..e3669ff25c 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
@@ -1,126 +1,125 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <!-- main site -->
-<h1><TMPL_VAR NAME=firstname> <TMPL_VAR NAME=surname></h1><P>
+
+
+<h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1><P>
 <p>
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=270>
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>MEMBERSHIP RECORD</TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>FICHE LECTEUR</TD>
 	</TR>
 
 	<tr VALIGN=TOP  >
 	<TD>
-		<br>
-		<FONT SIZE=2  face="arial, helvetica"><TMPL_VAR NAME="title"> <TMPL_VAR NAME="othernames"> <TMPL_VAR NAME="surname"> <TMPL_IF name="IS_ADULT">(<TMPL_VAR NAME="firstname">, <TMPL_VAR NAME="initials">)</TMPL_IF><p>
-		N&deg; de carte: <TMPL_VAR NAME="cardnumber"><BR>
-		Adresse postale: <TMPL_VAR NAME="streetaddress">, <TMPL_VAR name="zipcode"> <TMPL_VAR NAME="city"><BR>
-		<TMPL_UNLESS name="I">Adresse personnelle : <TMPL_VAR NAME="physstreet">, <TMPL_VAR name="homezipcode"> <TMPL_VAR NAME="streetcity"><BR>
-		T&eacute;l&eacute;phone personnel : <TMPL_VAR NAME="phone"><BR></TMPL_UNLESS>
-		T&eacute;l&eacute;phone professionnel : <TMPL_VAR NAME="phoneday"><BR>
-		Fax: <TMPL_VAR NAME="faxnumber"><BR>
-		E-mail: <a href="mailto:<TMPL_VAR NAME="emailaddress">"><TMPL_VAR NAME="emailaddress"></a><br>
-		SMS: <TMPL_VAR NAME="textmessaging"><p>
-		N&deg; de lecteur: <TMPL_VAR NAME="borrowernumber"><BR>
-		Inscription : <TMPL_VAR NAME="categorycode"><BR>
-		Zone : <TMPL_VAR NAME="dateenrolled">,  Expires: <TMPL_VAR NAME="expiry"><BR>
-		Biblioth&egrave;que de rattachement : <TMPL_VAR NAME="branchcode"><P>
-		<TMPL_IF NAME="printethnicityline">
-			Ethnie : <TMPL_VAR NAME="ethnicity">, <TMPL_VAR NAME="ethnotes"><br>
-		</TMPL_IF>
-		<TMPL_UNLESS name="I">
-			Date de naissance :<TMPL_VAR NAME="dateofbirth"><BR>
-			Sexe : <TMPL_VAR NAME="sex"><P>
-			Autre </TMPL_UNLESS> contact : <TMPL_VAR NAME="contactname"><BR>
-			T&eacute;l&eacute;phone : <TMPL_VAR NAME="altphone"><BR>
-			Relation avec le lecteur: : <TMPL_VAR NAME="altrelationship"><BR>
-		<TMPL_UNLESS name="I">
-		</TMPL_UNLESS>
-		Remarques : <TMPL_VAR NAME="altnotes"><P>
-		<TMPL_UNLESS name="I">
-			<TMPL_IF NAME="isguarantee">
-				Caution pour : <br><TMPL_LOOP NAME="guaranteeloop"><A HREF="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME="borrowernumber">"><TMPL_VAR NAME=name> - <TMPL_VAR NAME="cardnumber"></a><br></TMPL_LOOP>
-			<TMPL_ELSE>
-				Cautionné par :
-				<TMPL_IF NAME="guarantorborrowernumber">
-					<A HREF="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME="guarantorborrowernumber">"><TMPL_VAR NAME="guarantorcardnumber"></a><br>
-				<TMPL_ELSE>
-					Pas de caution<br>
-				</TMPL_IF>
-			</TMPL_IF>
-		</TMPL_UNLESS>
+		<FONT SIZE=2  face="arial, helvetica"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF --><p>
+		N° Carte: <!-- TMPL_VAR NAME="cardnumber" --><BR>
+		Adresse postale: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><BR>
+		<!-- TMPL_UNLESS name="I" -->Adresse privée: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><BR>
+		Téléphone personnel: <!-- TMPL_VAR NAME="phone" --><BR><!-- /TMPL_UNLESS -->
+		Téléphone professionnel: <!-- TMPL_VAR NAME="phoneday" --><BR>
+		Fax: <!-- TMPL_VAR NAME="faxnumber" --><BR>
+		E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
+		Ecriture d'un texte: <!-- TMPL_VAR NAME="textmessaging" --><p>
+		N° Lecteur: <!-- TMPL_VAR NAME="borrowernumber" --><BR>
+		Catégorie Lecteur: <!-- TMPL_VAR NAME="categorycode" --><BR>
+		Frais:$30/année, Payé<BR>
+		Joined: <!-- TMPL_VAR NAME="dateenrolled" -->,  Expires: <!-- TMPL_VAR NAME="expiry" --><BR>
+		Annexe d'inscription: <!-- TMPL_VAR NAME="branchcode" --><P>
+		<!-- TMPL_IF NAME="printethnicityline" -->
+			Appartenance éthnique: <!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_UNLESS name="I" -->
+			né le: <!-- TMPL_VAR NAME="dateofbirth" --><BR>
+			Sexe: <!-- TMPL_VAR NAME="sex" --><P>
+			Alternative<!-- /TMPL_UNLESS --> Contact: <!-- TMPL_VAR NAME="contactname" --><BR>
+		Téléphone: <!-- TMPL_VAR NAME="altphone" --><BR>
+		<!-- TMPL_UNLESS name="I" -->
+			Relation: <!-- TMPL_VAR NAME="altrelationship" --><BR>
+		<!-- /TMPL_UNLESS -->
+		Notes: <!-- TMPL_VAR NAME="altnotes" --><P>
+		<!-- TMPL_UNLESS name="I" -->
+			<!-- TMPL_IF NAME="isguarantee" -->
+				Garanties:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><A HREF="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
+			<!-- TMPL_ELSE -->
+				Garant:
+				<!-- TMPL_IF NAME="guarantorborrowernumber" -->
+					<A HREF="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a><br>
+				<!-- TMPL_ELSE -->
+					pas de garant<br>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_IF -->
+		<!-- /TMPL_UNLESS -->
 		<P>
-		Remarques g&eacute;n&eacute;rales :
-		<TMPL_VAR NAME="borrowernotes"><!--</a>-->
+		Notes générales: <!--<A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to et delete notes.'); return false">-->
+		<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
 		<p align=right>
 		</font>
-		<TMPL_IF name="I">
+		<!-- TMPL_IF name="IS_ADULT" -->
+			<p align=right>
+			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
+				<INPUT TYPE="submit" name="submit" VALUE="Ajouter un enfant" class="button" alt="Ajouter un enfant">
+				<input type=hidden name=type value=Add>
+				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
+			</form>
+			</P>
+		<!-- /TMPL_IF -->
+		<br>
+		<!-- TMPL_IF name="I" -->
 			<form action=/cgi-bin/koha/imemberentry.pl method=post>
-				<input type=hidden name=bornum value="<TMPL_VAR NAME="bornum">">
+				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
 				<INPUT TYPE=submit class="button" value="Modifier">
 			</form>
-		<TMPL_ELSE>
+		<!-- TMPL_ELSE -->
 			<form action=/cgi-bin/koha/memberentry.pl method=post>
-				<input type=hidden name=bornum value="<TMPL_VAR NAME="bornum">">
-				<INPUT TYPE=submit class="button" value="Modifier">
+				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
+				<INPUT TYPE=submit class="button" name="modifier" value="Modifier">
 			</form>
-		</TMPL_IF>
+		<!-- /TMPL_IF -->
 		<form action="javascript:confirm_deletion()">
-                        <input type=hidden name=member value="<TMPL_VAR NAME="bornum">">
-			<INPUT TYPE=submit class="button" value="Supprimer">
+                        <input type=hidden name=member value="<!-- TMPL_VAR NAME="bornum" -->">
+			<INPUT TYPE=submit class="button" value="Delete">
 		</form>
 		<form action=/cgi-bin/koha/member-password.pl method=post>
-			<input type=hidden name=member value=<TMPL_VAR NAME=bornum>>
-			<input type=submit class="button"  name="modify" value="Changer identifiant web">
+			<input type=hidden name=member value=<!-- TMPL_VAR NAME=bornum -->>
+			<input type=submit class="button" value="Changer Mot de passe">
 		</form>
 		<form action=/cgi-bin/koha/member-flags.pl method=post>
-			<input type=hidden name=member value=<TMPL_VAR NAME=bornum>>
-			<input type=submit class="button" value="Modifier autorisations">
+			<input type=hidden name=member value=<!-- TMPL_VAR NAME=bornum -->>
+			<input type=submit class="button" value="Modifier habilitations">
 		</form>
-		<TMPL_IF name="IS_ADULT">
-			<p align=right>
-			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
-				<INPUT TYPE="submit" name="submit" VALUE="Ajouter enfant" class="button" alt="Ajouter enfant">
-				<input type=hidden name=type value=Add>
-				<input type=hidden name=bornum value="<TMPL_VAR NAME=borrowernumber>">
-			</form>
-			</P>
-		</TMPL_IF>
 
 	</TD>
 	</TR>
 </TABLE>
 
-<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=16 height=800 align=left>
+<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=16 height=800 align=left>
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=4><B>AMENDES & FRAIS</TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>AMENDES & FRAIS</TD>
 	</TR>
-
-	<TMPL_LOOP NAME=accountloop>
-		<TMPL_IF NAME=amountoutstanding>
-		<tr VALIGN=TOP>
-			<td><TMPL_VAR NAME="date"></td>
-			<td>
-				<TMPL_IF NAME=biblionumber>
-				<a href="/cgi-bin/koha/moredetail.pl?itemnumber=<TMPL_VAR NAME="itemnumber">&bib=<TMPL_VAR NAME="blionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">"><TMPL_VAR NAME="description"> <TMPL_VAR NAME="title"></a>
-				<TMPL_ELSE>
-				&nbsp;
-				</TMPL_IF>
-			</td>
-			<td><TMPL_VAR NAME="amount"></td>
-			<td><TMPL_VAR NAME="amountoutstanding"></td>
+	<!-- TMPL_IF name="totaldue" -->
+		<tr valign="top">
+			<td>Total dû</td>
+			<td><!-- TMPL_VAR name="totaldue"--></td>
 		</tr>
-		</TMPL_IF>
-	</TMPL_LOOP>
-
+	<!-- TMPL_ELSE -->
+		<tr valign="top">
+			<td colspan=2>Pas de dettes</td>
+		</tr>
+	<!-- /TMPL_IF -->
 	<tr VALIGN=TOP  >
-	<TD colspan=3 align=right>
+	<TD colspan=2 align=right>
 		<p>
 			<br>
-			<a class="button" href=/cgi-bin/koha/boraccount.pl?bornum=<TMPL_VAR NAME="bornum">>Compte</a>
-			<a class="button" href=/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR NAME="bornum">>Payer</a>
+			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+				View Account
+			</a>
+			<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+				Pay Fines
+			</a>
 			<br><br>
 		</p>
 	</td>
@@ -129,47 +128,47 @@
 
 <p>
 <form action="renewscript.pl" method=post>
-	<input type="hidden" name="bornum" value="<TMPL_VAR name="bornum">">
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
 	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=6><B>EN COURS DE PRET</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=6><B>OUVRAGES ACTUELLEMENT EN PRET</b></TD>
 	</TR>
 
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Titre</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Retour</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Type de doc</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Frais</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Renouvellement</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Titre</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Dû</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Itemtype</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Frais</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Renouveler</b></TD>
 	</TR>
 
-	<TMPL_LOOP NAME=issueloop>
+	<!-- TMPL_LOOP NAME=issueloop -->
 	<tr VALIGN=TOP>
-		<td><TMPL_IF NAME=red><font color=red></TMPL_IF>
-		<TMPL_VAR NAME="title">
-		<a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR NAME="itemnumber">&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">">
-			<TMPL_VAR NAME="barcode">
+		<td><!-- TMPL_IF NAME=red --><font color=red><!-- /TMPL_IF -->
+		<!-- TMPL_VAR NAME="title" -->
+		<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+			<!-- TMPL_VAR NAME="barcode" -->
 		</a>
 		</td>
-		<td><TMPL_VAR NAME="date_due"></td>
-		<td><TMPL_VAR NAME="itemtype"></td>
-		<td><TMPL_VAR NAME="charge"></td>
+		<td><!-- TMPL_VAR NAME="date_due" --></td>
+		<td><!-- TMPL_VAR NAME="itemtype" --></td>
+		<td><!-- TMPL_VAR NAME="charge" --></td>
 		<td>
-		<TMPL_IF NAME=norenew>
-			<a href="/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">">R&eacute;serv&eacute; - Pas de renouvellement</a>
-		<TMPL_ELSE>
-			<input type=radio name="renew_item_<TMPL_VAR NAME="itemnumber">" value=y>O
-			<input type=radio name="renew_item_<TMPL_VAR NAME="itemnumber">" value=n>N
-		</TMPL_IF>
-		<TMPL_IF NAME=red></font></TMPL_IF>
+		<!-- TMPL_IF NAME=norenew -->
+			<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
+		<!-- TMPL_ELSE -->
+			<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=y>Y
+			<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=n>N
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
 		</td>
 	</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 
 	<tr VALIGN=TOP  >
 		<TD colspan=5 align=right>
-		<INPUT TYPE=submit class="button" VALUE="Mise à jour">
+		<INPUT TYPE=submit class="button" VALUE="Renouveler Ouvrages">
 		</td>
 	</tr>
 
@@ -180,59 +179,61 @@
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=5><B>DOCUMENTS DEMANDES</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=5><B>OUVRAGES RESERVES</b></TD>
 	</TR>
 
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Titre</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Demande</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Supprimer</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Titre</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Reservé</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Enlever</b></TD>
 	</TR>
 
 	<form action=/cgi-bin/koha/modrequest.pl method=post>
-	<input type=hidden name=from value=borrower>
+	<input type=hidden name=from value=emprunteur>
 
-	<TMPL_LOOP NAME=reserveloop>
+	<!-- TMPL_LOOP NAME=reserveloop -->
 	<tr VALIGN=TOP>
 		<td>
-			<a href="/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">"><TMPL_VAR NAME="btitle"></a>
-			<TMPL_IF NAME=volumeddesc>
-				<TMPL_VAR NAME="volumeddesc">
-				<TMPL_VAR NAME="itemtype">
-			</TMPL_IF>
+			<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
+			<!-- TMPL_IF NAME=volumeddesc -->
+				<!-- TMPL_VAR NAME="volumeddesc" -->
+				<!-- TMPL_VAR NAME="itemtype" -->
+			<!-- /TMPL_IF -->
 		</td>
-		<td><TMPL_VAR NAME="reservedate2"></td>
+		<td><!-- TMPL_VAR NAME="reservedate2" --></td>
 		<td>
 			<select name="rank-request">
 			<option value=n>Non
 			<option value=del>Oui
 			</select>
 		</td>
-		<input type=hidden name=biblio value="<TMPL_VAR NAME="biblionumber">">
-		<input type=hidden name=borrowernumber value="<TMPL_VAR NAME="bornum">">
+		<input type=hidden name=biblio value="<!-- TMPL_VAR NAME="biblionumber" -->">
+		<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME="bornum" -->">
 	</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 
 	<tr VALIGN=TOP  >
 		<td colspan=5 align=right>
-		<TMPL_IF name="reserveloop">
-			<INPUT TYPE="submit" name="submit" VALUE="Annuler" class="button">
-		</TMPL_IF>
+		<!-- TMPL_IF name="reserveloop" -->
+			<INPUT TYPE="image" name="submit" VALUE="mettre à jour" height=42 WIDTH=187 BORDER=0 src="<!-- TMPL_VAR name="themelang" -->/images/cancel-requests.gif">
+		<!-- /TMPL_IF -->
 		</td>
 	</tr>
 	</form>
 </table>
 <br />
 <br />
-<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<TMPL_VAR NAME="bornum">">Fiche lecteur</a>
+<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+	Reading Record
+</a>
 <script>
 function confirm_deletion() {
-	var is_confirmed = confirm('Confirmez vous la suppression ?');
+	var is_confirmed = confirm('do you confirm deletetion ?');
 	if (is_confirmed) {
-		window.location="/cgi-bin/koha/deletemem.pl?member=<TMPL_VAR NAME="bornum">";
+		window.location="/cgi-bin/koha/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->";
 	}
 }
 </script>
- <!-- endmenu -->
+<!-- endmenu -->
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl
index bda9e4891c..94409832f6 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl
@@ -1,49 +1,48 @@
-<TMPL_INCLUDE NAME="members-top.inc">
-<FONT SIZE=6><em>Dettes &agrave; r&eacute;gler
-pour <TMPL_VAR name="firstname"> <TMPL_VAR name="surname"></em></FONT>
-<P>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+
+<h1>Payer une amende pour <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1><P>
 <center>
 <p>
+	<form action=/cgi-bin/koha/pay.pl method=post>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 <TR VALIGN=TOP>
-	  <td  bgcolor="99cc33" background="/images/background-mem.gif" colspan=4><B>AMENDES
-        ET FRAIS</b></TD>
-	  <td  bgcolor="99cc33" background="/images/background-mem.gif" colspan=4><B>MONTANT 
-        DU </b></TD>
+	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>AMENDES & FRAIS</B></TD>
+	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>Montant de l'avoir</B></TD>
 </TR>
-	<form action=/cgi-bin/koha/pay.pl method=post>
-	<input type="hidden" name="bornum" value="<TMPL_VAR name="bornum">">
-<TMPL_LOOP name="loop_pay">
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
+<!-- TMPL_LOOP name="loop_pay" -->
 <tr VALIGN=TOP  >
-	<TD><input type=radio name="payfine<TMPL_VAR name="i">
-          " value="oui" checked>A payer 
-          <input type=radio name="payfine<TMPL_VAR name="i">
-          " value="oui">Pay&eacute; 
-          <input type=radio name="payfine<TMPL_VAR name="i">" value="wo">Abandonner
-	<input type=hidden name="itemnumber<TMPL_VAR name="i">" value="<TMPL_VAR name="itemnumber">">
-	<input type=hidden name="accounttype<TMPL_VAR name="i">" value="<TMPL_VAR name="accounttype">">
-	<input type=hidden name="amount<TMPL_VAR name="i">" value="<TMPL_VAR name="amount'}">">
-	<input type=hidden name="out<TMPL_VAR name="i">" value="<TMPL_VAR name="amountoutstanding">">
-	<input type=hidden name="bornum<TMPL_VAR name="i">" value="<TMPL_VAR name="bornum">">
-	<input type=hidden name="accountno<TMPL_VAR name="i">" value="<TMPL_VAR name="accountno">">
+	<TD><input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked>Unpaid
+	<input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="oui">Pay
+	<input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="wo">Writeoff
+	<input type=hidden name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->">
+	<input type=hidden name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->">
+	<input type=hidden name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount'}" -->">
+	<input type=hidden name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->">
+	<input type=hidden name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->">
+	<input type=hidden name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->">
 	</td>
-	<TD><TMPL_VAR name="description"> <TMPL_VAR name="title"></td>
-	<TD><TMPL_VAR name="accounttype"></td>
-	<td><TMPL_VAR name="amount"></td>
-	<TD><TMPL_VAR name="amountoutstanding"></td>
+	<TD><!-- TMPL_VAR name="description" --> <!-- TMPL_VAR name="title" --></td>
+	<TD><!-- TMPL_VAR name="accounttype" --></td>
+	<td><!-- TMPL_VAR name="amount" --></td>
+	<TD><!-- TMPL_VAR name="amountoutstanding" --></td>
 </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 <tr VALIGN=TOP  >
-	<TD>&nbsp;</td>
-	    <TD colspan=2><b>Montant total</b></td>
-	<TD><b><TMPL_VAR name="total"></b></td>
+	<TD colspan=4 align=right><b>Total dû</b></td>
+	<TD><b><!-- TMPL_VAR name="total" --></b></td>
 	</tr>
 	<tr VALIGN=TOP  >
 	<TD colspan=5 align=right>
-	<INPUT TYPE="submit" name="submit"  VALUE="payer" class="button"></td>
+	<INPUT TYPE="submit" name="submit"  VALUE="pay" class="button"></td>
 </tr>
-</form>
 </table>
+</form>
 <br clear=all>
-<p>&nbsp;  </p>
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<p> &nbsp; </p>
+
+<br>
+<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Return</a> to Lecteur Record
+
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl
index 29f72dd1b0..338472337e 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl
@@ -1,38 +1,55 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
+<h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
+<br>N° Lecteur: <!-- TMPL_VAR NAME=bornum -->
+<br>N° Carte: <!-- TMPL_VAR NAME=cardnumber -->
+<P>
+<!-- TMPL_IF NAME=showfulllink -->
+<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=full">Full output</a>
+<br/>
+<!-- /TMPL_IF -->
+<br/>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 <TR VALIGN=TOP>
-	<TD bgcolor="white" colspan=4 >
-		[<a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&limit=full">Liste complète</a>]
-		[<a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">">Emprunts récents</a>]
+	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=title&limit=<!-- TMPL_VAR name="limit" -->"><b>TITRE</b></a>
 	</TD>
-</TR>
-<TR VALIGN=TOP>
-	<TD  bgcolor="white"> <a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&order=title&limit=<TMPL_VAR name="limit">"><b>TITRE</b></a>
-    </TD>
-	<TD  bgcolor="white"> <a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&order=author&limit=<TMPL_VAR name="limit">"><b>AUTEUR</b></a> 
-    </TD>
-	<TD  bgcolor="white">
-		<a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&limit=<TMPL_VAR name="limit">"><b>DATE</b></a>
+	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=author&limit=<!-- TMPL_VAR name="limit" -->"><b>AUTEUR</b></a>
 	</TD>
-	<TD  bgcolor="white">
+	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=<!-- TMPL_VAR name="limit" -->"><b>DATE RETOUR</b></a>
+	</TD>
+	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=returndate&limit=<!-- TMPL_VAR name="limit" -->"><b>RENDU</b></a>
+	</TD>
+	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 		<b>Volume</b>
 	</TD>
 </TR>
-<TMPL_LOOP name="loop_reading">
+<!-- TMPL_LOOP name="loop_reading" -->
 <TR VALIGN=TOP>
 	<TD  bgcolor="white">
- 		<TMPL_VAR name="title">&nbsp;
+ 		<!-- TMPL_VAR name="title" -->&nbsp;
 	</TD>
 	<TD  bgcolor="white">
- 		<TMPL_VAR name="author">&nbsp;
+ 		<!-- TMPL_VAR name="author" -->&nbsp;
 	</TD>
 	<TD  bgcolor="white">
-		<TMPL_VAR name="returndate">&nbsp;
+		<!-- TMPL_VAR name="date_due" -->&nbsp;
 	</TD>
 	<TD  bgcolor="white">
-		<TMPL_VAR name="volumeddesc">&nbsp;
+		<!-- TMPL_VAR name="returndate" -->&nbsp;
 	</TD>
-</TMPL_LOOP>
+	<TD  bgcolor="white">
+		<!-- TMPL_VAR name="volumeddesc" -->&nbsp;
+	</TD>
+<!-- /TMPL_LOOP -->
 </TABLE>
-<TMPL_INCLUDE NAME="members-bottom.inc">
+
+<br>
+<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Return</a> to Lecteur Record
+
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl b/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl
index c2874cf835..eec91a5a18 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl
@@ -1,63 +1,63 @@
-<TMPL_INCLUDE Name="cat-top.inc">
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<a href="modwebsites.pl?biblionumber=<TMPL_VAR Name="biblionumber">">Modifier Liens web</a>
+<a href="modwebsites.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->">Modifier Site Web Links</a>
 <form action="updatebiblio.pl" method="post" name="f">
-<input type="hidden" name="biblionumber" value="<TMPL_VAR Name="biblionumber">">
-<input type="hidden" name="biblioitemnumber" value="<TMPL_VAR Name="biblioitemnumber">">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
+<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
 <table border="0" cellspacing="0" cellpadding="5">
 <tr valign="top">
 <td>Auteur</td>
-<td><input type="text" name="author" value="<TMPL_VAR Name="author" ESCAPE=HTML>"></td>
+<td><input type="text" name="author" value="<!-- TMPL_VAR Name="author" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Titre</td>
-<td><input type="text" name="title" value="<TMPL_VAR Name="title" ESCAPE=HTML>"></td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR Name="title" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Résumé</td>
-<td><textarea name="abstract" cols="40" rows="4"><TMPL_VAR Name="abstract"></textarea></td>
+<td><textarea name="abstract" cols="40" rows="4"><!-- TMPL_VAR Name="abstract" --></textarea></td>
 </tr>
 <tr valign="top">
 <td>Sujet</td>
-<td><textarea name="subject" cols="40" rows="4"><TMPL_VAR Name="subject"></textarea>
+<td><textarea name="subject" cols="40" rows="4"><!-- TMPL_VAR Name="subject" --></textarea>
 </td>
 </tr>
 <tr valign="top">
-<td>Copyright</td>
-<td><input type="text" name="copyrightdate" value="<TMPL_VAR Name="copyrightdate" ESCAPE=HTML>"></td>
+<td>Date Copyright</td>
+<td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR Name="copyrightdate" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Titre périodique</td>
-<td><input type="text" name="seriestitle" value="<TMPL_VAR Name="seriestitle" ESCAPE=HTML>"></td>
+<td>Titre Séries</td>
+<td><input type="text" name="seriestitle" value="<!-- TMPL_VAR Name="seriestitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Autres auteurs</td>
-<td><input type="text" name="additionalauthor" value="<TMPL_VAR Name="additionalauthor" ESCAPE=HTML>"></td>
+<td>Auteur supplémentaire</td>
+<td><input type="text" name="additionalauthor" value="<!-- TMPL_VAR Name="additionalauthor" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Sous titre</td>
-<td><input type="text" name="subtitle" value="<TMPL_VAR Name="subtitle" ESCAPE=HTML>"></td>
+<td>Sous-titre</td>
+<td><input type="text" name="subtitle" value="<!-- TMPL_VAR Name="subtitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Titre uniforme</td>
-<td><input type="text" name="unititle" value="<TMPL_VAR Name="untitle" ESCAPE=HTML>"></td>
+<td><input type="text" name="unititle" value="<!-- TMPL_VAR Name="unititle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Notes</td>
-<td><textarea name="notes" cols="40" rows="4"><TMPL_VAR Name="notes" ESCAPE=HTML></textarea></td>
+<td><textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR Name="notes" ESCAPE=HTML --></textarea></td>
 </tr>
 <tr valign="top">
-<td>Périodique</td>
-<td><input type="text" name="serial" value="<TMPL_VAR Name="serial" ESCAPE=HTML>"></td>
+<td>Périodiques</td>
+<td><input type="text" name="serial" value="<!-- TMPL_VAR Name="serial" ESCAPE=HTML -->"></td>
 </tr>
 </table>
 <br>
-<input type="submit" name="submit" value="Save Changes">
+<input type="submit" name="submit" value="Enregistrer changements">
 </form>
 <script>
 function Dopop() {
-        newin=window.open("thesaurus_popup.pl?subject="+document.f.subject.value,"thesaurus",'width=500,height=400,toolbar=false,scrollbars=yes');
+        newin=window.open("thesaurus_popup.pl?subject="+document.f.subject.value,"thesaurus",'width=500,height=400,toolbar=false,scrollbars=oui');
 }
 </script>
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl b/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl
index 815c59dcc5..af5cb772cb 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl
@@ -1,61 +1,61 @@
-<TMPL_INCLUDE Name="cat-top.inc">
-<h1><a href=/cgi-bin/koha/detail.pl?bib="<TMPL_VAR Name="biblionumber">"&type=intra><TMPL_VAR Name="title"> (<TMPL_VAR Name="author">)</a><br>
-Modifier Groupe - <TMPL_VAR Name="description"></h1><br>
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
+<h1><a href=/cgi-bin/koha/detail.pl?bib="<!-- TMPL_VAR Name="biblionumber" -->"&type=intra><!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</a><br>
+Modifier groupe <!-- TMPL_VAR Name="description" --></h1><br>
 
 <form action=updatebibitem.pl method=post>
 	<table border=0 cellspacing=0 cellpadding=5 align=left>
 
 		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=YES > Assigner à un groupe existant</b></td>
+			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=OUI > RE-ASSIGNE AU GROUPE EXISTANT</b></td>
 		</tr>
 
 		<tr valign=top>
 			<td colspan=3>
 				<select name=existinggroup><br>
-					<TMPL_LOOP Name="bibitemloop">
-						<option value="<TMPL_VAR Name="biblioitemnumber">"><TMPL_VAR Name="description"> - <TMPL_VAR Name="isbn"><br>
-					</TMPL_LOOP>
+					<!-- TMPL_LOOP Name="bibitemloop" -->
+						<option value="<!-- TMPL_VAR Name="biblioitemnumber" -->"><!-- TMPL_VAR Name="description" --> - <!-- TMPL_VAR Name="isbn" --><br>
+					<!-- /TMPL_LOOP -->
 				</select>
 			</td>
 		</tr>
 
 		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >OR MODIFY DETAILS</b></td>
+			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >ou modifie les détails</b></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Item Type</td><td><input type=text name=Item Type value="<TMPL_VAR Name="itemtype">" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Catég ouvrage</td><td><input type=text name=Ouvrage Type value="<!-- TMPL_VAR Name="itemtype" -->" size=20></td></tr>
 
 		<tr valign="top" bgcolor="white">
 			<td>URL</td>
-			<td><input type="text" name="url" value="<TMPL_VAR Name="url">" size="20"></td>
+			<td><input type="text" name="url" value="<!-- TMPL_VAR Name="url" -->" size="20"></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Class</td><td><input type=text name=Class value="<TMPL_VAR Name="classification"><TMPL_VAR Name="dewey"><TMPL_VAR Name="subclass">" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Catégorie</td><td><input type=text name=Catégorie value="<!-- TMPL_VAR Name="classification" --><!-- TMPL_VAR Name="dewey" --><!-- TMPL_VAR Name="subclass" -->" size=20></td></tr>
 
 
 
-		<tr valign=top bgcolor=white><td>Publisher</td><td><input type=text name=Publisher value="<TMPL_VAR Name="publishercode">" size=20></td></tr>
-		<tr valign=top bgcolor=white><td>Place</td><td><input type=text name=Place value="<TMPL_VAR Name="place">" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Editeur</td><td><input type=text name=Editeur value="<!-- TMPL_VAR Name="publishercode" -->" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Lieu</td><td><input type=text name=Lieu value="<!-- TMPL_VAR Name="place" -->" size=20></td></tr>
 
 
-		<tr valign=top bgcolor=white><td>ISBN</td><td><input type=text name=ISBN value="<TMPL_VAR Name="isbn">" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>ISBN</td><td><input type=text name=ISBN value="<!-- TMPL_VAR Name="isbn" -->" size=20></td></tr>
 
-		<tr valign=top bgcolor=white><td>Publication Year</td><td><input type=text name=Publication Year value="<TMPL_VAR Name="publicationyear">" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Année de publication</td><td><input type=text name=Année de publication value="<!-- TMPL_VAR Name="publicationyear" -->" size=20></td></tr>
 
-		<tr valign=top bgcolor=white><td>Pages</td><td><input type=text name=Pages value="<TMPL_VAR Name="pages">" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Pages</td><td><input type=text name=Pages value="<!-- TMPL_VAR Name="pages" -->" size=20></td></tr>
 
-		<tr valign=top bgcolor=white><td>Illustrations</td><td><input type=text name=Illustrations value="<TMPL_VAR Name="illustration">" size=20></td></tr>
+		<tr valign=top bgcolor=white><td>Illustations</td><td><input type=text name=Illustations value="<!-- TMPL_VAR Name="illustration" -->" size=20></td></tr>
 
 		<tr valign=top bgcolor=white><td>Volume</td>
-		<td><input type=text name=Volume value="<TMPL_VAR Name="volumeddesc">" size=20></td></tr>
+		<td><input type=text name=Volume value="<!-- TMPL_VAR Name="volumeddesc" -->" size=20></td></tr>
 		<tr valign=top bgcolor=white><td>Notes</td>
-		<td><input name="Notes" size="20" value="<TMPL_VAR name="bnotes">"></td></tr>
-		<tr valign=top bgcolor=white><td>Size</td>
-		<td><input type=text name=Size value="<TMPL_VAR Name="size">" size=20></td></tr>
+		<td><input name="Notes" size="20" value="<!-- TMPL_VAR name="bnotes" -->"></td></tr>
+		<tr valign=top bgcolor=white><td>Taille</td>
+		<td><input type=text name=Taille value="<!-- TMPL_VAR Name="size" -->" size=20></td></tr>
 
-		<input type=hidden name=bibnum value="<TMPL_VAR Name="biblionumber">">
+		<input type=hidden name=bibnum value="<!-- TMPL_VAR Name="biblionumber" -->">
 
-		<input type=hidden name=bibitemnum value="<TMPL_VAR Name="biblioitemnumber">">
+		<input type=hidden name=bibitemnum value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
 
 	</table>
 
@@ -67,40 +67,40 @@ Modifier Groupe - <TMPL_VAR Name="description"></h1><br>
 	<TABLE  cellspacing=0 cellpadding=5 border=0 >
 
 		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=5 ><b>CHANGES TO AFFECT THESE BARCODES<br>
-			Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.</td>
+			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=5 ><b>MODIFS SUR CES CODES-BARRES<br>
+			Sélectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-sélectionnés ne seront pas affectés.</td>
 		</tr>
 
 		<tr valign=top bgcolor=99cc33>
 			<td background="/images/background-mem.gif">&nbsp;</td>
-			<td background="/images/background-mem.gif">Barcode</td>
-			<td background="/images/background-mem.gif">Location</td>
-			<td background="/images/background-mem.gif">Date Due</td>
-			<td background="/images/background-mem.gif">Last Seen</td>
+			<td background="/images/background-mem.gif">Code barre</td>
+			<td background="/images/background-mem.gif">Localisation</td>
+			<td background="/images/background-mem.gif">Date de retour</td>
+			<td background="/images/background-mem.gif">Vu</td>
 		</tr>
 
-		<TMPL_LOOP Name="itemloop">
+		<!-- TMPL_LOOP Name="itemloop" -->
 			<tr valign=top gcolor=#ffffcc>
-				<td><input type=checkbox name="check_group_<TMPL_VAR Name="barcode">"></td>
-				<td><a href="/cgi-bin/koha/moredetail.pl?item="<TMPL_VAR Name="itemnumber">"&bib="<TMPL_VAR Name="biblionumber">"&bi="<TMPL_VAR Name="biblioitemnumber">""><TMPL_VAR Name="barcode"></a></td>
-				<td><TMPL_VAR Name="holdingbranch"></td>
+				<td><input type=checkbox name="check_group_<!-- TMPL_VAR Name="barcode" -->"></td>
+				<td><a href="/cgi-bin/koha/moredetail.pl?item="<!-- TMPL_VAR Name="itemnumber" -->"&bib="<!-- TMPL_VAR Name="biblionumber" -->"&bi="<!-- TMPL_VAR Name="biblioitemnumber" -->""><!-- TMPL_VAR Name="barcode" --></a></td>
+				<td><!-- TMPL_VAR Name="holdingbranch" --></td>
 				<td></td>
-				<td><TMPL_VAR Name="datelastseen"></td>
+				<td><!-- TMPL_VAR Name="datelastseen" --></td>
 			</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
 	<p>
 
-	<input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42>
+	<input type=image  name=submit src=/images/Enregistrer-changes.gif border=0 width=187 height=42>
 
 
 </form>
 <p>
 
 
-<B>HELP:</B> You <b>must</b> click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record.  IF your changes only apply to some
- items, tick the appropriate ones and a new group record will be created automatically for them.
+<B>AIDE:</B> Vous <b>doit</b> click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record.  IF your changes only apply to some
+ items, tick the appropriate ones et a new group record will be created automatically for them.
  <br clear=all>
  <p> &nbsp; </p>
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/moditem.tmpl b/koha-tmpl/intranet-tmpl/default/fr/moditem.tmpl
new file mode 100644
index 0000000000..a6f8cbb777
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/moditem.tmpl
@@ -0,0 +1,46 @@
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
+
+<h1><!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</h1><br>
+<table border=0 cellspacing=0 cellpadding=5>
+<tr valign=top bgcolor=white><td><form action=updateitem.pl method=post>
+<table border=0 cellspacing=0 cellpadding=5>
+<tr valign=top bgcolor=white><td>Code barre</td><td><input type=text name=Code barre value="<!-- TMPL_VAR Name="barcode" -->" size=40></td></tr>
+<input type=hidden name=Catégorie value="<!-- TMPL_VAR Name="classification" -->">
+<input type=hidden name=Editeur value="<!-- TMPL_VAR Name="publisher" -->">
+<input type=hidden name=ISBN value="<!-- TMPL_VAR Name="isbn" -->">
+<input type=hidden name=Année de publication value="<!-- TMPL_VAR Name="publicationyear" -->">
+<input type=hidden name=Pages value="<!-- TMPL_VAR Name="pages" -->">
+<input type=hidden name=Illustations value="<!-- TMPL_VAR Name="illustration" -->">
+<tr valign=top bgcolor=white><td>Notes ouvrage</td><td><textarea name=Notes ouvrage cols=40 rows=4><!-- TMPL_VAR Name="itemnotes" --></textarea></td></tr>
+<input type=hidden name=Volume value="<!-- TMPL_VAR Name="volumeddesc" -->">
+<tr valign=top bgcolor=white><td>Annexe propriétaire</td><td><input type=text name=Annexe propriétaire value="<!-- TMPL_VAR Name="homebranch" -->" size=40></td></tr>
+<tr valign=top bgcolor=white>
+
+<td>Perdu</td>
+<td>
+<input type=radio name=Perdu value=1 <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> >
+Oui
+<input type=radio name=Perdu value=0 <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> >
+No
+</td>
+</tr>
+<tr valign=top bgcolor=white>
+<td>Annulé</td>
+<td><input type=radio name=withdrawn value=1 <!-- TMPL_IF Name="withdrawn" --> checked <!-- /TMPL_IF --> >
+Oui
+<input type=radio name=withdrawn value=0 <!-- TMPL_UNLESS Name="withdrawn" --> checked <!-- /TMPL_UNLESS --> >
+No
+</td>
+</tr>
+<input type=hidden name=bibnum value="<!-- TMPL_VAR Name="biblionumber" -->">
+<input type=hidden name=bibitemnum value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
+<input type=hidden name=itemnumber value="<!-- TMPL_VAR Name="itemnumber" -->">
+<tr valign=top bgcolor=white><td></td><td>
+
+<input type=image  name=submit src=<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filesave.png border=0></td></tr>
+</table>
+</form></td></tr>
+</table>
+
+
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/modwebsites.tmpl b/koha-tmpl/intranet-tmpl/default/fr/modwebsites.tmpl
new file mode 100644
index 0000000000..042ff56f54
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/modwebsites.tmpl
@@ -0,0 +1,51 @@
+<!-- TMPL_INCLUDE Name="acquisitions-top.inc" -->
+<p>
+<a href="detail.pl?type=intra&bib=<!-- TMPL_VAR Name="biblionumber" -->">Return to Details Page</a>
+
+
+<!-- TMPL_LOOP Name="websitesloop" -->
+<p>
+<form action="updatewebsite.pl" method="post">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
+<input type="hidden" name="websitenumber" value="<!-- TMPL_VAR Name="websitenumber" -->">
+<table>
+<tr valign="top">
+<td>Titre</td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR Name="title" -->"></td>
+</tr>
+<tr valign="top">
+<td>Description</td>
+<td><textarea name="description" cols="40" rows="4"><!-- TMPL_VAR Name="description" --></textarea></td>
+</tr>
+<tr valign="top">
+<td>URL</td>
+<td><input type="text" name="url" value="<!-- TMPL_VAR Name="url" -->"></td>
+</tr>
+</table>
+<input type="submit" value="Corriger ce lien Internet">   <input type="submit" name="delete" value="Supprimer lien Internet">
+</form>
+<!-- /TMPL_LOOP -->
+
+<p>
+<h2><b>Ajouter un autre lien Internet</b></h2>
+<form action="addwebsite.pl" method="post">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
+<table>
+<tr valign="top">
+<td>Titre</td>
+<td><input type="text" name="title"></td>
+</tr>
+<tr valign="top">
+<td>Description</td>
+<td><textarea name="description" cols="40" rows="4"></textarea></td>
+</tr>
+<tr valign="top">
+<td>URL</td>
+<td><input type="text" name="url"></td>
+</tr>
+</table>
+<input type="submit" value="Ajouter ce lien Internet">
+</form>
+
+
+<!-- TMPL_INCLUDE Name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl
index cb4eb9a374..ca23071c9f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl
@@ -1,22 +1,180 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<TMPL_IF NAME="missingloop">
-	Les champs obligatoires
-	suivants n'ont pas &eacute;t&eacute; saisis. Veuillez retourner &agrave; la page
-	pr&eacute;c&eacute;dantes et compl&eacute;ter les champs.
-	<TMPL_VAR Name="string">
-<TMPL_ELSE>
-	<TMPL_IF NAME=invalid>
-		 Num&eacute;ro de carte erron&eacute;.
-	<TMPL_ELSE>
-		Valeurs correctes. Cliquer sur OK pour valider.
+<!-- TMPL_IF NAME="missingloop" -->
+	<!-- TMPL_VAR Name="string" -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_IF NAME=invalid -->
+		N° carte invalide.<p>
+	<!-- TMPL_ELSE -->
+	<H1> Confirmer Enregistrement </H1>
+	<table border=0 cellspacing=0 cellpadding=5>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B> NOUVEAU LECTEUR </B>
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Nom</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="institution_name" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B> DETAILS LECTEUR </B>
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>N° Lecteur</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="bornum" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>N° Carte</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="cardnumber_institution" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Annexe d'inscription</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="branchcode" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B>ADRESSE LECTEUR</B>
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Adresse postale</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="postal" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Adresse privée</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="home" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B>DETAILS LECTEUR</B>
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Téléphone (Accueil)</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="phone" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Téléphone (Daytime)</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="phoneday" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Fax</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="faxnumber" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>E-mail</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="emailaddress" -->
+			</td>
+		</tr>
+                <tr valign=top bgcolor="white" >
+                        <td>
+                                <B>Ecriture d'un texte</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME=textmessaging -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B>DETAIL AUTRE CONTACT</B>
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Nom</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="contactname" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Téléphone</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="altphone" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Relation</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="altrelationship" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Notes</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="altnotes" -->
+			</td>
+		</tr>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B>NOTES</B>
+			</td>
+		</tr>
+		<tr valign=top bgcolor="white" >
+			<td>
+				<B>Notes générales</B>
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="bornotes" -->
+			</td>
+		</tr>
+		</TABLE><p>
+		Valeurs valides. Cliquez sur OK pour confirmer ce nouveau lecteur
 		<form action="/cgi-bin/koha/insertidata.pl" method=post>
-			<TMPL_LOOP NAME=inputsloop>
-				<input type=hidden name="<TMPL_VAR NAME="key">" value="<TMPL_VAR NAME="value">">
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP NAME=inputsloop -->
+				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+			<!-- /TMPL_LOOP -->
 			<input type=submit name=submit value=OK>
 		</form>
-	</TMPL_IF>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/newjmember.tmpl
new file mode 100644
index 0000000000..75dbb44210
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/newjmember.tmpl
@@ -0,0 +1,85 @@
+<!-- TMPL_INCLUDE Name="members-top.inc" -->
+
+<!-- TMPL_IF Name="NOK" -->
+	<!-- TMPL_VAR Name="string" -->
+<!-- TMPL_ELSE -->
+	<H1> Confirmer Enregistrement </H1>
+	<!-- TMPL_LOOP Name="identsloop" -->
+		<!-- TMPL_IF Name="cardchild" -->
+			<table border=0 cellspacing=0 cellpadding=5>
+				<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+					<td background="<!-- TMPL_VAR Name="image" -->">
+					<B> NOUVEAU LECTEUR </B>
+					</td>
+					<td>
+					&nbsp;
+					</td>
+				</tr>
+				<tr valign=top bgcolor="white" >
+					<td>
+					<B>Nom</B>
+					</td>
+					<td>
+					<!-- TMPL_VAR Name="name" -->
+					</td>
+				</tr>
+				<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+					<td background="<!-- TMPL_VAR Name="image" -->">
+					<B> DETAILS LECTEUR </B>
+					</td>
+					<td>
+					&nbsp;
+					</td>
+				</tr>
+				<tr valign=top bgcolor="white" >
+					<td>
+					<B>N° Lecteur</B>
+					</td>
+					<td>
+					<!-- TMPL_VAR Name="bornum" -->
+					</td>
+				</tr>
+				<tr valign=top bgcolor="white" >
+					<td>
+					<B>Date de naissance</B>
+					</td>
+					<td>
+					<!-- TMPL_VAR Name="dob" -->
+					</td>
+				</tr>
+				<tr valign=top bgcolor="white" >
+					<td>
+					<B>Sexe</B>
+					</td>
+					<td>
+					<!-- TMPL_VAR Name="sex" -->
+					</td>
+				</tr>
+				<tr valign=top bgcolor="white" >
+					<td>
+					<B>Ecole</B>
+					</td>
+					<td>
+					<!-- TMPL_VAR Name="school" -->
+					</td>
+				</tr>
+				<tr valign=top bgcolor="white" >
+					<td>
+					<B>Notes générales</B>
+					</td>
+					<td>
+					<!-- TMPL_VAR Name="notes" -->
+					</td>
+				</tr>
+			</TABLE><p>
+		<!-- /TMPL_IF -->
+  <!-- /TMPL_LOOP -->
+	<form action="/cgi-bin/koha/insertjdata.pl" method=post>
+		<!-- TMPL_LOOP NAME=inputsloop -->
+			<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+		<!-- /TMPL_LOOP -->
+		<input type=submit name=submit value=submit>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE Name="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/newmember.tmpl
index a1919db413..793aab88fc 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/newmember.tmpl
@@ -1,11 +1,11 @@
-<TMPL_INCLUDE Name="members-top.inc">
+<!-- TMPL_INCLUDE Name="members-top.inc" -->
 
-<TMPL_IF Name="OK">
-	<H1> Confirmer l'enregistrement </H1>
+<!-- TMPL_IF Name="OK" -->
+	<H1> Confirmer Enregistrement </H1>
 	<table border=0 cellspacing=0 cellpadding=5>
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<B>NOUVEAU LECTEUR</B>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B> NOUVEAU LECTEUR </B>
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -13,36 +13,36 @@
 				<B>Nom</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="name">
+				<!-- TMPL_VAR Name="name" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<B>D&eacute;tails</B>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B> DETAILS LECTEUR </B>
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Num&eacute;ro interne</B>
+				<B>N° Lecteur</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="bornum">
+				<!-- TMPL_VAR Name="bornum" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Num&eacute;ro de carte</B>
+				<B>N° Carte</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="cardnum">
+				<!-- TMPL_VAR Name="cardnum" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Cat&eacute;gorie de lecteur</B>
+				<B>Catégorie Lecteur</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="memcat">
+				<!-- TMPL_VAR Name="memcat" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -50,7 +50,7 @@
 				<B>Frais</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="fee">
+				<!-- TMPL_VAR Name="fee" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -58,27 +58,27 @@
 				<B>Date d'inscription</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="joindate">
+				<!-- TMPL_VAR Name="joindate" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Date expiration</B>
+				<B>Date d'expiration</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="expdate">
+				<!-- TMPL_VAR Name="expdate" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Annexe de rattachement</B>
+				<B>Annexe d'inscription</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="branchcode">
+				<!-- TMPL_VAR Name="branchcode" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 				<B>DETAILS PERSONNELS</B>
 			</td>
 		</tr>
@@ -87,7 +87,7 @@
 				<B>Date de naissance</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="dob">
+				<!-- TMPL_VAR Name="dob" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -95,12 +95,16 @@
 				<B>Sexe</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="sex">
+				<!-- TMPL_IF Name="sex" -->
+					Male
+				<!-- TMPL_ELSE -->
+					Female
+				<!-- /TMPL_IF -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<B>ADRESSE</B>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B>ADRESSE LECTEUR</B>
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -108,36 +112,36 @@
 				<B>Adresse postale</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="postal">
+				<!-- TMPL_VAR Name="postal" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Adresse</B>
+				<B>Adresse privée</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="home">
+				<!-- TMPL_VAR Name="home" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<B>CONTACTS</B>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B>DETAILS LECTEUR</B>
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>T&eacute;l&eacute;phone (maison)</B>
+				<B>Téléphone personnel</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="phone">
+				<!-- TMPL_VAR Name="phone" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>T&eacute;l&eacute;phone (bureau)</B>
+				<B>Téléphone professionnel</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="phoneday">
+				<!-- TMPL_VAR Name="phoneday" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -145,7 +149,7 @@
 				<B>Fax</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="faxnumber">
+				<!-- TMPL_VAR Name="faxnumber" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -153,20 +157,20 @@
 				<B>E-mail</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="emailaddress">
+				<!-- TMPL_VAR Name="emailaddress" -->
 			</td>
 		</tr>
                 <tr valign=top bgcolor="white" >
                         <td>
-                                <B>Texte</B>
+                                <B>Ecriture d'un texte</B>
 			</td>
 			<td>
-				<TMPL_VAR NAME=textmessaging>
+				<!-- TMPL_VAR NAME=textmessaging -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<B>AUTRES CONTACTS</B>
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+				<B>DETAIL AUTRE CONTACT</B>
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -174,15 +178,15 @@
 				<B>Nom</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="contactname">
+				<!-- TMPL_VAR Name="contactname" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>T&eacute;l&eacute;phone</B>
+				<B>Téléphone</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="altphone">
+				<!-- TMPL_VAR Name="altphone" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -190,7 +194,7 @@
 				<B>Relation</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="altrelationship">
+				<!-- TMPL_VAR Name="altrelationship" -->
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
@@ -198,54 +202,54 @@
 				<B>Notes</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="altnotes">
+				<!-- TMPL_VAR Name="altnotes" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 				<B>NOTES</B>
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
 			<td>
-				<B>Notes g&eacute;n&eacute;rales</B>
+				<B>Notes générales</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="bornotes">
+				<!-- TMPL_VAR Name="bornotes" -->
 			</td>
 		</tr>
 		</TABLE><p>
 		<form action="/cgi-bin/koha/insertdata.pl" method=post>
-			<TMPL_LOOP NAME=inputsloop>
-				<input type=hidden name="<TMPL_VAR NAME="key">" value="<TMPL_VAR NAME="value">">
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP NAME=inputsloop -->
+				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+			<!-- /TMPL_LOOP -->
 			<input type=submit name=submit value=Submit>
 		</form>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<h1>ERREUR</H1>
-	<p>Les champs suivants sont erronés. Cliquer sur le bouton "retour" et corrigez.</p>
-	<TMPL_IF name="cardnumber">
-		Numéro carte lecteur vide<br/>
-	</TMPL_IF>
-	<TMPL_IF name="invalid_cardnumber">
-		Numéro de carte invalide<br/>
-	</TMPL_IF>
-	<TMPL_IF name="gender">
-		Zone sexe vide<br/>
-	</TMPL_IF>
-	<TMPL_IF name="firstname">
-		Zone nom vide<br/>
-	</TMPL_IF>
-	<TMPL_IF name="surname">
-		Zone prénom vide<br/>
-	</TMPL_IF>
-	<TMPL_IF name="address">
-		Adresse vide<br/>
-	</TMPL_IF>
-	<TMPL_IF name="city">
-		Commune vide<br/>
-	</TMPL_IF>
-</TMPL_IF>
+	<p>Les champs suivants contiennent une valeur interdite. Cliquez sur le bouton Précédent et essayez à nouveau : </p>
+	<!-- TMPL_IF name="cardnumber" -->
+		N° Carte<br/>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="invalid_cardnumber" -->
+		N° carte invalide<br/>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="gender" -->
+		Sexe<br/>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="firstname" -->
+		Prénoms<br/>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="surname" -->
+		Nom<br/>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="address" -->
+		Rue<br/>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="city" -->
+		Localité<br/>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 
 
-<TMPL_INCLUDE Name="members-bottom.inc">
+<!-- TMPL_INCLUDE Name="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/opac-main.tmpl b/koha-tmpl/intranet-tmpl/default/fr/opac-main.tmpl
index 3eac64a334..ea5fa8266c 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/opac-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/opac-main.tmpl
@@ -1,133 +1,134 @@
-<HTML>
-<TITLE>Bienvenue sur l'OPAC Koha</TITLE>
-
-
-<style type="text/css">
-<!--
-input{font-size:16px}
--->
-
-</style>
-
-
-</HEAD>
-
-<BODY   onload="document.catsearch.keyword.focus()"
-	BGCOLOR="#339999" 
-	text="black" 
-	link="white" 
-	vlink="white" 
-	alink="#663366" 
-	leftmargin=0 
-	topmargin=0
-	marginheight=0
-	marginwidth=0 >
-
-<center>
-<table cellspacing=0 cellpadding=0 border=0 >
-	
-  <tr valign=top >
-	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
-	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
-cellspacing=0 cellpadding=0 border=0 >
-	
-  <tr valign=top >
-	<td background=" "><img src="/images/holder.gif" width=228 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=57 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=47 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-  </tr>
-
-  <tr valign=top >
-	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
- 	width=1 height=30
-	alt=" " hspace=0 vspace=0><br>
-	<img src="/images/koha.gif" width=200 height=128
-	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
-
-	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
-	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
-
-  </tr>
-
-
-<tr valign=top >
-	<td>&nbsp; &nbsp; </td>
-	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
-	<input type=hidden name=type value=opac>
-	<td background=" " >
-
-	<input type=text size="27" name="keyword"><br>
-				<b>Apr&egrave;s la saisie, pressez la touche Entr&eacute;e.</b><br>
-				<a href="/cgi-bin/koha/catalogue-home.pl"> <img src="/images/front-arrow.gif" width=27 height=22
-	alt="-" hspace=0 vspace=0 border=0 align=middle >Recherche avanc&eacute;e 
-				(Plus d'ptions)</a><br>
-
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0>
-	<p>
-	<TMPL_IF NAME="loggedinuser">
-	    		<p align=left>Connect&eacute; en tant que: <TMPL_VAR NAME="loggedinuser"> 
-				  [<a href=/cgi-bin/koha/logout.pl>D&eacute;connexion</a>]</p>
-	<TMPL_ELSE>
-	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Connectez-vous</a> &agrave; Koha</p>
-	</TMPL_IF>
-	</td>
-	</form>
-  </tr>
-
-
- 
-
-<!--
-  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
-	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
-	alt="Nom d'utilisateur" hspace=0 vspace=0 border=0></td>
-
-  </tr>
-<tr valign=top >
-        <td></td>
-	<form action="/cgi-bin/member.pl" method=get >
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Num&eacute;ro de lecteur &nbsp;</font></td>
-	<td background=" " ><input type=text size="12" name="card"></td>
-
-  </tr>
-
-  <tr valign=top><td></td>
-	<td></td>
-	<td></td>
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
-	<td background=" " ><input type=password size="12" name="password"><br>
-	<input type=submit value="Envoyer"><br>
-
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0></td>
-	</font>
- </tr>
-
-  <tr valign=top >
-	<td></td>
-	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
-	alt="Inscrivez-vous" hspace=0 vspace=0 border=0></a>
-	</td>
-	<td>
-	</td>
-
-  </tr>
-
--->
-</table>
-
-</td>
-  </tr>
-</table>
-<p>
-</center>
+<HTML>
+<TITRE>WELCOME TO THE  KOHA OPAC </TITRE>
+
+
+<style type="text/css">
+<!--
+input{font-size:16px}
+-->
+
+</style>
+
+
+</HEAD>
+
+<BODY   onload="document.catsearch.keyword.focus()"
+	BGCOLOR="#339999" 
+	text="black" 
+	link="white" 
+	vlink="white" 
+	alink="#663366" 
+	leftmargin=0 
+	topmargin=0
+	marginheight=0
+	marginwidth=0 >
+
+<center>
+<table cellspacing=0 cellpadding=0 border=0 >
+	
+  <tr valign=top >
+	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
+	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
+cellspacing=0 cellpadding=0 border=0 >
+	
+  <tr valign=top >
+	<td background=" "><img src="/images/holder.gif" width=228 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=57 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=47 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=1 height=88 
+	alt=" " hspace=0 vspace=0></td>
+	<td background=" "><img src="/images/holder.gif" width=1 height=88 
+	alt=" " hspace=0 vspace=0></td>
+  </tr>
+
+  <tr valign=top >
+	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
+ 	width=1 height=30
+	alt=" " hspace=0 vspace=0><br>
+	<img src="/images/koha.gif" width=200 height=128
+	alt="Koha: Horowhenua Library Trust Catalogue et Lecteur Services" hspace=0 vspace=0></td>
+
+	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
+	alt="Rechercher dans le catalogue" hspace=0 vspace=0 border=0></a></font></td>
+
+  </tr>
+
+
+<tr valign=top >
+	<td>&nbsp; &nbsp; </td>
+	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
+	<input type=hidden name=type value=opac>
+	<td background=" " >
+
+	<input type=text size="27" name="keyword"><br>
+	</font>
+	<b>Saisir in the box et press the enter 			key.</b><br>
+	<a href="/cgi-bin/koha/catalogue-home.pl">
+      
+	<img src="/images/front-arrow.gif" width=27 height=22
+	alt="-" hspace=0 vspace=0 border=0 align=middle >Recherche avancée (plus d'options)</a><br>
+
+	<img src="/images/holder.gif" width=1 height=8
+	alt=" " hspace=0 vspace=0>
+	<p>
+	<!-- TMPL_IF NAME="loggedinuser" -->
+	    <p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Déconnecter</a>]</p>
+	<!-- TMPL_ELSE -->
+	    <p align=left><a href=/cgi-bin/koha/userpage.pl>S'identifier</a> à Koha</p>
+	<!-- /TMPL_IF -->
+	</td>
+	</form>
+  </tr>
+
+
+ 
+
+<!--
+  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
+	<td background=" "  colspan=3><img src="/images/heading-connecter.gif" width=279 		height=38
+	alt="Lecteur Identifiant" hspace=0 vspace=0 border=0></td>
+
+  </tr>
+<tr valign=top >
+        <td></td>
+	<form action="/cgi-bin/member.pl" method=get >
+	<td background=" " >
+	<font size=3 face="arial narrow,arial,helvetica">N° Carte &nbsp;</font></td>
+	<td background=" " ><input type=text size="12" name="card"></td>
+
+  </tr>
+
+  <tr valign=top><td></td>
+	<td></td>
+	<td></td>
+	<td background=" " >
+	<font size=3 face="arial narrow,arial,helvetica">Mot de passe</font></td>
+	<td background=" " ><input type=password size="12" name="password"><br>
+	<input type=submit value="OK"><br>
+
+	<img src="/images/holder.gif" width=1 height=8
+	alt=" " hspace=0 vspace=0></td>
+	</font>
+ </tr>
+
+  <tr valign=top >
+	<td></td>
+	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
+	alt="Become a Site Web Lecteur" hspace=0 vspace=0 border=0></a>
+	</td>
+	<td>
+	</td>
+
+  </tr>
+
+-->
+</table>
+
+</td>
+  </tr>
+</table>
+<p>
+</center>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl b/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl
index 7b579da90e..dbb37d6d18 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl
@@ -1,38 +1,32 @@
-<HTML>
-
-<!-- startmenu -->
-<TMPL_VAR NAME="startmenureport">
-
-<!-- the site --> <FONT SIZE=6><em>Documents en retard au <TMPL_VAR NAME="todaysdate"></em></FONT><br>
-<P>
-
-<TABLE  cellspacing=0 cellpadding=5 border=1 align=center>
-  <TR VALIGN=TOP>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Date de retour</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Lecteur</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>T&eacute;l&eacute;phone</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Titre</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Auteur</b></td>
-  </tr>
-
-  <TMPL_LOOP NAME=overdueloop>
-    <tr>
-      <td><TMPL_VAR NAME="duedate"></td>
-    <TMPL_IF NAME=email>
-      <td><a href="mailto:<TMPL_VAR NAME="email">?subject=Overdue: <TMPL_VAR NAME="title">"><TMPL_VAR NAME="name"></a></td>
-    <TMPL_ELSE>
-      <td><TMPL_VAR NAME="name"></td>
-    </TMPL_IF>
-      <td><TMPL_VAR NAME="phone"></td>
-      <td><TMPL_VAR NAME="title"></td>
-      <td><TMPL_VAR NAME="author"></td>
-    </tr>
-  </TMPL_LOOP>
-</table>
-
-
-<!-- endmenu -->
-<TMPL_VAR NAME="endmenureport">
-
-</body>
-</HTML>
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
+<!-- the site -->
+
+<h1>Ouvrages en retard depuis <!-- TMPL_VAR NAME="todaysdate" --></h1><br><P>
+
+<TABLE  cellspacing=0 cellpadding=5 border=1 align=center>
+  <TR VALIGN=TOP>
+    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Date de retour</b></td>
+    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Utilisateur</b></td>
+    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Téléphone</b></td>
+    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Titre</b></td>
+    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Auteur</b></td>
+  </tr>
+
+  <!-- TMPL_LOOP NAME=overdueloop -->
+    <tr>
+      <td><!-- TMPL_VAR NAME="duedate" --></td>
+    <!-- TMPL_IF NAME=email -->
+      <td><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Signaler retard: <!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="name" --></a></td>
+    <!-- TMPL_ELSE -->
+      <td><!-- TMPL_VAR NAME="name" --></td>
+    <!-- /TMPL_IF -->
+      <td><!-- TMPL_VAR NAME="phone" --></td>
+      <td><!-- TMPL_VAR NAME="title" --></td>
+      <td><!-- TMPL_VAR NAME="author" --></td>
+    </tr>
+  <!-- /TMPL_LOOP -->
+</table>
+
+
+<!-- endmenu -->
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl
index 8dddbf81e1..f138d64f32 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl
@@ -1,93 +1,104 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <center>
-<FONT SIZE=6><em>Page d'administration de koha</em></FONT><br>
-<table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<th>Paramètres </th>
+<h1>Paramètres</h1><br>
+<table width="100%" cellspacing=0 cellpadding=5 border=1>
+<tr background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
+	<th>Paramètres système </th>
 </tr>
 </table>
-
-<table cellspacing=5 cellpadding=1 width=90%>
-<th colspan=2>En rapport avec les bibliographies</th>
+<table cellspacing=0 cellpadding=1 width="80%">
+<tr>
+<th colspan=2>Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne</th>
+</tr>
+<tr>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/branches.pl>Annexes</a></td>
+	<td>Les différentes annexes que vous gérez avec ce serveur Koha.</td>
+</tr>
+<tr><td>&nbsp;</td></tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/itemtypes.pl>Types d'exemplaires</a></td>
-	<td>Les supports physiques d'un exemplaire</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/aqbookfund.pl>Comptes</a></td>
+	<td>Administration des comptes. N'oubliez pas d'éditer vos comptes avant de commencer à éditer les budgets..</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/aqbookfund.pl>Fonds</a></td>
-	<td>Les différents fonds et leurs budgets</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/currency.pl>Monnaies</a></td>
+	<td>Définir taux de change.</td>
+</tr>
+<tr><td>&nbsp;</td></tr>
+<tr>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/itemtypes.pl>Categ. ouvrages</a></td>
+	<td>Définir types de document.</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/charges.pl>Amendes</a></td>
-	<td>Les amendes en fonction du type d'exemplaire et du type de lecteur.</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/categorie.pl>Catégories d'emprunteurs</a></td>
+	<td>Définir catégories d'emprunteurs.</td>
 </tr>
+<tr>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/charges.pl>Frais</a></td>
+	<td>Frais en fonction du type de document / de lecteur.</td>
+</tr>
+<tr><td>&nbsp;</td></tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/authorised_values.pl>Valeurs autorisées</a></td>
-	<td>Les différentes catégories et les valeurs autorisées pour chaque catégorie.
-	Les valeurs autorisées sont utilisées dans la saisie des notices MARc pour faciliter la saisie.</td>
+	<td>Définir des catégories et des valeurs autorisées pour eux. Les valeurs autorisées sont utilisées pour aider à l'édition des notices MARC..</td>
 </tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/thesaurus.pl>Thésaurus</a></td>
-	<td>Gestion du thésaurus. Vous pouvez définir autant de thésaurus que nécessaires au travers de la définition de "catégories" de thésaurus</td>
+	<td>Gestion du thésaurus et des fichiers autorités.</td>
 </tr>
-
-<th colspan=2>MARC</th>
-<tr><td valign="top" width="25%"><a href=/cgi-bin/koha/admin/marctagstructure.pl>Structure MARC</a></td><td>La structure MARC : les champs et les sous champs</td></tr>
-<tr><td valign="top" width="25%"><a href=/cgi-bin/koha/admin/koha2marclinks.pl>Liens koha - structure MARC</a></td><td>Les liens entre la base "standard" de koha et la base MARC. Notez que ces liens peuvent être définis depuis la structure MARC. Cet utilitaire est un raccourci pour valider et corriger les liens</td></tr>
-<tr><td valign="top" width="25%"><a href=/cgi-bin/koha/admin/checkmarc.pl>Vérifier la structure MARC</a></td><td>Vérifie la structure MARC. <b>UTILISEZ-LE</b> avant de travailler avec des données réelles. Il vous indiquera les erreurs de configuration qui CASSENT la cohérence de la base de données</td></tr>
-
-<th colspan=2>Divers</th>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/branches.pl>Annexes</a></td>
-	<td>Les différentes annexes gérées par ce serveur koha</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/marctagstructure.pl>Structure des étiquettes MARC</a></td>
+	<td>structure MARC: étiquettes puis sous-champs.</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/categorie.pl>catégories</a></td>
-	<td>Les différents types de lecteurs</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/koha2marclinks.pl>Liens Koha - base de données MARC</a></td>
+	<td>Définir les liens entre les bases de données standards Koha et MARC. Ces liens peuvent être définis à partir de la structure MARC. Cet outil est simplement un raccourci pour accélérer la création des liens..</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/currency.pl>Monnaies</a></td>
-	<td>Les monnaies des fournisseurs</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/checkmarc.pl>Vérification MARC</a></td>
+	<td>Contrôle la structure MARC. A utiliser avant de travailler avec de vraies données. Cela permet de mettre en évidence les erreurs qui peuvent corrompre la base de données.</td></tr>
+
+<tr>
+<th colspan=2>Divers paramètres</th>
 </tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/printers.pl>Imprimantes</a></td>
-	<td>Les imprimantes (chemin UNIX)</td>
+	<td>Imprinantes (chemin UNIX).</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/stopwords.pl>Mots vides</a></td>
-	<td>Liste des mots ignorés pendant les recherches</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/stopwords.pl>Mots vide de sens</a></td>
+	<td>Mots effacés lors des recherches.</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/z3950servers.pl>serveurs Z39.50</a></td>
-	<td>Serveurs z39.50 pour rechercher des notices</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/z3950servers.pl>Serveurs Z39.50</a></td>
+	<td>serveurs à interroger pour des données MARC.</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/systempreferences.pl>Préférences systèmes</a></td>
-	<td>Les préférences systèmes.</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/systempreferences.pl>Préférences système</a></td>
+	<td>Préférences système.</td>
 </tr>
 </table>
 
-<table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<th>Utilitaires</th>
+<table width="100%" cellspacing=0 cellpadding=5 border=1>
+<tr background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
+	<th>Outils</th>
 </tr>
 </table>
-
-<table cellspacing=0 cellpadding=1 width=90%>
-<th colspan=2>Export</th>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/export/marc.pl>Export de notices</a></td>
-	<td>Export au format MARC</td>
-</tr>
-<th colspan=2>Import</th>
+<table cellspacing=5 cellpadding=1 width="80%">
+	<tr>
+	<th colspan=2> Export</th>
+	</tr>
+	<tr>
+		<td valign="top" width="25%"><a href="/cgi-bin/koha/export/marc.pl">Exporter une notice biblio MARC</a></td>
+		<td> Exporter en format MARC.</td>
+	</tr>
+	<tr>
+	<th colspan=2>Importer</th>
+	</tr>
 	<tr valign="top">
-		<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Décharger des notices MARC</a> <br/>dans le réservoir</td>
-		<td>Le réservoir est une table ou sont stockées des notices inactives.<br/>
-			Une notice MARC est stockée dans le réservoir tant qu'il n'y pas d'exemplaire correspondant. Si vous entrez l'ISBN ou le titre d'un ouvrage, il est recherché dans le réservoir.
-			S'il est trouvé, une notice active sera créée.
+		<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Charger des notices MARC dans le réservoir</a></td>
+		<td>Le réservoir est une table dans laquelle sont stockées des notices qui seront récupérées pour un catalogage rapide..
 		</td>
 	</tr>
-
 </table>
 </center>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl
index 72f6729ea3..59d774faca 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl
@@ -1,53 +1,52 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<TMPL_IF name=else>
-<FONT SIZE=6><em>Gestion du fonds documentaire</em></FONT>
-<form action="<TMPL_VAR name=scriptname>" method=post>
-	<input type=text name=searchfield value="">
-	<input type=reset name=reset value="Effacer">
-</form>
-<TMPL_IF name=search>
-	<br>
-	Votre recherche :<b><TMPL_VAR name=searchfield><b>
-	<p><br>
-</TMPL_IF>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<!-- TMPL_IF name=else -->
+<h1>Admin Compte</h1>
+<form action=<!-- TMPL_VAR name=scriptname --> method=post>
+<input type=text name=searchfield value=""><input type=reset name=reset value="effacer"></form>
+<!-- TMPL_IF name=search -->
+	<br>Votre recherche sur <b><!-- TMPL_VAR name=searchfield --><b><p><br>
+<!-- /TMPL_IF -->
 <table border=0 cellspacing=0 cellpadding=2 width="80%">
 <tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Fonds documentaire</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Nom</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Modif</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Suppr</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Compte</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Nom</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Editer</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Supprimer</b></td>
 	</tr>
-<TMPL_LOOP name="bookfund">
+<!-- TMPL_LOOP name="bookfund" -->
 	<tr valign=top bgcolor="ffffcc">
-		<td><TMPL_VAR name="bookfundid"></td>
-		<td><TMPL_VAR name="bookfundname"></td>
-		<td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-		<td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
+		<td><!-- TMPL_VAR name="bookfundid" --></td>
+		<td><!-- TMPL_VAR name="bookfundname" --></td>
+		<td><a href="<!-- TMPL_VAR name="action" -->?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" --> "><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+		<td><a href="<!-- TMPL_VAR name="action" -->?op=delete_confirm&bookfundid=<!-- TMPL_VAR name="bookfundid" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 	</tr>
 	<tr valign=top bgcolor=#99cc33>
 		<td bgcolor="#FFFFFF">&nbsp;</td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Budget</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><a href="aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add budget" border=0></a></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Budget</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><a href="aqbudget.pl?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" ALT="Add budget" border=0></a></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"></td>
 	</tr>
-	<TMPL_LOOP name="budget">
+	<!-- TMPL_LOOP name="budget" -->
 		<tr valign=top>
 			<td>&nbsp;</td>
 			<td>
-				<TMPL_VAR name="startdate"> - <TMPL_VAR name="enddate"> : <b><TMPL_VAR name="budgetamount"></b>
+				<!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" --> : <b><!-- TMPL_VAR name="budgetamount" --></b>
 			</td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
+			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<!-- TMPL_VAR name="aqbudgetid" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<!-- TMPL_VAR name="aqbudgetid" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 
 		</tr>
-	</TMPL_LOOP>
-</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP -->
 </table>
-<form action='<TMPL_VAR name=scriptname>' method=post><input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add budget" BORDER=0 ><br></form><br clear=all>
-<p>&nbsp;  </p>
-</TMPL_IF>
+<form action='<!-- TMPL_VAR name=scriptname -->' method=post>
+	<input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+	<br><input type=submit class="button" value="Ajouter un compte" title="Ajouter un compte" ALT="Ajouter un compte"><br>
+	<br></form><br clear=all>
+<p> &nbsp; </p>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="add_form">
+<!-- TMPL_IF name="add_form" -->
 <script>
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
@@ -94,69 +93,51 @@
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\n";
+			alertString2 = "Form not submitted because sur the following problem(s)\n";
 			alertString2 += "------------------------------------------------------------------------------------\n\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
 	</SCRIPT>
-<h1><TMPL_VAR name="header"></h1>
-<form action='<TMPL_VAR name="action">' name=Aform method=post>
+<h1><!-- TMPL_VAR name="header" --></h1>
+<form action='<!-- TMPL_VAR name="action" -->' name=Aform method=post>
 <input type=hidden name=op value='add_validate'>
 <input type=hidden name=checked value=0>
 <table>
-<TMPL_IF name="add_or_modify">
-<tr>
-      <td>Fonds documentaire</td>
-      <td><input type=hidden name=bookfundid value="<TMPL_VAR name="bookfundid">"><TMPL_VAR name="bookfundid"></td></tr>
-<TMPL_ELSE>
-<tr>
-      <td>Fonds documentaire</td>
-      <td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
-</TMPL_IF>
-<tr>
-      <td>Nom</td>
-      <td><input type=text name=bookfundname size=40 maxlength=80 value='<TMPL_VAR name="bookfundname" escape=HTML>'>&nbsp;</td></tr>
-<tr>
-      <td>Groupe</td>
-      <td><input type=text name=bookfundgroup value='<TMPL_VAR name="bookfundgroup">'></td></tr>
+<!-- TMPL_IF name="add_or_modify" -->
+<tr><td>Compte</td><td><input type=hidden name=bookfundid value=<!-- TMPL_VAR name="bookfundid" -->><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<!-- TMPL_ELSE -->
+<tr><td>Compte</td><td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
+<!-- /TMPL_IF -->
+<tr><td>Nom</td><td><input type=text name=bookfundname size=40 maxlength=80 value='<!-- TMPL_VAR name="bookfundname" escape=HTML -->'>&nbsp;</td></tr>
 <tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 </table>
 </form>
-</TMPL_IF> <TMPL_IF name="add_validate"> Donn&eacute;es enregistr&eacute;es 
-<form action='<TMPL_VAR name="action">' method=post>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_validate" -->
+Donnée enregistrée
+<form action='<!-- TMPL_VAR name="action" -->' method=post>
 <input type=submit value=OK>
 </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
+<!-- TMPL_IF name="delete_confirm" -->
 <table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=#99cc33>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Fonds documentaire</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="bookfundid"></b></td></tr>
-<form action='<TMPL_VAR name="action">' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=bookfundid value='<TMPL_VAR name="bookfundid">'>
-<tr>
-      <td>Nom</td>
-      <td><TMPL_VAR name="bookfundname"></td></tr><tr>
-      <td>Groupe</td>
-      <td><TMPL_VAR name="bookfundgroup"></td></tr>
-<tr>
-      <td colspan=2 align=center>CONFIRMEZ LA SUPPRESSION</td>
-    </tr>
-<tr><td>
-        <INPUT type=submit value='OUI'>
-      </form><td><form action='<TMPL_VAR name="action">' method=post>
-        <input type=submit value=NON>
-      </form></td></tr><br clear=all>
-<p>&nbsp;  </p>
-</TMPL_IF>
+<tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Compte</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="bookfundid" --></b></td></tr>
+<form action='<!-- TMPL_VAR name="action" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=bookfundid value='<!-- TMPL_VAR name="bookfundid" -->'>
+<tr><td>Nom</td><td><!-- TMPL_VAR name="bookfundname" --></td></tr>
+<tr><td colspan=2 align=center>CONFIRMER SUPPRESSION</td></tr>
+<tr><td><INPUT type=submit value='OUI'></form></td><td><form action='<!-- TMPL_VAR name="action" -->' method=post><input type=submit value=NO></form></td></tr><br clear=all>
+<p> &nbsp; </p>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirmed">
-Donnée supprimée
-<form action='<TMPL_VAR name="action">' method=post>
-	<input type=submit value=OK>
+<!-- TMPL_IF name="delete_confirmed" -->
+Donnée effacée
+<form action='<!-- TMPL_VAR name="action" -->' method=post>
+<input type=submit value=OK>
 </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="cat-bottom.inc"></table></b></b>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl
index a924c5e09d..0294473560 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl
@@ -1,38 +1,31 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-<TMPL_IF name="else">
-	<FONT SIZE=6><em>Gestion budg&eacute;taire </em></FONT>
-	<form action=/cgi-bin/koha/admin/aqbudget.pl method=post>
-	<input type=text name=searchfield value="">
-	<input type=reset name=reset value="effacer">
-	</form>
-	<TMPL_IF name=search>
-		<br>
-		Votre recherche <b><TMPL_VAR name=searchfield><b>
-		<p><br>
-	</TMPL_IF>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
+<!-- TMPL_IF name="else" -->
+	<h1>Admin Budget</h1><form action=/cgi-bin/koha/admin/aqbudget.pl method=post>
+	<input type=text name=searchfield value=""><input type=reset name=reset value="effacer"></form>
+	<!-- TMPL_IF name=search -->
+	<br>Votre recherche sur <b><!-- TMPL_VAR name=searchfield --><b><p><br>
+	<!-- /TMPL_IF -->
 	<table border=0 cellspacing=0 cellpadding=5>
-		<tr valign=top bgcolor=#99cc33>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Fonds documentaire</b></td>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Date de d&eacute;but</b></td>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Date de fin</b></td>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Montant du budget</b></td>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td><td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td>
-		</tr>
-		<TMPL_LOOP name="budget">
-		<tr valign=top bgcolor="<TMPL_VAR name="toggle">">
-			<td><TMPL_VAR name="aqbudgetid"> (<TMPL_VAR name="bookfundname">)</td>
-			<td><TMPL_VAR name="startdate"></td>
-			<td><TMPL_VAR name="enddate"></td>
-			<td><TMPL_VAR name="budgetamount"></td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetdid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
+	<tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Compte</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Date de début</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Date de fin</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Montant budget</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td></tr>
+	<!-- TMPL_LOOP name="budget" -->
+		<tr valign=top bgcolor=<!-- TMPL_VAR name="toggle" --> >
+			<td><!-- TMPL_VAR name="bookfundid" --> (<!-- TMPL_VAR name="bookfundname" -->)</td>
+			<td><!-- TMPL_VAR name="startdate" --></td>
+			<td><!-- TMPL_VAR name="enddate" --></td>
+			<td align=right><!-- TMPL_VAR name="budgetamount" --></td>
+			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&bookfundid=<!-- TMPL_VAR name="bookfundid" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 		</tr>
-		</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	</table>
-	<form action='/cgi-bin/koha/admin/aqbudget.pl' method=post><input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add budget" BORDER=0 ><br></form><br clear=all>
-</TMPL_IF>
+	<form action='/cgi-bin/koha/admin/aqbudget.pl' method=post>
+	<input type=hidden name=op value=add_form>
+	<br><input type=submit class="button" value="Ajouter Budget" title="Ajouter Budget" ALT="Ajouter Budget"><br>
+	</form><br clear=all>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="add_form">
+<!-- TMPL_IF name="add_form" -->
 <script>
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
@@ -70,90 +63,87 @@
 		var ok=1;
 		var _alertString="";
 		var alertString2;
-
 		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
-			_alertString += "- Budget absent\n";
+			_alertString += "- Budget missing\n";
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "formulaire invalide en raison des erreurs suivante\n";
+			alertString2 = "Form not submitted because sur the following problem(s)\n";
 			alertString2 += "------------------------------------------------------------------------------------\n\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
 	</SCRIPT>
-<h1><TMPL_VAR name="header"></h1>
+<h1><!-- TMPL_VAR name="header" --></h1>
 <form action='/cgi-bin/koha/admin/aqbudget.pl' name=Aform method=post>
 <input type=hidden name=op value=add_validate>
 <input type=hidden name=checked value=0>
 <table>
-<TMPL_IF name="modify">
-<tr>
-      <td>Fonds documentaire</td>
-      <td><input type=hidden name=bookfundid value=<TMPL_VAR name=bookfundid>><TMPL_VAR name="aqbudgetid"></td>
-</tr>
-<tr>
-      <td>Fonds documentaire</td>
-      <td><TMPL_VAR name="bookfundname"></td></tr>
-</TMPL_IF>
-<TMPL_IF name="adding">
-	<tr><td>fonds</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<TMPL_VAR name="bookfundid">"><TMPL_VAR name="bookfundid"></td></tr>
-</TMPL_IF>
-<tr>
-      <td>Date de d&eacute;but (<TMPL_VAR NAME=dateformat>)</td>
-      <td><input type=text name=startdate size=20 maxlength=14 value='<TMPL_VAR name="startdate">'>&nbsp;</td></tr>
-<tr>
-      <td>Date de fin (<TMPL_VAR NAME=dateformat>)</td>
-      <td><input type=text name=enddate size=20 maxlength=14 value='<TMPL_VAR name="enddate">'></td></tr>
-<tr>
-      <td>Montant du budget</td>
-      <td><input type="hidden" name="aqbudgetid" value="<TMPL_VAR name="aqbudgetid">"><input type=text name=budgetamount value='<TMPL_VAR name="budgetamount">'></td></tr>
-<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
+
+<!-- TMPL_IF name="modifier" -->
+	<tr><td>Compte</td><td><input type=hidden name=bookfundid value=<!-- TMPL_VAR name=bookfundid -->><!-- TMPL_VAR name="bookfundid" --></td></tr>
+	<tr><td>Nom de compte</td><td><!-- TMPL_VAR name="bookfundname" --></td></tr>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="adding" -->
+	<tr><td>Comptes</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<!-- /TMPL_IF -->
+
+<tr><td>Date de début <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
+<tr><td>Date de fin <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=enddate size=11 value='<!-- TMPL_VAR name="enddate" -->'></td></tr>
+<tr><td>Montant budget</td><td><input type=text name=budgetamount value='<!-- TMPL_VAR name="budgetamount" -->'></td></tr>
+<tr><td>&nbsp;</td><td><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->"><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 </table>
 </form>
 <br clear=all>
-<p>&nbsp;  </p>
-</TMPL_IF> <TMPL_IF name="add_validate"> Donn&eacute;es enregistr&eacute;es 
-<form action='<TMPL_VAR name="action">' method=post>
+<p> &nbsp; </p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_validate" -->
+Donnée enregistrée
+<form action='<!-- TMPL_VAR name="action" -->' method=post>
 <input type=submit value=OK>
 </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
+<!-- TMPL_IF name="delete_confirm" -->
 <table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=#99cc33>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Budget</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="aqbudgetid"></b></td></tr>
-<form action='<TMPL_VAR name="action">' method=post>
-	<input type="hidden" name="op" value="delete_confirmed">
-	<input type="hidden" name="aqbudgetid" value='<TMPL_VAR name="aqbudgetid">'>
-<tr>
-      <td>Date de d&eacute;but</td>
-      <td><TMPL_VAR name="startdate"></td></tr>
-<tr>
-      <td>Date de fin</td>
-      <td><TMPL_VAR name="enddate"></td></tr>
-<tr>
-      <td>Montant du budget</td>
-      <td><TMPL_VAR name="budgetamount"></td></tr>
-<tr>
-      <td colspan=2 align=center>CONFIRMEZ LA SUPPRESSION</td>
-    </tr>
-<tr><td>
-        <INPUT type=submit value='OUI'>
-      </form><td><form action='<TMPL_VAR name="action">' method=post>
-        <input type=submit value=NON>
-      </form></td></tr>
-</TABLE>
-</TMPL_IF>
+	<tr valign=top bgcolor=#99cc33>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
+			<b>Compte</b>
+		</td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
+			<b><!-- TMPL_VAR name="bookfundid" --></b>
+		</td>
+	</tr>
+
+	<form action='<!-- TMPL_VAR name="action" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=aqbudgetid value='<!-- TMPL_VAR name="aqbudgetid" -->'>
+	<tr>
+		<td>Date de début</td>
+		<td><!-- TMPL_VAR name="startdate" --></td>
+	</tr>
+	<tr>
+		<td>Date de fin</td><td><!-- TMPL_VAR name="enddate" --></td>
+	</tr>
+	<tr>
+		<td>budgetamount</td><td><!-- TMPL_VAR name="budgetamount" --></td>
+	</tr>
+	<tr>
+		<td colspan=2 align=center>CONFIRMER SUPPRESSION</td>
+	</tr>
+	<tr>
+		<td><INPUT type=submit value='OUI'></form></td><td><form action='<!-- TMPL_VAR name="action" -->' method=post><input type=submit value=NO></form></td>
+	</tr>
+</table>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirmed">
-Donnée supprimée
-<form action='<TMPL_VAR name="action">' method=post>
+<!-- TMPL_IF name="delete_confirmed" -->
+Donnée effacée
+<form action='<!-- TMPL_VAR name="action" -->' method=post>
 <input type=submit value=OK>
 </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc"></table></b></b>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl
index 1764a31c8e..9df2a07e19 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl
@@ -1,111 +1,104 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF name="add_form">
+<!-- TMPL_IF name="add_form" -->
 <!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
+	<H1><!-- TMPL_VAR name="action" --></H1>
+	<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
 	<input type=hidden name=op value='add_validate'>
 	<table>
 	<tr>
-
-      <td>Cat&eacute;gorie</td>
-		<td><TMPL_VAR name="category"></td>
+		<td>Catégorie</td>
+		<td><!-- TMPL_VAR name="category" --></td>
 	</tr>
 	<tr>
-
-      <td>Valeur autoris&eacute;e</td>
-		<td><input type=text name="authorised_value" value='<TMPL_VAR name="authorised_value" escape=HTML>'></td>
+		<td>Valeur autorisée</td>
+		<td><input type=text name="authorised_value" value='<!-- TMPL_VAR name="authorised_value" escape=HTML -->'></td>
 	</tr>
 	<tr>
 		<td>Lib</td>
-		<td><input type=text name="lib" value='<TMPL_VAR name="lib">'></td>
+		<td><input type=text name="lib" value='<!-- TMPL_VAR name="lib" -->'></td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type="hidden" name="id" value="<TMPL_VAR name="id">">
+		<td><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->">
 			<INPUT type="submit" value='OK'></td>
 	</tr>
 	</table>
 	</form>
-</TMPL_IF>
-<TMPL_IF name="delete_confirm">
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name="delete_confirm" -->
 <!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=5>
+<table border=0 cellspacing=0 cellpadding=2>
 	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Variable</b></td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Lib</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
 	</tr>
-	<tr>
-    <td>Valeur</td>
-    <td><TMPL_VAR name="Tvalue"></td></tr>
-	<form action='<TMPL_VAR name="script_name">' method=post>
+	<tr><td>Valeur</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 		<input type=hidden name=op value=delete_confirmed>
-		<input type=hidden name=id value='<TMPL_VAR name="id">'>
-		<input type="hidden" name="searchfield" value="<TMPL_VAR name="searchfield">">
-	<tr>
-      <td colspan=2 align=center>CONFIRMEZ LA SUPPRESSION</td>
-    </tr>
-	<tr><td>
-        <INPUT type=submit value='OUI'>
-      </form>
-		<td><form action='<TMPL_VAR name="script_name">' method=post>
-        <input type=submit value=NON>
-      </form></td></tr>
-</TMPL_IF>
+		<input type=hidden name=id value='<!-- TMPL_VAR name="id" -->'>
+		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->">
+	<tr><td colspan=2 align=center>CONFIRMER SUPPRESSION</td></tr>
+	<tr><td><INPUT type=submit value='OUI'></form></td>
+		<td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
+<!-- /TMPL_IF -->
 
 <!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>Gestion des valeurs autorisées</em></font>
-<p>Cette table est utilisée pour la définition MARC. Vous pouvez définir autant de catégories que vous le souhaitez et autant de valeurs autorisées voulues dans chaque catégorie.</p>
-<p>Lorsque vous définissez la structure de sous-champ MARC, il est possible de faire un lien entre le sous-champ et une valeur autorisée. Lorsque l'utilisateur demande à ajouter ou à modifier une notice le sous-champ
-n'est pas renseigné par un champ vide mais par une liste de valeurs autorisées.</p>
+<!-- TMPL_IF name="else" -->
+<h1>Admin Valeurs autorisées</h1>
+<p>Cette table est utilisée dans les définitions MARC. Vous pouvez définir autant de catégories et autant de valeurs autorisées pour chaque catégorie que vous voulez.</p>
+<p>Quand vous définissez la structure des sous-champs MARC, vous pouvez lier un sous-champ à une catégorie de valeurs autorisées. Quand l'utilisateur ajoute ou modifie une notice biblio, la valeur du sous-champ n'est pas libre, mais doit appartenir à la liste des valeurs autorisées.</p>
 <form action=/cgi-bin/koha/admin/authorised_values.pl method=post>
-	<TMPL_VAR name="tab_list"><input type="submit" value="OK">   <a href="authorised_values.pl?op=add_form">Nouvelle catégorie...</a>
+	<!-- TMPL_VAR name="tab_list" --><input type="submit" value="OK">   <a href="authorised_values.pl?op=add_form">Nouvelle catégorie...</a>
 </form>
-<TMPL_VAR name="searchfield">
-<table border=0 cellspacing=0 cellpadding=5>
+<!-- TMPL_VAR name="searchfield" -->
+<table border=0 cellspacing=0 cellpadding=2 width="80%">
 <tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Catégorie</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Valeur autorisée</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td>
-<TMPL_LOOP name="loop">
-</tr valign=top bgcolor='><TMPL_VAR name="bgcolor">'>
-	<td><TMPL_VAR name="Category"></td>
-	<td><TMPL_VAR name="Authorised_value"></td>
-	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
-	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Catégorie</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Valeur autorisée</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Editer</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Supprimer</b></td>
+<!-- TMPL_LOOP name="loop" -->
+</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+	<td><!-- TMPL_VAR name="category" --></td>
+	<td><!-- TMPL_VAR name="authorised_value" --></td>
+	<td><!-- TMPL_VAR name="lib" --></td>
+	<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+	<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 </tr>
-</TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
+<!-- /TMPL_LOOP -->
+<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 <input type=hidden name=op value=add_form>
-</form></table>
+</table>
 
 <table width=40%>
 	<tr>
 		<td width=50%>
-			<TMPL_IF name="isprevpage">
-				<a href="<TMPL_VAR name="script_name">?offset=<TMPL_VAR name="prevpage">&searchfield=<TMPL_VAR name="searchfield">">
-				<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
+			<!-- TMPL_IF name="isprevpage" -->
+				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="prevpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
+				<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
 				</a>
-			</TMPL_IF>
+			<!-- /TMPL_IF -->
 		</td>
 		<td width=50%>
-			<TMPL_IF name="nextpage">
-				<a href="<TMPL_VAR name="script_name">?offset=<TMPL_VAR name="nextpage">&searchfield=<TMPL_VAR name="searchfield">">
-					<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
+			<!-- TMPL_IF name="nextpage" -->
+				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="nextpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
+					<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
 				</a>
-			</TMPL_IF>
+			<!-- /TMPL_IF -->
 		</td>
 	</tr>
 </table>
-
-<form action='<TMPL_VAR name="script_name">' method=post>
+<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 <input type="hidden" name="op" value="add_form">
-<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-<br><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" border="0"><br>
+<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+<br><input type=submit class="button" value="Ajouter une valeur autorisée" title="Ajouter une valeur autorisée" ALT="Ajouter une valeur autorisée"><br>
 </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
-</table>
+
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
index 6c128298e9..59d835793e 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
@@ -1,82 +1,83 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF name="add">
-	<form action='<TMPL_VAR name=action>' name=Aform method=post>
-		<input type=hidden name=op value='add_validate'>
-		<table>
-			<tr>
-				<td>Code annexe</td>
-				<td>
-					<TMPL_IF name="branchcode">
-						<input type=hidden name=branchcode value='<TMPL_VAR name=branchcode escape="HTML">'>
-						<TMPL_VAR name="branchcode">
-					<TMPL_ELSE>
-						<input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode escape="HTML">'>
-					</TMPL_IF>
-				</td>
-			</tr>
-			<tr>
-				<td>Nom</td>
-				<td><input type=text name=branchname size=40 maxlength=80 value='<TMPL_VAR name=branchname escape=HTML>'}'>&nbsp;</td>
-			</tr>
-			<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-			<tr>
-				<td>
-						<TMPL_LOOP name="categoryloop">
-							<tr>
-								<td><TMPL_VAR name=categoryname></td>
-								<td><INPUT TYPE="checkbox" NAME="<TMPL_VAR name=categorycode>" <TMPL_VAR name=checked>><TMPL_VAR name=codedescription></td>
-							</tr>
-						</TMPL_LOOP>
-				</td>
-			</tr>
-			<tr>
-				<td>Adresse</td>
-				<td><input type=text name=branchaddress1 value='<TMPL_VAR name=branchaddress1>'></td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td><td><input type=text name=branchaddress2 value='<TMPL_VAR name=branchaddress2>'></td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td><td><input type=text name=branchaddress3 value='<TMPL_VAR name=branchaddress3>'></td>
-			</tr>
-			<tr>
-				<td>T&eacute;l&eacute;phone</td>
-				<td><input type=text name=branchphone value='<TMPL_VAR name=branchphone>'></td>
-			</tr>
-			<tr>
-				<td>Fax</td>
-				<td><input type=text name=branchfax value='<TMPL_VAR name=branchfax>'></td>
-			</tr>
-			<tr>
-				<td>E-mail</td>
-				<td><input type=text name=branchemail value='<TMPL_VAR name=branchemail>'></td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td><input type=submit value='Envoyer'></td>
-			</tr>
-		</table>
-	</form>
-</TMPL_IF>
-<TMPL_IF name="delete_confirm"> Confirmez la suppression :
-	<form action='<TMPL_VAR name=action>' method=post>
+<!-- TMPL_IF name="add" -->
+
+<h1><!-- TMPL_VAR name=head --></h1><br>
+<form action='<!-- TMPL_VAR name=action -->' name=Aform method=post>
+<input type=hidden name=op value='add_validate'>
+<table>
+	<tr>
+		<td>Code Annexe</td>
+		<td>
+			<!-- TMPL_IF name="branchcode" -->
+				<input type=hidden name=branchcode value='<!-- TMPL_VAR name=branchcode escape="HTML" -->'>
+				<!-- TMPL_VAR name="branchcode" -->
+			<!-- TMPL_ELSE -->
+				<input type=text name=branchcode size=5 maxlength=5 value='<!-- TMPL_VAR name=branchcode escape="HTML" -->'>
+			<!-- /TMPL_IF -->
+		</td>
+	</tr>
+	<tr>
+		<td>Nom</td>
+		<td><input type=text name=branchname size=40 maxlength=80 value="<!-- TMPL_VAR name=branchname escape="HTML" -->">&nbsp;</td>
+	</tr>
+
+	<tr>
+		<td><!-- TMPL_LOOP name="categoryloop" -->
+					<tr>
+						<td><!-- TMPL_VAR name=categoryname --></td>
+						<td><INPUT TYPE="checkbox" NAME="<!-- TMPL_VAR name=categorycode -->" <!-- TMPL_VAR name=checked -->><!-- TMPL_VAR name=codedescription --></td>
+					</tr>
+				<!-- /TMPL_LOOP -->
+		</td>
+	</tr>
+	<tr>
+		<td>Adresse</td>
+		<td><input type=text name=branchaddress1 value='<!-- TMPL_VAR name=branchaddress1 escape="HTML" -->'></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td><input type=text name=branchaddress2 value='<!-- TMPL_VAR name=branchaddress2 escape="HTML" -->'></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td><input type=text name=branchaddress3 value='<!-- TMPL_VAR name=branchaddress3 escape="HTML" -->'></td>
+	</tr>
+	<tr>
+		<td>Téléphone</td>
+		<td><input type=text name=branchphone value='<!-- TMPL_VAR name=branchphone escape="HTML" -->'></td>
+	</tr>
+	<tr>
+		<td>Fax</td>
+		<td><input type=text name=branchfax value='<!-- TMPL_VAR name=branchfax escape="HTML" -->'></td>
+	</tr>
+	<tr>
+		<td>E-mail</td>
+		<td><input type=text name=branchemail value='<!-- TMPL_VAR name=branchemail escape="HTML" -->'></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td><input type=submit value='Enregistrer' class="button"></td>
+	</tr>
+</table>
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirm" -->
+	Confirmer suppression:
+	<form action='<!-- TMPL_VAR name=action -->' method=post>
 		<input type='hidden' name='op' value='delete_confirmed'>
-		<input type='hidden' name='branchcode' value="<TMPL_VAR name=branchcode>">
-		<TMPL_VAR name=branchcode>
-		<input type=submit value=OUI>
+		<input type='hidden' name='branchcode' value=<!-- TMPL_VAR name=branchcode escape="HTML" -->>
+		<input type="submit" value="OUI" class="button">
 	</form>
-	<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value=''>
-		<input type=submit value=NON>
+	<form action='<!-- TMPL_VAR name=action -->' method=post><input type='hidden' name='op' value=''>
+		<input type="submit" value="NO" class="button">
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="else">
-	<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-	<font color='red'><TMPL_VAR name="message"></font>
-	<form action="<TMPL_VAR name=action>" method=post><input type='hidden' name='op' value='add'>
-		<input type=submit value='Ajouter une nouvelle annexe'>
-	</form>
+<!-- TMPL_IF name="else" -->
+	<h1><!-- TMPL_VAR name=head --></h1><br>
+	<font color='red'><!-- TMPL_VAR name="message" --></font>
 	<table border='1' cellpadding='5' cellspacing='0'>
 		<tr>
 			<th colspan='6' align='left' bgcolor='#99cc33'>
@@ -87,135 +88,146 @@
 			<td width='175'><b>Nom</b></td>
 			<td width='25'><b>Code</b></td>
 			<td width='175'><b>Adresse</b></td>
-			<td width='175'><b>Cat&eacute;gories</b></td>
+			<td width='175'><b>Catégories</b></td>
 			<td width='50'><b>&nbsp;</b></td>
 			<td width='50'><b>&nbsp;</b></td>
 		</tr>
-		<TMPL_LOOP name="branches">
-			<tr bgcolor='<TMPL_VAR name=color>'>
-				<td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
-				<td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
+		<!-- TMPL_LOOP name="branches" -->
+			<tr bgcolor='<!-- TMPL_VAR name=color -->'>
+				<td align='left' valign='top'><!-- TMPL_VAR name=branch_name escape="HTML" --></td>
+				<td align='left' valign='top'><!-- TMPL_VAR name=branch_code escape="HTML" --></td>
 				<td align='left' valign='top'>
-					<TMPL_IF name=address-empty-p>
-						(nothing entered)
-					<TMPL_ELSE>
-					<TMPL_IF name=branchaddress1>
-						<TMPL_VAR name=branchaddress1 escape="HTML"></TMPL_IF>
-					<TMPL_IF name=branchaddress2>
-						<br><TMPL_VAR name=branchaddress2 escape="HTML"></TMPL_IF>
-					<TMPL_IF name=branchaddress3>
-						<br><TMPL_VAR name=branchaddress3 escape="HTML"></TMPL_IF>
-					<TMPL_IF name=branchphone>
-						<br>Ph: <TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
-					<TMPL_IF name=branchfax>
-						<br>Fax: <TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
-					<TMPL_IF name=branchemail>
-						<br>Email: <TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
-					</TMPL_IF>
+					<!-- TMPL_IF name=address-empty-p -->
+						(pas de saisie)
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_IF name=branchaddress1 -->
+							<!-- TMPL_VAR name=branchaddress1 escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name=branchaddress2 -->
+							<br><!-- TMPL_VAR name=branchaddress2 escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name=branchaddress3 -->
+							<br><!-- TMPL_VAR name=branchaddress3 escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name=branchphone -->
+							<br>Tél.: <!-- TMPL_VAR name=branchphone escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name=branchfax -->
+							<br>Fax: <!-- TMPL_VAR name=branchfax escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name=branchemail -->
+							<br>E-mail: <!-- TMPL_VAR name=branchemail escape="HTML" --><!-- /TMPL_IF -->
+					<!-- /TMPL_IF -->
 				</td>
 				<td align='left' valign='top'>
-					<TMPL_IF name=no-categories-p>
-						(no categories set)
-					<TMPL_ELSE>
-						<TMPL_LOOP name=category_list>
-							<TMPL_VAR name=categoryname><br>
-						</TMPL_LOOP>
-					</TMPL_IF>
+					<!-- TMPL_IF name=no-categories-p -->
+						(pas de catégorie définie)
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_LOOP name=category_list -->
+							<!-- TMPL_VAR name=categoryname --><br>
+						<!-- /TMPL_LOOP -->
+					<!-- /TMPL_IF -->
 				</td>
 				<td align='left' valign='top'>
-					<form action='<TMPL_VAR name=action>' method=post>
-						<input type='hidden' name='op' value='edit'>
-						<input type='hidden' name='branchcode' value='<TMPL_VAR name=value>'>
-						<input type=submit value="Modifier" class="button">
+					<form action='<!-- TMPL_VAR name=action -->' method=post>
+					<input type='hidden' name='op' value='edit'>
+					<input type='hidden' name='branchcode' value='<!-- TMPL_VAR name=value escape="HTML" -->'>
+					<input type=submit value="Edit" class="button">
 					</form>
 				</td>
 				<td align='left' valign='top'>
-					<form action='<TMPL_VAR name=action>' method=post>
-						<input type='hidden' name='branchcode' value='<TMPL_VAR name=value>'>
-						<input type='hidden' name='op' value='delete'>
-						<input type=submit value="Supprimer" class="button">
+					<form action='<!-- TMPL_VAR name=action -->' method=post>
+					<input type='hidden' name='branchcode' value='<!-- TMPL_VAR name=value escape="HTML" -->'>
+					<input type='hidden' name='op' value='delete'><input type=submit value="Delete" class="button">
 					</form>
 				</td>
 			</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
+	<br>
+	<form action=<!-- TMPL_VAR name=action --> method=post>
+		<input type='hidden' name='op' value='add'>
+		<input type=submit class="button" value='Ajouter une nouvelle annexe'>
+	</form>
+
 	<br>
 	<table border='1' cellpadding='5' cellspacing='0'>
-		<tr>
+	<tr>
 		<th colspan='5' align='left' bgcolor='#99cc33'>
-			<font size='5'><b>Cat&eacute;gories d'annexes</b></font></th>
-		</tr>
-		<tr bgcolor='#889999'>
-			<td width='175'><b>Nom</b></td>
-			<td width='25'><b>Code</b></td>
-			<td width='200'><b>Description</b></td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
+			<font size='5'><b>Catégories Annexes</b></font>
+		</th>
+	</tr>
+	<tr bgcolor='#889999'>
+		<td width='175'><b>Nom</b></td>
+		<td width='25'><b>Code</b></td>
+		<td width='200'><b>Description</b></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<!-- TMPL_LOOP name="branchcategories" -->
+		<tr bgcolor='<!-- TMPL_VAR name="color" -->'>
+		<td align='left' valign='top'><!-- TMPL_VAR name=categoryname --></td>
+		<td align='left' valign='top'><!-- TMPL_VAR name=categorycode --></td>
+		<td align='left' valign='top'><!-- TMPL_VAR name=codedescription --></td>
+		<td align='left' valign='top'>
+			<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="Edit" class="button">
+			</form>
+		</td>
+		<td align='left' valign='top'>
+			<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="Delete" class="button">
+			</form>
+		</td>
 		</tr>
-			<TMPL_LOOP name="branchcategories">
-				<tr bgcolor='<TMPL_VAR name="color">'>
-				<td align='left' valign='top'><TMPL_VAR name=categoryname></td>
-				<td align='left' valign='top'><TMPL_VAR name=categorycode></td>
-				<td align='left' valign='top'><TMPL_VAR name=codedescription></td>
-				<td align='left' valign='top'>
-					<form action='<TMPL_VAR name=action>' method=post>
-					<input type='hidden' name='op' value='editcategory'>
-					<input type='hidden' name='branchcode' value='<TMPL_VAR name=categorycode escape="HTML">'>
-					<input type=submit value="Modifier" class="button">
-					</form>
-				</td>
-				<td align='left' valign='top'>
-					<form action='<TMPL_VAR name=action>' method=post>
-					<input type='hidden' name='branchcode' value='<TMPL_VAR name=categorycode escape="HTML">'>
-					<input type='hidden' name='op' value='deletecategory'><input type=submit value="Supprimer" class="button">
-					</form>
-				</td>
-				</tr>
-			</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	</table>
-</TMPL_IF>
+	<br />
+	<form action=<!-- TMPL_VAR name=action --> method=post>
+		<input type='hidden' name='op' value='editcategory'>
+		<input type=submit class="button" value='Ajouter une nouvelle catégorie'>
+	</form>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="editcategory">
-	<h1><TMPL_VAR name=head></h1><br>
-	<form action='<TMPL_VAR name=action>' name=Aform method=post>
+<!-- TMPL_IF name="editcategory" -->
+	<h1><!-- TMPL_VAR name=head --></h1><br>
+	<form action='<!-- TMPL_VAR name=action -->' name=Aform method=post>
 	<input type=hidden name=op value='addcategory_validate'>
 	<table>
 		<tr>
-			<td>Code cat&eacute; annexe</td>
+			<td>Code Catégorie</td>
 			<td>
-				<TMPL_IF name="categorycode">
-					<input type=hidden name=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">'>
-				</TMPL_IF>
+				<!-- TMPL_IF name="categorycode" -->
+					<input type=hidden name=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" -->'>
+				<!-- /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">">&nbsp;</td>
+			<td><input type=text name=categoryname size=40 maxlength=80 value="<!-- TMPL_VAR name=categoryname escape="HTML" -->">&nbsp;</td>
 		</tr>
 		<tr>
 			<td>Description</td>
-			<td><input type="text" name="codedescription" size=40 maxlength=80 value="<TMPL_VAR name="codedescription" escape="HTML">">&nbsp;</td>
+			<td><input type="text" name="codedescription" size=40 maxlength=80 value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->">&nbsp;</td>
 		</tr>
 		<tr>
 			<td colspan=2 align="center"><input type="submit" value="OK" class="button"></td>
 		</tr>
 	</table>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_category">
-	Confirmer suppression :
-	<form action='<TMPL_VAR name=action>' method=post>
+<!-- TMPL_IF name="delete_category" -->
+	Confirmer suppression:
+	<form action='<!-- TMPL_VAR name=action -->' method=post>
 		<input type='hidden' name='op' value='categorydelete_confirmed'>
-		<input type='hidden' name='categorycode' value='<TMPL_VAR name=categorycode escape="HTML">'>
+		<input type='hidden' name='categorycode' value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
 		<input type="submit" value="OUI" class="button">
 	</form>
-	<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value=''>
-		<input type="submit" value="NON" class="button">
+	<form action='<!-- TMPL_VAR name=action -->' method=post><input type='hidden' name='op' value=''>
+		<input type="submit" value="NO" class="button">
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl
index fa07cb0c0f..8bc60fbd30 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl
@@ -1,6 +1,6 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF NAME=add_form>
+<!-- TMPL_IF NAME=add_form -->
 	<script>
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
@@ -39,19 +39,19 @@
 		var _alertString="";
 		var alertString2;
 		if (f.categorycode.value.length==0) {
-			_alertString += "- code catégorie absent\n";
+			_alertString += "- categorycode missing\n";
 		}
 //		alert(window.document.Aform.description.value);
 		if (!(isNotNull(window.document.Aform.description,1))) {
-			_alertString += "- description absente\n";
+			_alertString += "- description missing\n";
 		}
 		if (!isNum(f.upperagelimit,0)) {
-			_alertString += "- l'age maxi n'est pas un nombre\n";
+			_alertString += "- upperagelimit is not a number\n";
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Saisie non valide pour les raisons suivantes\n";
+			alertString2 = "Form not submitted because sur the following problem(s)\n";
 			alertString2 += "------------------------------------------------------------------------------------\n\n";
 			alertString2 += _alertString;
 			alert(alertString2);
@@ -59,83 +59,84 @@
 	}
 	</SCRIPT>
 
-	<TMPL_IF NAME=categorycode>
-		<h1>Modifier categorie</h1>
-	<TMPL_ELSE>
-		<h1>Ajouter categorie</h1>
-	</TMPL_IF>
-
-	<form action=<TMPL_VAR NAME=script_name> name=Aform method=post>
+	<!-- TMPL_IF NAME=categorycode -->
+		<h1>Modifier Catégorie</h1>
+	<!-- TMPL_ELSE -->
+		<h1>Ajouter une catégorie</h1>
+	<!-- /TMPL_IF -->
+	
+	<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>
 
 	<table>
-	<TMPL_IF NAME=categorycode>
+	<!-- TMPL_IF NAME=categorycode -->
 		<tr>
-			<td>Code cat&eacute;gorie</td>
+			<td>Code Catégorie</td>
 			<td>
-				<input type=hidden name=categorycode value=<TMPL_VAR NAME=categorycode>>
+				<b><!-- TMPL_VAR NAME=categorycode --></b>
+				<input type=hidden name=categorycode value=<!-- TMPL_VAR NAME=categorycode -->>
 			</td>
 		</tr>
-	<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 		<tr>
-			<td>Code cat&eacute;gorie</td>
+			<td>Code Catégorie</td>
 			<td>
 				<input type=text name=categorycode size=3 maxlength=2 onBlur=toUC(this)>
 			</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 
 		<tr>
 			<td>Description</td>
 			<td>
-				<input type=text name=description size=40 maxlength=80 value="<TMPL_VAR NAME=description escape=HTML>">
+				<input type=text name=description size=40 maxlength=80 value="<!-- TMPL_VAR NAME=description escape=HTML -->">
 				&nbsp;
 			</td>
 		</tr>
 		<tr>
-			<td>Durée insc.</td>
+			<td>Durée inscription</td>
 			<td>
-				<input type=text name=enrolmentperiod size=3 maxlength=2 value="<TMPL_VAR NAME=enrolmentperiod>">
+				<input type=text name=enrolmentperiod size=3 maxlength=2 value="<!-- TMPL_VAR NAME=enrolmentperiod -->">
 			</td>
 		</tr>
 		<tr>
-			<td>Age maximum</td>
+			<td>Age maxi</td>
 			<td>
-				<input type=text name=upperagelimit size=3 maxlength=3 value="<TMPL_VAR NAME=upperagelimit>">
+				<input type=text name=upperagelimit size=3 maxlength=3 value="<!-- TMPL_VAR NAME=upperagelimit -->">
 			</td>
 		</tr>
 		<tr>
-			<td>Age Minimum</td>
+			<td>Age mini</td>
 			<td>
-				<input type=text name=dateofbirthrequired value="<TMPL_VAR NAME=dateofbirthrequired>" size=3 maxlength=2>
+				<input type=text name=dateofbirthrequired value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size=3 maxlength=2>
 			</td>
 		</tr>
 		<tr>
-			<td>Frais inscription</td>
+			<td>Frais d'inscription</td>
 			<td>
-				<input type=text name=enrolmentfee value="<TMPL_VAR NAME=enrolmentfee>">
+				<input type=text name=enrolmentfee value="<!-- TMPL_VAR NAME=enrolmentfee -->">
 			</td>
 		</tr>
 		<tr>
-			<td>D&eacute;passement</td>
+			<td>Avis de retard nécessaire</td>
 			<td>
 				<select name="overduenoticerequired">
-					<option <TMPL_UNLESS name="overduenoticerequired">selected</TMPL_UNLESS> value="0">Non</option>
-					<option <TMPL_IF name="overduenoticerequired">selected</TMPL_IF> value="1">Oui</option>
+					<option <!-- TMPL_UNLESS name="overduenoticerequired" -->selected<!-- /TMPL_UNLESS --> value="0">Non</option>
+					<option <!-- TMPL_IF name="overduenoticerequired" -->selected<!-- /TMPL_IF --> value="1">Oui</option>
 				</select>
 			</td>
 		</tr>
 		<tr>
-			<td>Nb maxi emprunts</td>
+			<td>Limite de prêt</td>
 			<td>
-				<input type=text name=issuelimit size=2 maxlength=2 value=<TMPL_VAR NAME=issuelimit>>
+				<input type=text name=issuelimit size=2 maxlength=2 value="<!-- TMPL_VAR NAME=issuelimit -->">
 			</td>
 		</tr>
 		<tr>
-			<td>Frais réservation</td>
+			<td>Frais Réservation</td>
 			<td>
-				<input type=text name=reservefee value=<TMPL_VAR NAME=reservefee>>
+				<input type=text name=reservefee value="<!-- TMPL_VAR NAME=reservefee -->">
 			</td>
 		</tr>
 		<tr>
@@ -147,151 +148,150 @@
 	</table>
 	</form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-	Valeurs enregistr&eacute;es
-	<form action=<TMPL_VAR NAME=script_name> method=post>
+<!-- TMPL_IF NAME=add_validate -->
+	Donnée enregistrée
+	<form action=<!-- TMPL_VAR NAME=script_name --> method=post>
 		<input type=submit value=OK>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
-	TOTAL : <TMPL_VAR NAME=categorycode> : <TMPL_VAR NAME=total><br>
+<!-- TMPL_IF NAME=delete_confirm -->
+	TOTAL : <!-- TMPL_VAR NAME=categorycode --> : <!-- TMPL_VAR NAME=total --><br>
 
 	<table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
 			<td background='/images/background-mem.gif'>
-				<b>Code cat&éacute;gorie</b>
+				<b>Code Catégorie</b>
 			</td>
 			<td background='/images/background-mem.gif'>
-				<TMPL_VAR NAME=categorycode>
+				<!-- TMPL_VAR NAME=categorycode -->
 			</td>
 		</tr>
-        	<form action='<TMPL_VAR NAME=script_name>' method=post>
+        	<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=hidden name=categorycode value=<!-- TMPL_VAR NAME=categorycode -->>        
 		<tr>
 			<td>Description</td>
-			<td><TMPL_VAR NAME=description></td>
-		</tr>
-		<tr>
-			<td>Période inscription</td>
-			<td><TMPL_VAR NAME=enrolmentperiod></td>
+			<td><!-- TMPL_VAR NAME=description --></td>
 		</tr>
 		<tr>
-			<td>Age maximum</td>
-			<td><TMPL_VAR NAME=upperagelimit></td>
+			<td>Durée inscription</td>
+			<td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
 		</tr>
 		<tr>
-			<td>Age minimum</td>
-			<td><TMPL_VAR NAME=dateofbirthrequired></td>
+			<td>Age maxi</td>
+			<td><!-- TMPL_VAR NAME=upperagelimit --></td>
 		</tr>
 		<tr>
-			<td>Profil</td>
-			<td><TMPL_VAR NAME=finetype></td>
+			<td>Age mini</td>
+			<td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
 		</tr>
 		<tr>
-			<td>???</td>
-			<td><TMPL_VAR NAME=bulk></td>
+			<td>Saisir d'amende</td>
+			<td><!-- TMPL_VAR NAME=finetype --></td>
 		</tr>
 		<tr>
-			<td>Frais inscription</td>
-			<td><TMPL_VAR NAME=enrolmentfee></td>
+			<td>Frais d'inscription</td>
+			<td><!-- TMPL_VAR NAME=enrolmentfee --></td>
 		</tr>
 		<tr>
-			<td>D&eacute;passement</td>
-			<td><TMPL_IF NAME=overduenoticerequired>Oui<TMPL_ELSE>Non</TMPL_IF></td>
+			<td>Avis de retard nécessaire</td>
+			<td><!-- TMPL_IF NAME=overduenoticerequired -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
 		</tr>
 		<tr>
-			<td>Nb maxi emprunts</td>
-			<td><TMPL_VAR NAME=issuelimit></td>
+			<td>Limite de prêt</td>
+			<td><!-- TMPL_VAR NAME=issuelimit --></td>
 		</tr>
 		<tr>
-			<td>Frais réservation</td>
-			<td><TMPL_VAR NAME=reservefee></td>
+			<td>Frais Réservation</td>
+			<td><!-- TMPL_VAR NAME=reservefee --></td>
 		</tr>
-		<TMPL_IF NAME=totalgtzero>
+		<!-- TMPL_IF NAME=totalgtzero -->
                 <tr>
-			<td colspan=2 align=center><b>Valeur utilisée <TMPL_VAR NAME=total>fois.Suppression impossible</b></td>
+			<td colspan=2 align=center><b>This record is used <!-- TMPL_VAR NAME=total --> times. Deletion not possible</b></td>
 		</tr>
                <tr>
 			<td colspan=2>
-				</form><form action='<TMPL_VAR NAME=script_name>' method=post>
+				</form><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 				<input type=submit value=OK>
 				</form>
 			</td>
 		</tr>
-		<TMPL_ELSE>
+		<!-- TMPL_ELSE -->
                 <tr>
 			<td colspan=2 align=center>CONFIRMER SUPPRESSION</td>
 		</tr>
                 <tr>
-			<td><INPUT type=submit value='YES'></form></td>
-			<td><form action='<TMPL_VAR NAME=script_name>' method=post><input type=submit value=NO></form></td>
+			<td><INPUT type=submit value='OUI'></form></td>
+			<td><form action='<!-- TMPL_VAR NAME=script_name -->' method=post><input type=submit value=NO></form></td>
 		</tr>
-		</TMPL_IF>
+		<!-- /TMPL_IF -->
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-	Valeur supprimée
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=delete_confirmed -->
+	Donnée effacée
+        <form action='<!-- TMPL_VAR NAME="script_name" -->' method=post>
         <input type=submit value=OK>
         </form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=else>
-	<h2>Administration catégorie</h2>
-	<TMPL_IF NAME=searchfield>
-		Rechercher sur <TMPL_VAR NAME=searchfield>
-	</TMPL_IF>
+<!-- TMPL_IF NAME=else -->
+	<h2>Admin Catégorie</h2>
+	<!-- TMPL_IF NAME=searchfield -->
+		Votre recherche sur <!-- TMPL_VAR name=searchfield -->
+	<!-- /TMPL_IF -->
 
-	<form action='<TMP_VAR NAME=script_name>' method=post>
-		<input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-		<input type=reset name=reset value="clr">
+	<form action='<!-- TMPL_VAR NAME="script_name" -->' method=post>
+		<input type=text name=description value=<!-- TMPL_VAR name="searchfield" -->>
+		<input type="submit" name="submit" value="OK" class="button">
 	</form>
-	
+
         <table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Catégorie</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Description</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Inscription</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Age maxi</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Age mini</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Profil</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Durée</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Frais</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Depass</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>nb max emprunt</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>frais réserv</b></td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'> </td>
-			<td background='<TMPL_VAR name="themelang">/images/background-mem.gif'> </td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Catégorie</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Description</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Durée inscription</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Frais d'inscription</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Age maxi</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Age mini</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Amende</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Signaler retard</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Limite de prêt</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Réserver</b></td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
+			<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
 		</tr>
-		<TMPL_LOOP NAME=loop>
-		<tr bgcolor="<TMPL_VAR NAME=toggle>">
-                        <td><TMPL_VAR NAME=categorycode></td>
-                        <td><TMPL_VAR NAME=description></td>
-                        <td><TMPL_VAR NAME=enrolmentperiod></td>
-                        <td><TMPL_VAR NAME=upperagelimit></td>
-                        <td><TMPL_VAR NAME=dateofbirthrequired></td>
-                        <td><TMPL_VAR NAME=finetype></td>
-                        <td><TMPL_VAR NAME=bulk></td>
-                        <td><TMPL_VAR NAME=enrolmentfee></td>
-                        <td><TMPL_IF NAME=overduenoticerequired>Oui<TMPL_ELSE>Non</TMPL_IF></td>
-                        <td><TMPL_VAR NAME=issuelimit></td>
-                        <td><TMPL_VAR NAME=reservefee></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=add_form&categorycode=<TMPL_VAR NAME=categorycode>"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&categorycode=<TMPL_VAR NAME=categorycode>"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
+		<!-- TMPL_LOOP NAME=loop -->
+		<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
+                        <td><!-- TMPL_VAR NAME=categorycode --></td>
+                        <td><!-- TMPL_VAR NAME=description --></td>
+                        <td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
+                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
+                        <td><!-- TMPL_VAR NAME=upperagelimit --></td>
+                        <td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
+                        <td><!-- TMPL_VAR NAME=finetype --></td>
+                        <td><!-- TMPL_IF NAME=overduenoticerequired -->
+					<i>Oui</i>
+				<!-- TMPL_ELSE -->
+					<i>Non</i>
+				<!-- /TMPL_IF -->
+			</td>
+                        <td><!-- TMPL_VAR NAME=issuelimit --></td>
+                        <td><!-- TMPL_VAR NAME=reservefee --></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" border="0"></a></td>
 		</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 
 	</table>
-	<p><form action='<TMPL_VAR NAME=script_name>' method=post>
+	<p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 		<input type=hidden name=op value=add_form>
-		<input type=submit class="button" value="Ajout Catégorie"  ALT="Ajout Catégorie"><br>
+		<input type=submit class="button" value="Ajouter une catégorie"  ALT="Ajouter une catégorie"><br>
 	</form></p>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl
new file mode 100644
index 0000000000..1ec8b150e0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl
@@ -0,0 +1,305 @@
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
+<!-- TMPL_IF NAME=add_form -->
+        <script>
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function isNotNull(f,noalert) {
+                if (f.value.length ==0) {
+   return false;
+                }
+                return true;
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull==0 && v.value=='') {
+                return false;
+        }
+        return true;
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                        return false;
+                }
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.categorycode.value.length==0) {
+                        _alertString += "- categorycode missing\n";
+                }
+//              alert(window.document.Aform.description.value);
+                if (!(isNotNull(window.document.Aform.description,1))) {
+                        _alertString += "- description missing\n";
+                }
+                if (!isNum(f.upperagelimit,0)) {
+                        _alertString += "- upperagelimit is not a number\n";
+                }
+                if (_alertString.length==0) {
+                        document.Aform.submit();
+                } else {
+                        alertString2 = "Form not submitted because sur the following problem(s)\n";
+                        alertString2 += "------------------------------------------------------------------------------------\n\n";
+                        alertString2 += _alertString;
+                }
+        }
+        </SCRIPT>
+
+        <!-- TMPL_IF NAME=categorycode -->
+                <h1>Modifier Catégorie</h1>
+        <!-- TMPL_ELSE -->
+                <h1>Ajouter une catégorie</h1>
+        <!-- /TMPL_IF -->
+
+        <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>
+                        
+        <table>  
+        <!-- TMPL_IF NAME=categorycode -->
+                <tr>
+                        <td>Code Catégorie</td>
+                        <td>
+                                <input type=hidden name=categorycode value=<!-- TMPL_VAR NAME=categorycode -->>
+                        </td>
+                </tr>
+        <!-- TMPL_ELSE -->
+                <tr>
+                        <td>Code Catégorie</td>
+                        <td>
+                                <input type=text name=categorycode size=3 maxlength=2 onBlur=toUC(this)>
+                        </td>
+                </tr>
+        <!-- /TMPL_IF -->
+                <tr>
+                        <td>Description</td>
+                        <td>
+                                <input type=text name=description size=40 maxlength=80 value=<!-- TMPL_VAR NAME=description escape=HTML -->>
+                                &nbsp;
+                        </td>
+                </tr>
+                <tr>
+                        <td>Durée d'inscription</td>
+                        <td>
+                                <input type=text name=enrolmentperiod value=<!-- TMPL_VAR NAME=enrolmentperiod -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>Age maxi</td>
+                        <td>
+                                <input type=text name=upperagelimit value=<!-- TMPL_VAR NAME=upperagelimit -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>Age mini</td>
+                        <td>
+                                <input type=text name=dateofbirthrequired value=<!-- TMPL_VAR NAME=dateofbirthrequired -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>Saisir d'amende</td>
+                        <td>
+                                <input type=text name=finetype size=30 maxlength=30 value=<!-- TMPL_VAR NAME=finetype -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>en gros</td>
+                        <td>
+                                <input type=text name=bulk value=<!-- TMPL_VAR NAME=bulk -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>Frais inscription</td>
+                        <td>
+                                <input type=text name=enrolmentfee value=<!-- TMPL_VAR NAME=enrolmentfee -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>Avis de retard nécessaire</td>
+                        <td>
+                                <input type=text name=overduenoticerequired value=<!-- TMPL_VAR NAME=overduenoticerequired -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>Limite de prêt</td>
+                        <td>
+                                <input type=text name=issuelimit value=<!-- TMPL_VAR NAME=issuelimit -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>Frais Réservation</td>
+                        <td>
+                                <input type=text name=reservefee value=<!-- TMPL_VAR NAME=reservefee -->>
+                        </td>
+                </tr>
+                <tr>
+                        <td>&nbsp;</td>
+                        <td>
+                                <INPUT type=button value='OK' onClick='Check(this.form)'>
+                        </td>
+                </tr>
+        </table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME=add_validate -->
+        Donnée enregistrée
+        <form action=<!-- TMPL_VAR NAME=script_name --> method=post>
+                <input type=submit value=OK>
+        </form>
+<!-- /TMPL_IF -->
+
+        TOTAL : <!-- TMPL_VAR NAME=categorycode --> : <!-- TMPL_VAR NAME=total --><br>
+                    
+        <table border=0 cellspacing=0 cellpadding=5>
+                <tr bgcolor='#99cc33'>
+                        <td background='/images/background-mem.gif'>
+                                <b>Code Catégorie</b>
+                        </td>
+                        <td background='/images/background-mem.gif'>
+                                <!-- TMPL_VAR NAME=categorycode -->
+                        </td>
+                </tr>
+                <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 -->>
+                <tr>
+                        <td>Description</td>
+                        <td><!-- TMPL_VAR NAME=description --></td>
+                </tr>
+                <tr>
+                        <td>Durée d'inscription</td>
+                        <td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
+                </tr>
+                <tr>
+                        <td>Age maxi</td>
+                        <td><!-- TMPL_VAR NAME=upperagelimit --></td>
+                </tr>
+                <tr>
+                        <td>Age mini</td>
+                        <td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
+                </tr>
+                <tr>
+                        <td>Saisir d'amende</td>
+                        <td><!-- TMPL_VAR NAME=finetype --></td>
+                </tr>
+                <tr>
+                        <td>en gros</td>
+                        <td><!-- TMPL_VAR NAME=bulk --></td>
+                </tr>
+                <tr>
+                        <td>Frais inscription</td>
+                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
+                </tr>
+                <tr>
+                        <td>Avis de retard nécessaire</td>
+                        <td><!-- TMPL_VAR NAME=overduenoticerequired --></td>
+                </tr>
+                <tr>
+                        <td>Limite de prêt</td>
+                        <td><!-- TMPL_VAR NAME=issuelimit --></td>
+                </tr>
+                <tr>
+                        <td>Frais Réservation</td>
+                        <td><!-- TMPL_VAR NAME=reservefee --></td>
+                </tr>
+                <!-- TMPL_IF NAME=totalgtzero -->
+                <tr>
+                        <td colspan=2 align=center><b>This record is used <!-- TMPL_VAR NAME=total --> times. Deletion not possible</b></td>
+                </tr>
+               <tr>
+                        <td colspan=2>
+                                </form><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+                                <input type=submit value=OK>
+                                </form>
+                        </td>
+                </tr>
+                <!-- TMPL_ELSE -->
+                <tr>
+                        <td colspan=2 align=center>CONFIRMER SUPPRESSION</td>
+                </tr>
+                <tr>
+                        <td><INPUT type=submit value='OUI'></form></td>
+                        <td><form action='<!-- TMPL_VAR NAME=script_name -->' method=post><input type=submit value=NO></form></td>
+                </tr>
+                <!-- /TMPL_IF -->
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME=delete_confirmed -->
+        Donnée effacée
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+        <input type=submit value=OK>
+        </form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME=else -->
+        <h2>Admin Catégorie</h2>
+        <!-- TMPL_IF NAME=searchfield -->
+                Votre recherche sur <!-- TMPL_VAR NAME=searchfield -->
+        <!-- /TMPL_IF -->
+
+        <form action='<TMP_VAR NAME=script_name>' method=post>
+                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
+                <input type=reset name=reset value="effacer">
+        </form>
+
+        <table border=0 cellspacing=0 cellpadding=5>
+                <tr bgcolor='#99cc33'>
+                        <td background='/images/background-mem.gif'><b>Catégorie</b></td>
+                        <td background='/images/background-mem.gif'><b>Description</b></td>
+                        <td background='/images/background-mem.gif'><b>Inscription</b></td>
+                        <td background='/images/background-mem.gif'><b>Age maxi</b></td>
+                        <td background='/images/background-mem.gif'><b>Age mini</b></td>
+                        <td background='/images/background-mem.gif'><b>Amende</b></td>
+                        <td background='/images/background-mem.gif'><b>en gros</b></td>
+                        <td background='/images/background-mem.gif'><b>Frais</b></td>
+                        <td background='/images/background-mem.gif'><b>Signaler retard</b></td>
+                        <td background='/images/background-mem.gif'><b>Limite de prêt</b></td>
+                        <td background='/images/background-mem.gif'><b>Réserver</b></td>
+                        <td background='/images/background-mem.gif'> </td>
+                        <td background='/images/background-mem.gif'> </td>
+                </tr>
+                <!-- TMPL_LOOP NAME=loop -->
+                <tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
+                        <td><!-- TMPL_VAR NAME=categorycode --></td>
+                        <td><!-- TMPL_VAR NAME=description --></td>
+                        <td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
+                        <td><!-- TMPL_VAR NAME=upperagelimit --></td>
+                        <td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
+                        <td><!-- TMPL_VAR NAME=finetype --></td>
+                        <td><!-- TMPL_VAR NAME=bulk --></td>
+                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
+                        <td><!-- TMPL_VAR NAME=overduenoticerequired --></td>
+                        <td><!-- TMPL_VAR NAME=issuelimit --></td>
+                        <td><!-- TMPL_VAR NAME=reservefee --></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->">Editer</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME=categorycode -->">Supprimer</a></t$                </tr>
+                <!-- /TMPL_LOOP -->
+
+        </table>
+        <p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+                <input type=hidden name=op value=add_form>
+                <input type=submit class="button"  value="Ajouter une catégorie"  ALT="Ajouter une catégorie"><br>
+        </form></p>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
+
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl
index 33580b3670..4d670220c1 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl
@@ -1,33 +1,27 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <p>
-Chaque zone doit être remplie avec :
-<ul>
-<li>Le montant de l'amende</li>
-<li>Le retard toléré avant amende</li>
-<li>La période de répétition de l'amende</li>
-</ul>
-exemple : 1,7,7 1Euro d'amende après 7 jours, tous les 7 jours.</p>
-<p>Note : Les amendes sont calculées par le script fines2.pl situé dans le répertoire misc.
-Demandez à votre administrateur de mettre ce script dans la crontab (après minuit) pour que les amendes soient calculées toutes les nuits.
+Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité<br/>
+ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours</p>
+<p>Note : les amendes sont calculées par le misc/script fines2.pl. Demandez à votre administrateur de mettre ce script dans le crontab, après minuit,  pour que les amendes soient calculées chaque nuit
 </p>
 <form action=/cgi-bin/koha/admin/updatecharges.pl method=post>
 <table border=0>
 <TR align="center">
-	<th>&nbsp;</th><TMPL_LOOP name="title"><th><TMPL_VAR name="in_title"></th></TMPL_LOOP>
+	<th>&nbsp;</th><!-- TMPL_LOOP name="title" --><th><!-- TMPL_VAR name="in_title" --></th><!-- /TMPL_LOOP -->
 </TR>
-<TMPL_LOOP name="row">
+<!-- TMPL_LOOP name="row" -->
 	<TR align="center">
 		<th>
-			<TMPL_VAR name="categorycode">
+			<!-- TMPL_VAR name="categorycode" -->
 		</th>
-		<TMPL_LOOP name="cell">
-			<td bgcolor="<TMPL_VAR name="toggle">">
-				<input name="<TMPL_VAR name="inputname">" value="<TMPL_VAR name="inputvalue">" size=6 maxlength=10>
+		<!-- TMPL_LOOP name="cell" -->
+			<td bgcolor="<!-- TMPL_VAR name="toggle" -->">
+				<input name="<!-- TMPL_VAR name="inputname" -->" value="<!-- TMPL_VAR name="inputvalue" -->" size=6 maxlength=10>
 			</td>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</TR>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 </table>
 <center><input type=submit value="OK"></center>
 </form>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl
index f35d6b9588..8ca25c1807 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl
@@ -1,128 +1,129 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
 <table width="100%" cellpadding=5 cellspacing=5>
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+	<tr background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
 		<td><b>Test</b></td>
-		<td><b>Result</b></td>
+		<td><b>Résultat</b></td>
 	</tr>
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="itemnum">
+<!-- TMPL_IF name="itemnum" -->
 	<tr>
 		<td><b>itemnum</b></td>
-		<td><li>Le champ "itemnum" DOIT être connecté à un champs MARC </li>
-			<li>Le sous champ correspondant DOIT être dans le "tab" -1 (ignore)</td>
+		<td><li>Le champ itemnumb DOIT être connecté </li>
+			<li>Le sous-champ correspondant DOIT être dans l'onglet -1 (ignore)</td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>itemnum : le champ est connecté et dans le tab -1 (ignore)</i></td>
+		<td><i>Ouvrage : le champ itemnumber est connecté à un sous-champ dans un onglet -1</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="itemfields">
+<!-- TMPL_IF name="itemfields" -->
 	<tr>
-		<td><b>champ item</b></td>
-		<td>TOUS les sous champs des exemplaires (items) DOIVENT :<br/>
-			<li>être reliés à 1 seul champ MARC (995 à priori pour l'UNIMARC),</li>
-			<li>et ils doivent être dans le "tab" 10 (items)</li></td>
+		<td><b>champ ouvrage</b></td>
+		<td>TOUS les champs ouvrage DOIVENT :<br/>
+			<li>être relié à la même étiquette,</li>
+			<li>et ils doivent tous être dans l'onglet 10 (items)</li></td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>Tous les sous-champs des exemplaires (items) sont dans le même champ et dans le tab 10 (items)</i></td>
+		<td><i>Les étiquettes d'exemplaire sont dans le même champ MARC et dans le même onglet.</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="itemtypes_empty">
+<!-- TMPL_IF name="itemtypes_empty" -->
 	<tr>
-		<td><b>Table itemtypes vide</b></td>
-		<td>La table itemtypes est vide. Elle doit contenir au moins 1 entrée</td>
+		<td><b>table types d'ouvrage est vide</b></td>
+		<td>La table types d'ouvrage est vide. Elle doit contenir au moins une valeur</td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>la table itemtypes contient 1 entrée au moins</i></td>
+		<td><i>table types d'ouvrage remplie avec au moins une valeur</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="itemtype">
+<!-- TMPL_IF name="itemtype" -->
 	<tr>
-		<td><b>itemtype NON connecté</b></td>
+		<td><b>itemtype n'est PAS connecté</b></td>
 		<td>Le champ biblioitems.itemtype DOIT :<br/>
-			<li>être connecté à un sous-champ MARC</li>
-			<li>Le sous champ correspondant DOIT avoir authorised_value=itemtype</li></td>
+			<li>être relié à l'étiquette MARC, </li>
+			<li>Le sous-champ correspondant DOIT contenir la valeur autorisée=typeouvrage</li></td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>biblioitems.itemtype défini</i></td>
+		<td><i>champ biblioitems.itemtype défini</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="branches_empty">
+<!-- TMPL_IF name="branches_empty" -->
 	<tr>
-		<td><b>table branch est vide</b></td>
-		<td>La table "branches" est vide. Elle doit contenir au moins 1 entrée</td>
+		<td><b>Table Annexe vide</b></td>
+		<td>La table Annexe est vide. Elle doit contenir au moins une valeur !</td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>La table "branches" contient au moins 1 entrée</i></td>
+		<td><i>table Annexe remplie avec au moins une valeur</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="branch">
+<!-- TMPL_IF name="branch" -->
 	<tr>
-		<td><b>branch NON connecté</b></td>
-		<td>le champ Koha items.homebranch field DOIT :<br/>
-			<li>être connecté à un sous-champ MARC,</li>
-			<li>Le sous-champ correspondant DOIT avec authorised value=branch</li></td>
+		<td><b>Annexe propriétaire non reliée</b></td>
+		<td>le champ items.homebranch DOIT :<br/>
+			<li>être relié à l'étiquette MARC,</li>
+			<li>Le sous-champ correspondant DOIT contenir la valeur autorisée=annexes</li></td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>homebranch défini</i></td>
+		<td><i>Annexe propriétaire définie</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="holdingbranch">
+<!-- TMPL_IF name="holdingbranch" -->
 	<tr>
-		<td><b>holdingbranch NON connecté</b></td>
-		<td>le champ Koha items.holdingbranch field DOIT :<br/>
-			<li>être connecté à un sous-champ MARC,</li>
-			<li>Le sous-champ correspondant DOIT avec authorised value=branch</li></td>
+		<td><b>Annexe dépositaire non reliée</b></td>
+		<td>le champ items.holdingbranch DOIT :<br/>
+			<li>être relié à l'étiquette MARC, </li>
+			<li>Le sous-champ correspondant DOIT contenir la valeur autorisée=annexes</li></td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>holdingbranch défini</i></td>
+		<td><i>Annexe dépositaire définie</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="biblionumber">
+<!-- TMPL_IF name="biblionumber" -->
 	<tr>
-		<td><b>biblio et biblionumber</b></td>
-		<td>Les champs Koha biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :<br/>
-			<li>être reliés à un sous-champ MARC</li>
-			<li>être connectés au même champ marc(par exemple : 090$a et 090$b)</li>
-			<li>Etre dans le "tab" -1</li></td>
+		<td><b>notice bibliographique et n° biblio</b></td>
+		<td>Les champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :<br/>
+			<li>être relié à l'étiquette MARC,</li>
+			<li>être dans la MEME étiquette (par ex. : 090$a et 090$b)</li>
+			<li>être dans l'onglet -1 (items)</li></td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td><i>biblionumber et biblioitemnumber correctement définis</i></td>
+		<td><i>n° biblio et n° d'ouvrage corrects</i></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="total">
+<!-- TMPL_IF name="total" -->
 	<tr>
 		<td><b>TOTAL</b></td>
-		<td>Il y a <TMPL_VAR name="total"> erreurs dans votre configuration MARC. corrigez les avant d'utiliser Koha !!!</td>
+		<td>Vous avez <b><!-- TMPL_VAR name="total" --></b> erreurs dans votre configuration MARC. Corrigez-les avant d'utiliser Koha</td>
 	</tr>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<tr>
 		<td>&nbsp;</td>
-		<td><b>Configuration OK, pas d'erreur dans les paramètres MARC</b></td>
+		<td><b>Configuration OK. Vous n'avez pas d'erreurs dans la table des paramètres MARC.</b></td>
 	</tr>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 </table>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl
index f0b57ae801..c2c70e5daa 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl
@@ -1,6 +1,6 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF NAME=add_form>
+<!-- TMPL_IF NAME=add_form -->
         <script>
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -39,15 +39,15 @@
                 var _alertString="";
                 var alertString2;
                 if (f.currency.value.length==0) {
-                        _alertString += "- Currency name missing\\n";
+                        _alertString += "- Monnaie name missing\\n";
                 }
                 if (f.rate.value.length==0) {
-                        _alertString += "- Rate missing\\n";
+                        _alertString += "- Taux missing\\n";
                 }
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\\n";
+                        alertString2 = "Form not submitted because sur the following problem(s)\\n";
                         alertString2 += "------------------------------------------------------------------------------------\\n\\n";
                         alertString2 += _alertString;
                         alert(alertString2);
@@ -55,37 +55,37 @@
         }
         </SCRIPT>
 
-	<TMPL_IF NAME=searchfield>
-		<h1>Modifier monnaie</h1>
-	<TMPL_ELSE>
-		<h1>Ajout monnaie</h1>
-	</TMPL_IF>
+	<!-- TMPL_IF NAME=searchfield -->
+		<h1>Modifier Monnaie</h1>
+	<!-- TMPL_ELSE -->
+		<h1>Ajouter une monnaie</h1>
+	<!-- /TMPL_IF -->
 
-        <form action='<TMPL_VAR NAME=script_name>' name=Aform method=post>
+        <form action='<!-- TMPL_VAR NAME=script_name -->' name=Aform method=post>
         <input type=hidden name=op value='add_validate'>
 
 	<table>
 
-	<TMPL_IF NAME=searchfield>
+	<!-- TMPL_IF NAME=searchfield -->
 		<tr>
 			<td>Monnaie</td>
 			<td>
-				<input type=hidden name=currency value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
+				<input type=hidden name=currency value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
 			</td>
 		</tr>
-	<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 		<tr>
 			<td>Monnaie</td>
 			<td>
 				<input type=text name=currency size=50 maxlength=50 onBlur=toUC(this)>
 			</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 
         	<tr>
 			<td>Taux</td>
 			<td>
-				<input type=text name=rate size=10 maxlength=10 value='<TMPL_VAR NAME=rate>'>
+				<input type=text name=rate size=10 maxlength=10 value='<!-- TMPL_VAR NAME=rate -->'>
 			</td>
 		</tr>
         	<tr>
@@ -95,80 +95,80 @@
         </table>
         </form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-	Donn&eacute;e enregistr&eacute;e
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=add_validate -->
+	Donnée enregistrée
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=submit value=OK>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
+<!-- TMPL_IF NAME=delete_confirm -->
 	<table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
 			<td background='/images/background-mem.gif'><b>Monnaie</b></td>
-			<td background='/images/background-mem.gif'><b><TMPL_VAR NAME=searchfield></b></td>
+			<td background='/images/background-mem.gif'><b><!-- TMPL_VAR NAME=searchfield --></b></td>
 		</tr>
 
-        	<form action='<TMPL_VAR NAME=script_name>' method=post>
+        	<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=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'>
         
         	<tr>
 			<td>Taux</td>
-			<td><TMPL_VAR NAME=rate></td>
+			<td><!-- TMPL_VAR NAME=rate --></td>
 		</tr>
-		<TMPL_IF NAME=totalgtzero>
+		<!-- TMPL_IF NAME=totalgtzero -->
 		<tr>
 			<td colspan=2 align=center>
-				<b>Cette donn&eacute;e est utilis&eacute;e <TMPL_VAR NAME=total> fois. Suppression impossible</b>
+				<b>This record is used <!-- TMPL_VAR NAME=total --> times. Deletion not possible</b>
 			</td>
 		</tr>
 		<tr>
 			<td colspan=2>
 				</form>
-				<form action='<TMPL_VAR NAME=script_name>' method=post>
+				<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 					<input type=submit value=OK>
 				</form>
 			</td>
 		</tr>
-		<TMPL_ELSE>
+		<!-- TMPL_ELSE -->
 		<tr>
 			<td colspan=2 align=center>CONFIRMER SUPPRESSION</td>
 		</tr>
 		<tr>
 			<td>
-				<INPUT type=submit value='YES'>
+				<INPUT type=submit value='OUI'>
 				</form>
 			</td>
 			<td>
-				<form action='<TMPL_VAR NAME=script_name>' method=post>
+				<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 					<input type=submit value=NO>
 				</form>
 			</td>
 		</tr>
-		</TMPL_IF>
+		<!-- /TMPL_IF -->
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-	Donn&eacute;e supprim&eacute;e
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=delete_confirmed -->
+	Donnée effacée
+	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 		<input type=submit value=OK>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=else>
-	<h2>Monnaies</h2>
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
+<!-- TMPL_IF NAME=else -->
+	<h2>Admin Monnaies</h2>
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
+                <input type=reset name=reset value="effacer">
         </form>
 
-	<TMPL_IF NAME=searchfield>
-		Rechercher sur :<b><TMPL_VAR NAME=searchfield></b>
-	</TMPL_IF>
+	<!-- TMPL_IF NAME=searchfield -->
+		Votre recherche sur <b><!-- TMPL_VAR NAME=searchfield --></b>
+	<!-- /TMPL_IF -->
 
 	<table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
@@ -177,35 +177,35 @@
 			<td background='/images/background-mem.gif'> </td>
 			<td background='/images/background-mem.gif'> </td>
 		</tr>
-		<TMPL_LOOP NAME=loop>
-		<tr bgcolor="<TMPL_VAR NAME=toggle>">
-			<td><TMPL_VAR NAME=currency></td>
-			<td><TMPL_VAR NAME=rate></td>
-			<td><a href="<TMPL_VAR NAME=script_name>?op=add_form&searchfield=<TMPL_VAR NAME=currency>">Editer</a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=currency>">Supprimer</a></td>
+		<!-- TMPL_LOOP NAME=loop -->
+		<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
+			<td><!-- TMPL_VAR NAME=currency --></td>
+			<td><!-- TMPL_VAR NAME=rate --></td>
+			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Editer</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Supprimer</a></td>
 		</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
 
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
+	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=hidden name=op value=add_form>
 	
-	<TMPL_IF NAME=offsetgtzero>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prec</a>
-	</TMPL_IF>
+	<!-- TMPL_IF NAME=offsetgtzero -->
+		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->"><< Prev</a>
+	<!-- /TMPL_IF -->
 
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-	<TMPL_IF NAME=ltcount>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">Suiv >></a>
-	</TMPL_iF>
+	<!-- TMPL_IF NAME=ltcount -->
+		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Suivant >></a>	
+	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Ajouter" alt="Ajout monnaie">
+	<input type=submit class="button" value="Ajouter une monnaie" alt="Ajouter une monnaie">
 	<br>
         </form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl
index ac088a9f2e..cd24419162 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl
@@ -1,4 +1,4 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
 <script>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -38,57 +38,71 @@ function Check(f) {
 	var _alertString="";
 	var alertString2;
 	if (f.itemtype.value.length==0) {
-		_alertString += "- Itemtype absent\n";
+		_alertString += "- Itemtype missing\n";
 	}
 	if (!(isNotNull(window.document.Aform.description,1))) {
-		_alertString += "- Description absente\n";
+		_alertString += "- Description missing\n";
 	}
 	if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) {
-		_alertString += "- Durée de prêt n'est pas un nombre\n";
+		_alertString += "- Durée de prêt is not a number\n";
 	}
 	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
-		_alertString += "- Cout du prêt n'est pas un nombre\n";
+		_alertString += "- Coût du prêt is not a number\n";
 	}
 	if (_alertString.length==0) {
 		document.Aform.submit();
 	} else {
-		alertString2 = "Le formulaire n'est pas validé pour les raisons suivantes\n";
+		alertString2 = "Form not submitted because sur the following problem(s)\n";
 		alertString2 += "------------------------------------------------------------------------------------\n\n";
 		alertString2 += _alertString;
 		alert(alertString2);
 	}
 }
 </SCRIPT>
-<TMPL_IF name="add_form">
-	<TMPL_IF name="itemtype">
-		<h1>Modifier le type d'exemplaire</h1>
-	<TMPL_ELSE>
-		<h1>Ajouter le type d'exemplaire</h1>
-	</TMPL_IF>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
+<!-- TMPL_IF name="add_form" -->
+	<!-- TMPL_IF name="itemtype" -->
+		<h1>Modifier categ. ouvrage</h1>
+	<!-- TMPL_ELSE -->
+		<h1>Ajouter catégorie d'ouvrage</h1>
+	<!-- /TMPL_IF -->
+	<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>
 		<table>
-			<TMPL_IF name="itemtype">
-				<tr><td>Type exemplaire</td><td><input type=hidden name=itemtype value=<TMPL_VAR name="itemtype">><TMPL_VAR name="itemtype"></td></tr>
-			<TMPL_ELSE>
-				<tr><td>Type exemplaire</td><td><input type=text name=itemtype size=6 maxlength=4 onBlur="toUC(this)"></td></tr>
-			</TMPL_IF>
+			<!-- TMPL_IF name="itemtype" -->
+				<tr><td>Catég ouvrage</td><td><input type=hidden name=itemtype value=<!-- TMPL_VAR name="itemtype" -->><!-- TMPL_VAR name="itemtype" --></td></tr>
+			<!-- TMPL_ELSE -->
+				<tr><td>Catég ouvrage</td><td><input type=text name=itemtype size=6 maxlength=4 onBlur="toUC(this)"></td></tr>
+			<!-- /TMPL_IF -->
 			<tr>
 				<td>Description</td>
-				<td><input type=text name=description size=40 maxlength=80 value='<TMPL_VAR name="description" escape=HTML>'>&nbsp;</td>
+				<td><input type=text name=description size=40 maxlength=80 value='<!-- TMPL_VAR name="description" escape=HTML -->'>&nbsp;</td>
 			</tr>
 			<tr>
-				<td>Durée d'emprunt</td>
-				<td><input type=text name=loanlength size=10 value='<TMPL_VAR name="loanlength">'></td>
+				<td>Non empruntable</td>
+				<td>
+					<!-- TMPL_IF name="notforloan" -->
+						<input type=checkbox name=notforloan checked value=1>
+					<!-- TMPL_ELSE -->
+						<input type=checkbox name=notforloan value=1>
+					<!-- /TMPL_IF -->
+					Si coché, aucun ouvrage de ce type ne peut être emprunté. Sinon, les ouvrages peuvent être empruntés sauf si le champ "notforloan" de l'ouvrage est coché.
+				</td>
 			</tr>
 			<tr>
-				<td>Renouvellement autorisé</td>
-				<td><input type=checkbox name=renewalsallowed <TMPL_IF name="renewalsallowed">coché</TMPL_IF> value=1></td>
+				<td>Durée de prêt</td>
+				<td>
+					<input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'>
+					Utilisé seulement si "Non empruntable" n'est pas coché.
+				</td>
 			</tr>
 			<tr>
-				<td>Coût emprunt</td>
-				<td><input type=text name=rentalcharge size=10 value='<TMPL_VAR name="rentalcharge">'></td>
+				<td>Renouvellements autorisés</td>
+				<td><input type=checkbox name=renewalsallowed <!-- TMPL_IF name="renewalsallowed" -->checked<!-- /TMPL_IF --> value=1></td>
+			</tr>
+			<tr>
+				<td>Coût du prêt</td>
+				<td><input type=text name=rentalcharge size=10 value='<!-- TMPL_VAR name="rentalcharge" -->'></td>
 			</tr>
 			<tr>
 				<td>&nbsp;</td>
@@ -96,67 +110,67 @@ function Check(f) {
 			</tr>
 		</table>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
+<!-- TMPL_IF name="delete_confirm" -->
 	<TABLE bg="#99cc33">
 		<tr>
-			<th>Type exemplaire</th>
-			<th><TMPL_VAR name="itemtype"></th>
+			<th>Catég ouvrage</th>
+			<th><!-- TMPL_VAR name="itemtype" --></th>
 		</tr>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-		<input type=hidden name=op value=delete_confirmed><input type=hidden name=itemtype value='<TMPL_VAR name="itemtype">'>
-	<tr><td>Description</td><td><TMPL_VAR name="description"></td></tr>
-	<tr><td>Durée emprunt</td><td><TMPL_VAR name="loanlength"></td></tr>
-	<tr><td>Renouvellement</td><td><TMPL_IF name="renewalsallowed">Autorisé<TMPL_ELSE>Pas autorisé</TMPL_IF></td></tr>
-	<tr><td>Coût emprunt</td><td><TMPL_VAR name="rentalcharge"></td></tr>
-	<TMPL_IF name="total">
-		<tr><td colspan=2 align=center><b>Cette donnée est utilisée <TMPL_VAR name="total"> fois. Suppression impossible</b></td></tr>
-		<tr><td colspan=2></form><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=OK></form></td></tr>
-	<TMPL_ELSE>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+		<input type=hidden name=op value=delete_confirmed><input type=hidden name=itemtype value='<!-- TMPL_VAR name="itemtype" -->'>
+	<tr><td>Description</td><td><!-- TMPL_VAR name="description" --></td></tr>
+	<tr><td>Durée de prêt</td><td><!-- TMPL_VAR name="loanlength" --></td></tr>
+	<tr><td>Renouvellements</td><td><!-- TMPL_IF name="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
+	<tr><td>Coût du prêt</td><td><!-- TMPL_VAR name="rentalcharge" --></td></tr>
+	<!-- TMPL_IF name="total" -->
+		<tr><td colspan=2 align=center><b>This record is used <!-- TMPL_VAR name="total" --> times. Deletion not possible</b></td></tr>
+		<tr><td colspan=2></form><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=OK></form></td></tr>
+	<!-- TMPL_ELSE -->
 		<tr><td colspan=2 align=center>CONFIRMER SUPPRESSION</td></tr>
-		<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=NO></form></td></tr>
-	</TMPL_IF>
+		<tr><td><INPUT type=submit value='OUI'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
+	<!-- /TMPL_IF -->
 
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="else">
-<h1>Administration type exemplaire</h1>
+<!-- TMPL_IF name="else" -->
+<h1>Admin Categ ouvrage</h1>
 <table border='1' cellpadding='5' cellspacing='0' width='550'>
 	<tr>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Code</b></th>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Description</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Durée emprunt</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Renouvelable</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Coût</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Modifier</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Supprimer</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Code</b></th>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Description</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Durée de prêt</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Renouvelable</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Frais</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">Editer</td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">Supprimer</td>
 	</tr>
-	<TMPL_LOOP name="loop">
+	<!-- TMPL_LOOP name="loop" -->
 		<tr>
-			<td><TMPL_VAR name="itemtype"></td>
-			<td><TMPL_VAR name="description"></td>
-			<td><TMPL_VAR name="loanlength"></td>
-			<td><TMPL_IF name="renewalsallowed">Yes<TMPL_ELSE>No</TMPL_IF></td>
-			<td><TMPL_VAR name="rentalcharge"></td>
-			<td><a href="<TMPL_VAR name="script_name">?op=add_form&itemtype=<TMPL_VAR name="itemtype" escape="HTML">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-			<td><a href="<TMPL_VAR name="script_name">?op=delete_confirm&itemtype=<TMPL_VAR name="itemtype" escape="HTML">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
+			<td><!-- TMPL_VAR name="itemtype" --></td>
+			<td><!-- TMPL_VAR name="description" --></td>
+			<td><!-- TMPL_VAR name="loanlength" --></td>
+			<td><!-- TMPL_IF name="renewalsallowed" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR name="rentalcharge" --></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 </table>
-<form action='<TMPL_VAR name="script_name">' method=post>
+<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 <input type=hidden name=op value=add_form>
 <br>
 <table width=40%>
 	<tr>
 		<td width="33%">
-			<input type=submit class="button" value="Ajout type exemplaires" title="Ajout type exemplaires" alt="Ajout type exemplaires" >
+			<input type=submit class="button" value="Ajouter catégorie d'ouvrage" title="Ajouter catégorie d'ouvrage" alt="Ajouter catégorie d'ouvrage" >
 		</td>
-		<td width=33%><TMPL_IF name="previous"><a href="<TMPL_VAR name=previous>"><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0></a></TMPL_IF></td>
-		<td width=33%><TMPL_IF name="next"><a href="<TMPL_VAR name=next>"><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1rightarrow.png" title="next" ALT="next" BORDER=0></a></TMPL_IF></td>
+		<td width=33%><!-- TMPL_IF name="previous" --><a href="<!-- TMPL_VAR name=previous -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0></a><!-- /TMPL_IF --></td>
+		<td width=33%><!-- TMPL_IF name="next" --><a href="<!-- TMPL_VAR name=next -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" ALT="next" BORDER=0></a><!-- /TMPL_IF --></td>
 	</tr>
 </table>
 </form>
-</TMPL_IF>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/koha2marclinks.tmpl
index f6b7bbb765..91b6aa580a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/koha2marclinks.tmpl
@@ -1,17 +1,17 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF name="add_form">
+<!-- TMPL_IF name="add_form" -->
 <!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<p>Choisir et valider 1 parmi les suivants :<b><TMPL_VAR name="tablename">.<TMPL_VAR name="kohafield"></b></p>
+	<H1><!-- TMPL_VAR name="action" --></H1>
+	<p>Choisir et valider une des suivantes pour <b><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></b></p>
 	<table>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist0">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist0" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -19,12 +19,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist1">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist1" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -32,12 +32,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist2">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist2" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -45,12 +45,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist3">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist3" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -58,12 +58,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist4">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist4" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -71,12 +71,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist5">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist5" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -84,12 +84,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist6">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist6" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -97,12 +97,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist7">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist7" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -110,12 +110,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist8">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist8" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -123,12 +123,12 @@
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+	<form action='<!-- TMPL_VAR name="script_name" -->'method=put>
 		<td>
 			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist9">
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+			<!-- TMPL_VAR name="marclist9" -->
 		</td>
 		<td>
 			<INPUT type=submit value='OK'>
@@ -137,47 +137,47 @@
 	</tr>
 	<tr>
 		<td>
-			<p align="right">Pour d&eacute;connecter cliquer  ==></p>
+			<p align="right">Pour "déconnecter" cliquer ==></p>
 		</td>
 		<td>
-			<form action='<TMPL_VAR name="script_name">' name=Aform method=put>
+			<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=put>
 				<input type=hidden name=op value='add_validate'>
-				<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-				<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
+				<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
 				<input type="hidden" name="choice" value="">
-				<INPUT type=submit value='HERE'>
+				<INPUT type=submit value='ICI'>
 			</form>
 		</td>
 	</tr>
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 <!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>Liens MARC<TMPL_VAR name="tagfield"></em></font>
-<p><b>NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez à votre administrateur d'exécuter le script misc/rebuildnonmarc.pl</b>
+<!-- TMPL_IF name="else" -->
+<font SIZE=6><em>Liens MARC<!-- TMPL_VAR name="tagfield" --></em></font>
+<p><b>Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl.</b>
 </p>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<TMPL_VAR name="tablename"> <input type="submit" value="OK">
+<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+<!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK">
 </form>
 
 <table border=0 cellspacing=0 cellpadding=2>
 <tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=10%><b>Champ Koha</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=5%><b>Champ</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=5%><b>Sous-champ</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=42%><b>Lib</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%>
-<TMPL_LOOP name="loop">
-<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><b><TMPL_VAR name="kohafield"></b></td>
-	<td><TMPL_VAR name="tagfield"></td>
-	<td><TMPL_VAR name="tagsubfield"></td>
-	<td><TMPL_VAR name="liblibrarian"></td>
-	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>champ Koha</b> <span style="font-size:8;color:red" title="le champ koha-DB lié à ce sous-champ">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Etiquette</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Sous-champ</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=42%><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%>
+<!-- TMPL_LOOP name="loop" -->
+<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+	<td><b><!-- TMPL_VAR name="kohafield" --></b></td>
+	<td><!-- TMPL_VAR name="tagfield" --></td>
+	<td><!-- TMPL_VAR name="tagsubfield" --></td>
+	<td><!-- TMPL_VAR name="liblibrarian" --></td>
+	<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
 </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 </table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl
index f77fb8f3e6..472cf3bd5a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl
@@ -1,129 +1,112 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<html>
+<!-- clarification needed about this page. many questions... what is Lib? a Library? -->
 
-<TMPL_IF name="add_form">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
+<!-- TMPL_IF name="add_form" -->
 <!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=put>
+	<H1><!-- TMPL_VAR name="action" --></H1>
+	<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
 	<input type=hidden name=op value='add_validate'>
 	<table>
-	<tr>
-      <th>Champ</th>
-
-      <th>liblibrarian / libopac</th>
-
-      <th>Incrementation</th>
-
-      <th>Obligatoire</th>
-
-      <th>Champ Koha</th>
-
-      <th>Balise</th>
-
-      <th>Valeur authoris&eacute;e ou cat&eacute;gorie de th&eacute;saurus</th>
+	<tr><th>Champ</th>
+		<th>Libellé OPAC</th>
+		<th>Repet</th>
+		<th>obligatoire</th>
+		<th>champ Koha</th>
+		<th>Onglet</th>
+		<th>Valeur autorisée ou<br/>
+				Catégorie thésaurus</th>
 	</tr>
-	<TMPL_LOOP name="loop">
-		<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-		<td><TMPL_VAR name="tagfield"> - <TMPL_VAR name="tagsubfield"></td>
-		<td><input type=text name="liblibrarian" value='<TMPL_VAR name="liblibrarian" escape=HTML>' size=40 maxlength=80><br/>
-				<input type=text name="libopac" value='<TMPL_VAR name="libopac" escape=HTML>' size=40 maxlength=80></td>
-		<td><TMPL_VAR name="repeatable"></td>
-		<td><TMPL_VAR name="mandatory"></td>
-		<td><TMPL_VAR name="kohafield"></td>
-		<td><TMPL_VAR name="tab"></td>
-		<td><TMPL_VAR name="authorised_value"><br/>
-				ou <TMPL_VAR name="thesaurus_category"><br/>
-				ou <TMPL_VAR name="value_builder"></td>
-	</TMPL_LOOP>
+	<!-- TMPL_LOOP name="loop" -->
+		<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+		<td><!-- TMPL_VAR name="tagfield" --> - <!-- TMPL_VAR name="tagsubfield" --></td>
+		<td><input type=text name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" -->" size=40 maxlength=80><br/>
+				<input type=text name="libopac" value="<!-- TMPL_VAR name="libopac" -->" size=40 maxlength=80></td>
+		<td><!-- TMPL_VAR name="repeatable" --></td>
+		<td><!-- TMPL_VAR name="mandatory" --></td>
+		<td><!-- TMPL_VAR name="kohafield" --></td>
+		<td><!-- TMPL_VAR name="tab" --></td>
+		<td><!-- TMPL_VAR name="authorised_value" --><br/>
+				ou <!-- TMPL_VAR name="thesaurus_category" --><br/>
+				ou <!-- TMPL_VAR name="value_builder" --></td>
+	<!-- /TMPL_LOOP -->
 	</table>
 	<INPUT type=submit value='OK'>
-
-  <p>Remarque : dans la derni&egrave;re colonne vous avez le choix entre :
-  <ul>
-    <li>Une &quot;valeur authoris&eacute;e&quot;: qui se r&eacute;f&egrave;re
-      &agrave; une liste de valeurs authoris&eacute;es pour ce sous champ. Voir
-      le tableau correspondant (admin table)</li>
-    <li>Une &quot;cat&eacute;gorie thesaurus&quot;. Voir le tableau correspondant
-      (admin table)</li>
-    <li>Un &quot;cr&eacute;ateur de valeurs&quot; : les cr&eacute;ateurs de valeurs
-      sont des programmes Perl qui vous aident &agrave; s&eacute;lectionner la
-      valeur d'un champ. Ils sont d&eacute;pendants de MARC et remplissent parfois
-      automatiquement un autre sous champ.</li>
-  </ul>
-	<p></p>
+	<p>Note: dans la dernière colonne, vous pouvez choisir:
+	<ul><li>Une "valeur autorisée": se réfère à une liste de valeurs autorisées pour ce sous-champs. Voir la table admin correspondante..</li>
+	<li>Une "catégorie thésaurus": se réfère à une catégorie du thésaurus. Voir la table admin correspondante..</li>
+	<li>Un "constructeur de valeur": les constructeurs de valeurs sont des programmes Perl qui vous aide à sélectionner les entrées d'un champ selon une syntaxe MARC. Ils remplissent aussi parfois automatiquement des sous-champs..</li>
+	</ul>
+	</p>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
+<!-- TMPL_IF name="delete_confirm" -->
 <!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=5>
+<table border=0 cellspacing=0 cellpadding=2>
 	<tr valign=top bgcolor=#99cc33>
-
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Sous champ</b></td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="tagsubfield"></b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Sous-champ</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="tagsubfield" --></b></td>
 	</tr>
-	<tr><td>&nbsp;</td><td><TMPL_VAR name="liblibrarian"></td></tr>
-	<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">'>
-	<tr>
-      <td colspan=2 align=center>CONFIRMEZ LA SUPPRESSION</td>
-    </tr>
-	<tr><td>
-        <INPUT type=submit value='OUI'>
-      </form><td><form action='<TMPL_VAR name="script_name">' method=post><input type="hidden" name="tagfield" value="<TMPL_VAR name="tagfield">">
-        <input type=submit value=NON>
-      </form></td></tr>
-</TMPL_IF>
+	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
+	<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" -->'>
+	<tr><td colspan=2 align=center>CONFIRMER SUPPRESSION</td></tr>
+	<tr><td><INPUT type=submit value='OUI'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->"><input type=submit value=NO></form></td></tr>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirmed">
+<!-- TMPL_IF name="delete_confirmed" -->
 <!-------------------------------------------------------------------------------------------------->
-	Données effacées
-	<form action='<TMPL_VAR name="script_name"> method=post><input type="hidden" name="tagfield" value="<TMPL_VAR name="tagfield">">
+	Donnée effacée
+	<form action='<!-- TMPL_VAR name="script_name" --> method=post><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->">
 	<input type=submit value=OK>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 <!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>Administration de la structure MARC pour le champ <TMPL_VAR name="tagfield"></em></font>
-<p>Cet écran montre les sous-champs associés au champ sélectionné. Vous pouvez modifier les sous-champs ou en ajouter un nouveau en cliquant sur "Editer"</p>
-<p>Les colonnes <b>champ koha</b> montre que le sous-champ est lié à un champ de koha. Koha koha peut gérer une interface MARC ou une interface propre.
-Ce lien permet de s'assurer que les deux bases sont synchronisées, et que vous pouvez ainsi passer de l'interface MARC à l'autre facilement</p>
-<table border=0 cellspacing=0 cellpadding=5>
+<!-- TMPL_IF name="else" -->
+<h1>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></h1>
+<p>This screen shows the subfields associated with the selected tag. Vous can edit subfields ou add a new one by clicking on edit. </p>
+<p>The column <b>champ Koha</b> shows that the subfield is linked with a champ Koha. Koha can manage a MARC interface, ou a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
+
+<table border=0 cellspacing=0 cellpadding=2 width="80%">
 <tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=5%><b>Sous-champ</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=30%><b>Libellé</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=10%><b>champ koha</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=8%><b>Rep</b> <span style="font-size:8;color:red" title="subfield may be repeated (1=oui, 0=non)">?</span></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=8%><b>Oblig</b> <span style="font-size:8;color:red" title="subfield is mandatory (1=oui, 0=non)">?</span></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=8%><b>Onglet</b> <span style="font-size:8;color:red" title="subfield is shown in which tab (0-9 or item)">?</span></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=8%><b>Val. autorisée</b> <span style="font-size:8;color:red" title="valeurs authorisées pour ce sous champ">?</span></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=8%><b>Thesaurus</b> <span style="font-size:8;color:red" title="Thesaurus liée à ce sous champ">?</span></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=8%><b>Plug-in</b> <span style="font-size:8;color:red" title="Créateur de valeur">?</span></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width=8%>&nbsp;</td>
-<TMPL_LOOP name="loop">
-<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><TMPL_VAR name="tagsubfield"></td>
-	<td><TMPL_VAR name="liblibrarian"></td>
-	<td><TMPL_VAR name="kohafield"></td>
-	<td><TMPL_IF name="repeatable">Oui<TMPL_ELSE>Non</TMPL_IF></td>
-	<td><TMPL_IF name="mandatory">Oui<TMPL_ELSE>Non</TMPL_IF></td>
-	<td><TMPL_VAR name="tab"></td>
-	<td><TMPL_VAR name="authorised_value"></td>
-	<td><TMPL_VAR name="thesaurus_category"></td>
-	<td><TMPL_VAR name="value_builder"></td>
-	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Sous-champ</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=30%><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>champ Koha</b> <span style="font-size:8;color:red" title="le champ koha-DB lié à ce sous-champ">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Rep</b> <span style="font-size:8;color:red" title="sous-champ répétable (1=oui, 0=non)">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>obligatoire</b> <span style="font-size:8;color:red" title="sous-champ obligatoire (1=oui, 0=non)">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Onglet</b> <span style="font-size:8;color:red" title="sous-champ affiché dans quel onglet (0-9 ou item)">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Valeur autorisée</b> <span style="font-size:8;color:red" title="valeurs autorisées pour ce sous-champ">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Thésaurus</b> <span style="font-size:8;color:red" title="Thésaurus lié à ce sous-champ">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%><b>Val build</b> <span style="font-size:8;color:red" title="Constructeur de valeur">?</span></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%>Supprimer</td>
+<!-- TMPL_LOOP name="loop" -->
+<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+	<td><!-- TMPL_VAR name="tagsubfield" --></td>
+	<td><!-- TMPL_VAR name="liblibrarian" --></td>
+	<td><!-- TMPL_VAR name="kohafield" --></td>
+	<td><!-- TMPL_IF name="repeatable" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
+	<td><!-- TMPL_IF name="mandatory" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
+	<td><!-- TMPL_VAR name="tab" --></td>
+	<td><!-- TMPL_VAR name="authorised_value" --></td>
+	<td><!-- TMPL_VAR name="thesaurus_category" --></td>
+	<td><!-- TMPL_VAR name="value_builder" --></td>
+	<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 </tr>
-</TMPL_LOOP>
-</form></table>
+<!-- /TMPL_LOOP -->
+</table>
 <table width=60%>
 	<tr>
-		<td width="25%"><TMPL_VAR name="edit"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-		<td width="25%"><a href="marctagstructure.pl?searchfield=<TMPL_VAR name="tagfield">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0></a></td>
-		<td width="25%"><TMPL_IF name="previous"><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 ></a></TMPL_IF></td>
-		<td width="25%"><TMPL_IF name="next"><TMPL_VAR name="next"><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/1rightarrow.png" title="next" ALT="next" BORDER=0></a></TMPL_IF></td>
+		<td width="25%"><!-- TMPL_VAR name="edit" --><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+		<td width="25%"><a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR name="tagfield" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0></a></td>
+		<td width="25%"><!-- TMPL_IF name="previous" --><input type=image src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 ></a><!-- /TMPL_IF --></td>
+		<td width="25%"><!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" --><input type=image src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" ALT="next" BORDER=0></a><!-- /TMPL_IF --></td>
 	</tr>
 </table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl
index 6e95e6d007..be2e56cab7 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl
@@ -1,5 +1,5 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-	
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
 <script>
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
@@ -38,138 +38,115 @@
 		var _alertString="";
 		var alertString2;
 		if (f.tagfield.value.length==0) {
-			_alertString += "- tag number missing\\n";
+			_alertString += "- tag number missing\n";
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\\n";
-			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+			alertString2 = "Form not submitted because sur the following problem(s)\n";
+			alertString2 += "------------------------------------------------------------------------------------\n\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
 	</SCRIPT>
 
-<TMPL_IF name="add_form">
+<!-- TMPL_IF name="add_form" -->
 <!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<form action='<TMPL_VAR name="script_name">' name="Aform" method="post">
+	<H1><!-- TMPL_VAR name="action" --></H1>
+	<form action='<!-- TMPL_VAR name="script_name" -->' name="Aform" method="post">
 	<input type=hidden name=op value='add_validate'>
 	<table>
-	<tr><td>Champs</td><td><TMPL_VAR name="searchfield"></td></tr>
-	<tr>
-      <td>Liblibrarian</td>
-      <td><input type="text" name="liblibrarian" value='<TMPL_VAR name="liblibrarian" escape=HTML>' size=80 maxlength=100></td></tr>
-	<tr>
-      <td>Libopac</td>
-      <td><input type="text" name="libopac" value='<TMPL_VAR name="libopac" escape=HTML>' size=80 maxlength=100></td></tr>
-	<tr>
-      <td>Incrementation</td>
-      <td><TMPL_VAR name="repeatable"></td></tr>
-	<tr>
-      <td>Obligatoire</td>
-      <td><TMPL_VAR name="mandatory"></td></tr>
-	<tr>
-      <td>Valeur autoris&eacute;e</td>
-      <td><TMPL_VAR name="authorised_value"> (si vous s&eacute;lectionnez une
-        valeur ici, les indicateurs seront limit&eacute;s &agrave; la seule liste 
-        de valeurs autoris&eacute;es)</td>
-    </tr>
+	<tr><td>Etiquette</td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
+	<tr><td>Libellé bibliothécaire</td><td><input type="text" name="liblibrarian" value='<!-- TMPL_VAR name="liblibrarian" escape=HTML -->' size=80 maxlength=100></td></tr>
+	<tr><td>Lib pour l'opac</td><td><input type="text" name="libopac" value='<!-- TMPL_VAR name="libopac" escape=HTML -->' size=80 maxlength=100></td></tr>
+	<tr><td>Répétable</td><td><!-- TMPL_VAR name="repeatable" --></td></tr>
+	<tr><td>Obligatoire</td><td><!-- TMPL_VAR name="mandatory" --></td></tr>
+	<tr><td>Valeur autorisée</td><td><!-- TMPL_VAR name="authorised_value" --> (Si vous sélectionnez une valeur ici, les indicateurs seront limités une liste de valeurs autorisées)</td></tr>
 	<tr><td>&nbsp;</td><td><INPUT type="button" value='OK' onClick='Check(this.form)'></td></tr>
 	</table>
 	</form>
-</TMPL_IF>
-<TMPL_IF name="delete_confirm">
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name="delete_confirm" -->
 <!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=5>
+<table border=0 cellspacing=0 cellpadding=2>
 	<tr valign=top bgcolor=#99cc33>
-		
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Balise</b></td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
+		<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>etiquette</b></td>
+		<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
 	</tr>
-	<tr><td>&nbsp;</td><td><TMPL_VAR name="liblibrarian"></td></tr>
-	<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">'>
-	<tr>
-      <td colspan=2 align=center>CONFIRMEZ LA SUPPRESSION</td>
-    </tr>
-	<tr><td>
-        <INPUT type=submit value='OUI'>
-      </form><td><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=NO></form></td></tr>
-</TMPL_IF>
+	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
+	<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" -->'>
+	<tr><td colspan=2 align=center>CONFIRMER SUPPRESSION</td></tr>
+	<tr><td><INPUT type=submit value='OUI'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirmed">
+<!-- TMPL_IF name="delete_confirmed" -->
 <!-------------------------------------------------------------------------------------------------->
-	Données effacées
-	<form action='<TMPL_VAR name="script_name">' method=post>
+	Donnée effacée
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type=submit value=OK>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 <!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>Gestion de la structure de balisage MARC</em></font>
-<p><b>NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez à votre administrateur d'exécuter le script misc/rebuildnonmarc.pl</b></p>
-<form action='<TMPL_VAR name="script_name">' method=post>
+<!-- TMPL_IF name="else" -->
+<h1>Admin Structure étiquette MARC</h1>
+<b>Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl.</b>
+<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type=text name=searchfield value="">
-	<input type=reset name=reset value="clr">
+	<input type=reset name=reset value="effacer">
 </form>
-<TMPL_VAR name="searchfield">
-<table border=0 cellspacing=0 cellpadding=5>
+<!-- TMPL_VAR name="searchfield" -->
+<table border=0 cellspacing=0 cellpadding=2>
 <tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="5%"><b>Balise</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="45%"><b>Libellé</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="5%"><b>Répétable</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="5%"><b>Obligatoire</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="10%"><b>Valeurs<br /></b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="16%"><b>Sous champs</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="7%">&nbsp;</td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="7%">&nbsp;</td>
-<TMPL_LOOP name="loop">
-<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><TMPL_VAR name="tagfield"></td>
-	<td><TMPL_VAR name="liblibrarian"></td>
-	<td><TMPL_IF name="repeatable">OUI<TMPL_ELSE>NON</TMPL_IF></td>
-	<td><TMPL_IF name="mandatory">OUI<TMPL_ELSE>NON</TMPL_IF></td>
-	<td><TMPL_VAR name="authorised_value"></td>
-	<td><a href="<TMPL_VAR name="subfield_link">">Sous champs</a></td>
-	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0" height="25"></a></td>
-	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0" height="25"></a></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Etiquette</b></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Répétable</b></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Obligatoire</b></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Autorisé<br />valeur</b></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Sous-champs</b></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">Editer</td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">Supprimer</td>
+<!-- TMPL_LOOP name="loop" -->
+<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+	<td><b><!-- TMPL_VAR name="tagfield" --></b></td>
+	<td><!-- TMPL_VAR name="liblibrarian" --></td>
+	<td><!-- TMPL_IF name="repeatable" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
+	<td><!-- TMPL_IF name="mandatory" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
+	<td><!-- TMPL_VAR name="authorised_value" --></td>
+	<td><a href="<!-- TMPL_VAR name="subfield_link" -->">subfields</a></td>
+	<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+	<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 </tr>
-</TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
+<!-- /TMPL_LOOP -->
+<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 <input type=hidden name=op value=add_form>
-</form></table>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=hidden name=op value=add_form>
-<table width=40%>
-	<tr>
-		<td width=50%><TMPL_VAR name="previous"></td>
-		<td width=50%><TMPL_VAR name="next"></td>
-	</tr>
 </table>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+	<input type=hidden name=op value=add_form>
 <table width=40%>
 	<tr>
 		<td width="33%">
-			<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 >
+			<input type=submit class="button" value="Ajouter une étiquette" title="Ajouter une étiquette" alt="Ajouter une étiquette" >
 		</td>
 		<td width=33%>
-			<TMPL_IF name="isprevpage">
-				<a href="<TMPL_VAR name="script_name">?offset=<TMPL_VAR name="prevpage">&searchfield=<TMPL_VAR name="searchfield">">
-				<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
+			<!-- TMPL_IF name="isprevpage" -->
+				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="prevpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
+				<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
 				</a>
-			</TMPL_IF>
+			<!-- /TMPL_IF -->
 		</td>
 		<td width=33%>
-			<TMPL_IF name="nextpage">
-				<a href="<TMPL_VAR name="script_name">?offset=<TMPL_VAR name="nextpage">&searchfield=<TMPL_VAR name="searchfield">">
-					<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
+			<!-- TMPL_IF name="nextpage" -->
+				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="nextpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
+					<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
 				</a>
-			</TMPL_IF>
+			<!-- /TMPL_IF -->
 		</td>
 	</tr>
 </table>
 </form>
-</TMPL_IF>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
-</table>
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl
index 21cd43b548..851cd405e8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl
@@ -1,6 +1,6 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF NAME=add_form>
+<!-- TMPL_IF NAME=add_form -->
         <script>
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -47,7 +47,7 @@
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 = "Form not submitted because sur the following problem(s)\n";
                         alertString2 += "------------------------------------------------------------------------------------\n\n";
                         alertString2 += _alertString;
                         alert(alertString2);
@@ -55,41 +55,41 @@
         }
         </SCRIPT>
 
-	<TMPL_IF NAME=searchfield>
+	<!-- TMPL_IF NAME=searchfield -->
 		<h1>Modifier imprimante</h1>
-	<TMPL_ELSE>
-		<h1>Ajout imprimante</h1>
-	</TMPL_IF>
+	<!-- TMPL_ELSE -->
+		<h1>Ajouter une imprimante</h1>
+	<!-- /TMPL_IF -->
 
-        <form action='<TMPL_VAR NAME=script_name>' name=Aform method=post>
+        <form action='<!-- TMPL_VAR NAME=script_name -->' name=Aform method=post>
         <input type=hidden name=op value='add_validate'>
         
 
 	<table>
 
-	<TMPL_IF NAME=searchfield>
+	<!-- TMPL_IF NAME=searchfield -->
 		<tr>
-			<td>Nom imprimante</td>
+			<td>Nom Imprimante</td>
 			<td>
-				<input type=hidden name=printername value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
+				<input type=hidden name=printername value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
 			</td>
 		</tr>
-	<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 		<tr>
-			<td>Nom imprimante</td>
+			<td>Nom Imprimante</td>
 			<td>
 				<input type=text name=printername size=50 maxlength=50>
 			</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 
         	<tr>
 			<td>Queue</td>
-			<td><input type=text name=printqueue size=50 maxlength=50 value='<TMPL_VAR NAME=printqueue>'> </td>
+			<td><input type=text name=printqueue size=50 maxlength=50 value='<!-- TMPL_VAR NAME=printqueue -->'> </td>
 		</tr>
         	<tr>
-			<td>Type</td>
-			<td><input type=text name=printtype size=50 maxlength=50 value='<TMPL_VAR NAME=printtype>'> </td>
+			<td>Saisir</td>
+			<td><input type=text name=printtype size=50 maxlength=50 value='<!-- TMPL_VAR NAME=printtype -->'> </td>
 		</tr>
         	<tr>
 			<td> </td>
@@ -98,106 +98,107 @@
         </table>
         </form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-	Donn&eacute;e enregistr&eacute;e
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=add_validate -->
+	Donnée enregistrée
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=submit value=OK>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
+<!-- TMPL_IF NAME=delete_confirm -->
 	<table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
 			<td background='/images/background-mem.gif'><b>Imprimante</b></td>
-			<td background='/images/background-mem.gif'><b><TMPL_VAR NAME=searchfield></b></td>
+			<td background='/images/background-mem.gif'><b><!-- TMPL_VAR NAME=searchfield --></b></td>
 		</tr>
 
-        	<form action='<TMPL_VAR NAME=script_name>' method=post>
+        	<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=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'>
         
 		<tr>
 			<td>Queue</td>
-			<td><TMPL_VAR NAME=printqueue></td>
+			<td><!-- TMPL_VAR NAME=printqueue --></td>
 		</tr>
         	<tr>
-			<td>Type</td>
-			<td><TMPL_VAR NAME=printtype></td>
+			<td>Saisir</td>
+			<td><!-- TMPL_VAR NAME=printtype --></td>
 		</tr>
         	<tr>
 			<td colspan=2 align=center>CONFIRMER SUPPRESSION</td>
 		</tr>
         	<tr>
 			<td>
-				<input type=submit value=YES>
+				<input type=submit value=OUI>
 				</form>
 			</td>
 			<td>
-				<form action='<TMPL_VAR NAME=script_name>' method=post>
+				<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 				<input type=submit value=NO>
 				</form>
 			</td>
 		</tr>
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-	Donn&eacute;e supprim&eacute;e
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=delete_confirmed -->
+	Donnée effacée
+	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
 		<input type=submit value=OK>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=else>
-	<h2>Imprimantes</h2>
+<!-- TMPL_IF NAME=else -->
+	<h2>Admin Imprimante</h2>
         <form action='<TMP_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
+                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
+                <input type=reset name=reset value="effacer">
         </form>
 
-	<TMPL_IF NAME=searchfield>
-		Rechercher sur : <b><TMPL_VAR NAME=searchfield></b>
-	</TMPL_IF>
+	<!-- TMPL_IF NAME=searchfield -->
+		Votre recherche sur <b><!-- TMPL_VAR NAME=searchfield --></b>
+	<!-- /TMPL_IF -->
 
 	<table border=0 cellspacing=0 cellpadding=5>
 		<tr bgcolor='#99cc33'>
 			<td background='/images/background-mem.gif'><b>Nom</b></td>
 			<td background='/images/background-mem.gif'><b>Queue</b></td>
-			<td background='/images/background-mem.gif'><b>Type</b></td>
+			<td background='/images/background-mem.gif'><b>Saisir</b></td>
 			<td background='/images/background-mem.gif'> </td>
 			<td background='/images/background-mem.gif'> </td>
 		</tr>
-		<TMPL_LOOP NAME=loop>
-		<tr bgcolor="<TMPL_VAR NAME=toggle>">
-			<td><TMPL_VAR NAME=printername></td>
-			<td><TMPL_VAR NAME=printqueue></td>
-			<td><TMPL_VAR NAME=printtype></td>
-			<td><a href="<TMPL_VAR NAME=script_name>?op=add_form&searchfield=<TMPL_VAR NAME=printername>">Edit</a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=printername>">Delete</a></td>
+		<!-- TMPL_LOOP NAME=loop -->
+		<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
+			<td><!-- TMPL_VAR NAME=printername --></td>
+			<td><!-- TMPL_VAR NAME=printqueue --></td>
+			<td><!-- TMPL_VAR NAME=printtype --></td>
+			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=printername -->">Editer</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=printername -->">Supprimer</a></td>
 		</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
 
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
+	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=hidden name=op value=add_form>
 	
-	<TMPL_IF NAME=offsetgtzero>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prec</a>
-	</TMPL_IF>
+	<!-- TMPL_IF NAME=offsetgtzero -->
+		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->"><< Prev</a>
+	<!-- /TMPL_IF -->
 
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-	<TMPL_IF NAME=ltcount>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">Suiv >></a>
-	</TMPL_iF>
+	<!-- TMPL_IF NAME=ltcount -->
+		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Suivant >></a>	
+	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Ajout" alt="Ajouter imprimante">
+	<input type=submit class="button" value="Ajouter une imprimante" alt="Ajouter une imprimante">
 	<br>
         </form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl
index ec8eab9daf..7a82456ec5 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl
@@ -1,6 +1,6 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF NAME=add_form>
+<!-- TMPL_IF NAME=add_form -->
         <script>
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -44,7 +44,7 @@
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 = "Form not submitted because sur the following problem(s)\n";
                         alertString2 += "------------------------------------------------------------------------------------\n\n";
                         alertString2 += _alertString;
                         alert(alertString2);
@@ -52,122 +52,124 @@
         }
         </SCRIPT>
 
-        <TMPL_IF NAME=searchfield>
-                <h1>Modifier mot vide</h1>
-        <TMPL_ELSE>
-                <h1>Ajouter mot vide</h1>
-        </TMPL_IF>
-        <form action="<TMPL_VAR NAME=script_name>" name=Aform method=post>
+        <!-- TMPL_IF NAME=searchfield -->
+                <h1>Modifier un mot</h1>
+        <!-- TMPL_ELSE -->
+                <h1>Ajouter un mot</h1>
+        <!-- /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>
+        
+        <!-- TMPL_IF NAME=searchfield -->
                 <tr>
-                        <td>Mot vide</td>
+                        <td>Mot</td>
                         <td>
-                                <input type=hidden name=word value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
+                                <input type=hidden name=word value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
                         </td>
                 </tr>
-        <TMPL_ELSE>
+        <!-- TMPL_ELSE -->
                 <tr>
-                        <td>Mot vide</td>
+                        <td>Mot</td>
                         <td>
                                 <input type=text name=word size=80 maxlength=250 onBlur=toUC(this)>
                         </td>
                 </tr>
-        </TMPL_IF>
+        <!-- /TMPL_IF -->
                 <tr>
                         <td> </td>
                         <td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
                 </tr>
         </table>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-        Mot vide enregistr&eacute;
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=add_validate -->
+        Donnée enregistrée
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=submit value=OK>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
+<!-- TMPL_IF NAME=delete_confirm -->
         <table border=0 cellspacing=0 cellpadding=5>
                 <tr bgcolor='#99cc33'>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Mot vide</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b><TMPL_VAR NAME=searchfield></b></td>
+                        <td background='/images/background-mem.gif'><b>Mot</b></td>
+                        <td background='/images/background-mem.gif'><b><!-- TMPL_VAR NAME=searchfield --></b></td>
                 </tr>
 
-                <form action='<TMPL_VAR NAME=script_name>' method=post>
+                <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=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'>
 
                 <tr>
                         <td colspan=2 align=center>CONFIRMER SUPPRESSION</td>
                 </tr>
                 <tr>
                         <td>
-                                <input type=submit value='YES'>
+                                <input type=submit value='OUI'>
                                 </form>
                         </td>
                         <td>
-                                <form action='<TMPL_VAR NAME=script_name>' method=post>
+                                <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
                                         <input type=submit value=NO>
                                 </form>
                         </td>
                 </tr>
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-        Donn&eacute;e supprim&eacute;e
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=delete_confirmed -->
+        Donnée effacée
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
                 <input type=submit value=OK>
         </form>
-</TMPL_IF>
-
-<TMPL_IF NAME=else>
-        <h2>Mots vides</h2>
-	<b>NOTE : Si vous modifiez cette table, demandez à votre administrateur système d'exécuter le script misc/rebuildnonmarc.pl</b>
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=text name=searchfield value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME=else -->
+        <h2>Admin Mots vide</h2>
+	<b>Note : si vous changez quelque chose dans cette table, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl.</b>
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+                <input type=text name=searchfield value=<!-- TMPL_VAR NAME=searchfield -->>
+                <input type=reset name=reset value="effacer">
         </form>
 
-        <TMPL_IF NAME=searchfield>
-                Rechercher sur <b><TMPL_VAR NAME=searchfield></b>
-        </TMPL_IF>
+        <!-- TMPL_IF NAME=searchfield -->
+                Votre recherche sur <b><!-- TMPL_VAR NAME=searchfield --></b>
+        <!-- /TMPL_IF -->
 
         <table border=0 cellspacing=0 cellpadding=5>
                 <tr bgcolor='#99cc33'>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Mot vide</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'> </td>
+                        <td background='/images/background-mem.gif'><b>Mot</b></td>
+                        <td background='/images/background-mem.gif'> </td>
                 </tr>
-                <TMPL_LOOP NAME=loop>
-                <tr bgcolor="<TMPL_VAR NAME=toggle>">
-                        <td><TMPL_VAR NAME=word></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=word>">Delete</a></td>
+                <!-- TMPL_LOOP NAME=loop -->
+                <tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
+                        <td><!-- TMPL_VAR NAME=word --></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=word -->">Supprimer</a></td>
                 </tr>
-                </TMPL_LOOP>
+                <!-- /TMPL_LOOP -->
         </table>
 
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=hidden name=op value=add_form>
 
-        <TMPL_IF NAME=offsetgtzero>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prec</a>
-        </TMPL_IF>
+        <!-- TMPL_IF NAME=offsetgtzero -->
+                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->"><< Prev</a>
+        <!-- /TMPL_IF -->
+
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-        <TMPL_IF NAME=ltcount>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">Suiv >></a>
-        </TMPL_iF>
+        <!-- TMPL_IF NAME=ltcount -->
+                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Suivant >></a>
+        <!-- /TMPL_iF -->
 
         <br>
-        <input type=submit class="button" value="Ajouter">
+        <input type=submit class="button" value="Ajouter un mot vide" ALT="Ajouter un mot vide" >
         <br>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl
index e4e3683d6a..ef79dcc44b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl
@@ -1,4 +1,5 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
 <script>
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
@@ -37,110 +38,116 @@
 		var _alertString="";
 		var alertString2;
 		if (f.variable.value.length==0) {
-			_alertString += "- variable missing\\n";
+			_alertString += "- variable missing\n";
 		}
 		if (f.value.value.length==0) {
-			_alertString += "- value missing\\n";
+			_alertString += "- value missing\n";
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\\n";
-			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+			alertString2 = "Form not submitted because sur the following problem(s)\n";
+			alertString2 += "------------------------------------------------------------------------------------\n\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
 	</SCRIPT>
 
-<TMPL_IF name="add_form">
-<!-------------------------------------------------------------------------------------------------->
-	<TMPL_IF NAME=modify>
-		<h1>Modifier pr&eacute;f&eacute;rence syst&egrave;me</h1>
-	<TMPL_ELSE>
-		<H1>Ajouter pr&eacute;f&eacute;rence syst&egrave;me</H1>
-	</TMPL_IF>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
+<!-- TMPL_IF name="add_form" -->
+<!------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF NAME=modifier -->
+		<h1>Modifier une préférence système</h1>
+	<!-- TMPL_ELSE -->
+		<H1>Ajouter une préférence système</H1>
+	<!-- /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><td>Variable</td><td><TMPL_VAR name="searchfield"><input type=hidden name=variable value='<TMPL_VAR NAME=searchfield>'></td></tr>
-	<TMPL_ELSE>
+	<!-- TMPL_IF NAME=searchfield -->
+		<tr><td>Variable</td><td><!-- TMPL_VAR name="searchfield" --><input type=hidden name=variable value='<!-- TMPL_VAR NAME=searchfield -->'></td></tr>
+	<!-- TMPL_ELSE -->
 		<tr><td>Variable</td><td><input type=text name=variable></td></tr>
-	</TMPL_IF>
-	<tr><td>Value</td><td><input type=text name=value value='<TMPL_VAR name="value">'></td></tr>
-	<tr><td>Explanation</td><td><input type=text name=explanation size=80 value='<TMPL_VAR name="explanation">'></td></tr>
+	<!-- /TMPL_IF -->
+	<tr><td>Valeur</td><td><input type=text name=value value="<!-- TMPL_VAR name="value" escape=HTML -->"></td></tr>
+	<tr><td>Explication</td><td><input type=text name=explanation size=80 value="<!-- TMPL_VAR name="explanation" escape=HTML -->"></td></tr>
 	<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 	</table>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="add_validate">
-<!-------------------------------------------------------------------------------------------------->
+<!-- TMPL_IF name="add_validate" -->
+<!------------------------------------------------------------------------------------------------>
 	Donnée enregistrée
-	<form action='<TMPL_VAR name="script_name">' method=post>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type=submit value=OK>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
-<!-------------------------------------------------------------------------------------------------->
+<!-- TMPL_IF name="delete_confirm" -->
+<!------------------------------------------------------------------------------------------------>
 <table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Variable</b></td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
+	<tr valign=top bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
 	</tr>
-	<tr><td>Value</td><td><TMPL_VAR name="Tvalue"></td></tr>
-	<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">'>
-	<tr><td colspan=2 align=center>Confirmez la suppression</td></tr>
-	<tr><td><INPUT type=submit value='YES'></form></td><td><form action='$script_name' method=post><input type=submit value=NO></form></td></tr>
-</TMPL_IF>
+	<tr><td>Valeur</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+	<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" -->'>
+	<tr><td colspan=2 align=center>CONFIRMER SUPPRESSION</td></tr>
+	<tr><td><INPUT type=submit value='OUI'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
+</table>
 
-<TMPL_IF name="delete_confirmed">
-<!-------------------------------------------------------------------------------------------------->
-	Donnée supprimée
-	<form action='<TMPL_VAR name="script_name">' method=post>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirmed" -->
+<!------------------------------------------------------------------------------------------------>
+	Donnée effacée
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type=submit value=OK>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>Administration des préférences systèmes</em></font>
+<!------------------------------------------------------------------------------------------------>
+<!-- TMPL_IF name="else" -->
+<h1>Admin Préférences système</h1>
 <form action=/cgi-bin/koha/admin/systempreferences.pl method=post>
 	<input type=text name=searchfield value="">
-	<input type=reset name=reset value="clr">
+	<input type=reset name=reset value="effacer">
 </form>
-<TMPL_VAR name="searchfield">
+<!-- TMPL_VAR name="searchfield" -->
 <table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Paramètre</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Valeur</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Explication</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td>
-<TMPL_LOOP name="loop">
-</tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><TMPL_VAR name="variable"></td>
-	<td><TMPL_VAR name="value"></td>
-	<td><TMPL_VAR name="explanation"></td>
-	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
-	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
+<tr valign=top bgcolor="#99cc33">
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Valeur</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Explication</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
+<!-- TMPL_LOOP name="loop" -->
+</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+	<td><!-- TMPL_VAR name="variable" --></td>
+	<td><!-- TMPL_VAR name="value" --></td>
+	<td><!-- TMPL_VAR name="explanation" --></td>
+	<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>Editer</a></td>
+	<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>Supprimer</a></td>
 </tr>
-</TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
+<!-- /TMPL_LOOP -->
+<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 <input type=hidden name=op value=add_form>
 </table>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=hidden name=op value=add_form>
 <table width=40%>
 	<tr>
-		<td width=50%><TMPL_VAR name="previous"></td>
-		<td width=50%><TMPL_VAR name="next"></td>
+		<td width=50%><!-- TMPL_VAR name="previous" --></td>
+		<td width=50%><!-- TMPL_VAR name="next" --></td>
 	</tr>
 </table>
-<br><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" border="0"></a><br>
 </form>
-</TMPL_IF>
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<form action=<!-- TMPL_VAR name="script_name" --> method=post>
+        <input type='hidden' name='op' value='add_form'>
+        <input type=submit class="button" value='Ajouter une préférence système'>
+</form>
+
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl
index 8d74d09106..18a3951c71 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl
@@ -1,161 +1,155 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF name="detail_form">
+<!-- TMPL_IF name="detail_form" -->
 	<!-------------------------------------------------------------------------------------------------->
-	<font SIZE=6><em>Gestion du thesaurus</em></font><br />
-	<table border=0 cellspacing=0 cellpadding=5>
+	<font SIZE=6><em>Gestion du thésaurus</em></font><br />
+	<table border=0 cellspacing=0 cellpadding=2>
 	<tr valign=top bgcolor=#99cc33>
-		<td  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Valeurs relatives &agrave;<TMPL_VAR name="stdlib">
-		(<TMPL_VAR name="category">)</b></td>
+		<td  background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>En liaison avec <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</b></td>
 	</tr>
 	</table>
 	<br/><br/>
-	<table border=0 cellspacing=0 cellpadding=5>
+	<table border=0 cellspacing=0 cellpadding=2>
 	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Autres formes</b></td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td>
-	<TMPL_LOOP name="loop">
-	</tr valign=top bgcolor='><TMPL_VAR name="bgcolor">'>
-		<td><TMPL_VAR name="freelib"></td>
-		<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
-		<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>autres formulaires</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
+	<!-- TMPL_LOOP name="loop" -->
+	</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+		<td><!-- TMPL_VAR name="freelib" --></td>
+		<td><a href="<!-- TMPL_VAR name="edit" -->">Editer</a></td>
+		<td><a href="<!-- TMPL_VAR name="delete" -->">Supprimer</a></td>
 	</tr>
-	</TMPL_LOOP>
-	<form action='<TMPL_VAR name="script_name">' method=post>
+	<!-- /TMPL_LOOP -->
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type=hidden name=op value=add_form>
-	</form></table>
-	<form action='<TMPL_VAR name="script_name">' method=post>
+	</table>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 	<input type="hidden" name="op" value="add_form">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	<input type="hidden" name="stdlib" value="<TMPL_VAR name="stdlib">">
-	<br><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" border="0"><br>
+	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->">
+	<br><input type=image src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" title="Ajouter thesaurus entry" ALT="Add" BORDER=0 ><br>
 	</form>
-</TMPL_IF>
-<TMPL_IF name="add_form">
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_form" -->
 <!-------------------------------------------------------------------------------------------------->
-<H1><TMPL_IF name="search_category">Modification<TMPL_ELSE>Ajout</TMPL_IF></H1>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
-	<TMPL_IF name="search_category">
+<H1><!-- TMPL_IF name="search_category" -->Modifier<!-- TMPL_ELSE -->Ajouter<!-- /TMPL_IF --></H1>
+	<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
+	<!-- TMPL_IF name="search_category" -->
 		<input type=hidden name=op value='mod_validate'>
-	<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 		<input type=hidden name=op value='add_validate'>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 	<table cellpadding=3 cellspacing=3>
 	<tr>
-
-      <td>Cat&eacute;gorie</td>
-		<td><TMPL_VAR name="category"></td>
+		<td>Catégorie</td>
+		<td><!-- TMPL_VAR name="category" --></td>
 	</tr>
 	<tr>
-
-      <td>Forme d'autorit&eacute;</td>
-		<TMPL_IF name="id">
-			<td><TMPL_VAR name="father"><TMPL_VAR name="stdlib"><input type="hidden" name="stdlib" value="<TMPL_VAR name="stdlib">" ></td>
-		<TMPL_ELSE>
-			<td><TMPL_VAR name="father"><input type="text" name="stdlib" value="<TMPL_VAR name="stdlib" escape=HTML>" maxlength="80" size="80"></td>
-		</TMPL_IF>
+		<td>Libellé autorité</td>
+		<!-- TMPL_IF name="id" -->
+			<td><!-- TMPL_VAR name="father" --><!-- TMPL_VAR name="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" ></td>
+		<!-- TMPL_ELSE -->
+			<td><!-- TMPL_VAR name="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR name="stdlib" escape=HTML -->" maxlength="80" size="80"></td>
+		<!-- /TMPL_IF -->
 	</tr>
 	<tr>
-
-      <td>Autre forme</td>
-		<td><TMPL_VAR name="father"><input type=text name="freelib" value='<TMPL_VAR name="freelib" escape=HTML>' maxlength="80" size="80"></td>
+		<td>Autre forme</td>
+		<td><!-- TMPL_VAR name="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR name="freelib" escape=HTML -->" maxlength="80" size="80"></td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type="hidden" name="id" value="<TMPL_VAR name="id">">
-			<input type="hidden" name="father" value="<TMPL_VAR name="father">">
-			<input type="hidden" name="branch" value="<TMPL_VAR name="branch">">
-			<input type="hidden" name="search_category" value="<TMPL_VAR name="search_category">">
-			<input type="hidden" name="searchstring" value="<TMPL_VAR name="searchstring">">
-			<input type="hidden" name="offset" value="<TMPL_VAR name="offset">">
+		<td><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->">
+			<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" escape=HTML -->">
+			<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" escape=HTML -->">
+			<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->">
+			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape=HTML -->">
+			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->">
 			<INPUT type="submit" value='OK'></td>
 	</tr>
 	</table>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
+
 
-<TMPL_IF name="delete_confirm">
+<!-- TMPL_IF name="delete_confirm" -->
 <!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>lib</b></td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="search_category"></b></td>
-	</tr>
-	<tr>
-    <td>Valeur</td>
-    <td><TMPL_VAR name="Tvalue"></td></tr>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-		<input type=hidden name=op value=delete_confirmed>
-		<input type=hidden name=id value='<TMPL_VAR name="id">'>
-		<input type="hidden" name="search_category" value="<TMPL_VAR name="search_category">">
-	<tr>
-      <td colspan=2 align=center>CONFIRMEZ LA SUPPRESSION de cet enregistrement
-        et <b>de tous les enregistrements d&eacute;pendant de celui-ci</b></td>
-    </tr>
-	<tr><td>
-        <INPUT type=submit value='OUI'>
-      </form>
-		<td><form action='<TMPL_VAR name="script_name">' method=post>
-        <input type=submit value=NON>
-      </form></td></tr>
+	<table border=0 cellspacing=0 cellpadding=2>
+		<tr valign=top bgcolor=#99cc33>
+			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>lib</b></td>
+			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="search_category" --></b></td>
+		</tr>
+		<tr><td>Valeur</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+		<tr><td>
+			<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+				<input type=hidden name=op value=delete_confirmed>
+				<input type=hidden name=id value='<!-- TMPL_VAR name="id" -->'>
+				<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->">
+		</tr></td>
+		<tr><td colspan=2 align=center>CONFIRMER SUPPRESSION de cette entrée <b>et toutes les entrées dépendantes de celle-ci</b></td></tr>
+		<tr><td><INPUT type=submit value='OUI'></form></td>
+				<td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 <!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>Gestion du thesaurus</em></font>
-<p>Gère le thésaurus et les listes d'autorité.<br />
-<ul>
-	<b>Creuser</b> : voir les données dépendantes de celle-ci<br />
-	<b>Formes exclues</b> : voir d'autres formes de ce terme d'autorité<p></p>
-</ul>
-<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
-	<TMPL_VAR name="tab_list">
-	<input type="text" name="searchstring" value="<TMPL_VAR name="searchstring">">
-	<input type="submit" value="OK">
-	<a href="thesaurus.pl?op=add_form">Nouvelle catégorie...</a>
-</form>
-<TMPL_LOOP name="hierarchy_loop">
-	<a href="thesaurus.pl?branch=<TMPL_VAR name="branch">&rechercher catégorie=<TMPL_VAR name="category">"><TMPL_VAR name="string"></a><br />
-</TMPL_LOOP>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="5%">&nbsp;</td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Forme libre</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Autorité</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="8%"><b>Creuser</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="8%"><b>Exclues</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="8%">&nbsp;</td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" width="8%">&nbsp;</td>
-<TMPL_LOOP name="loop">
-</tr valign=top bgcolor='><TMPL_VAR name="bgcolor">'>
-	<td>&nbsp;</td>
-	<td><TMPL_VAR name="freelib"></td>
-	<td><TMPL_VAR name="father"> <TMPL_VAR name="stdlib"></td>
-	<td><TMPL_VAR name="dig">Creuser</td>
-	<td><TMPL_VAR name="related">Exclues</td>
-	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0" height="25"></a></td>
-	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0" height="25"></a></td>
-</tr>
-</TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<input type=hidden name=op value=add_form>
-</form></table>
-<table width=40%>
-	<tr>
-		<td width=50%><TMPL_VAR name="previous"></td>
-		<td width=50%><TMPL_VAR name="next"></td>
+<!-- TMPL_IF name="else" -->
+	<h1>Gestion du thésaurus</h1>
+	<p>Gestion du thésaurus et des fichiers autorités.<br />
+	<ul>
+		<b>Extraire</b>: Voir les formes associées<br />
+		<b>Lié</b>: Voir les formes rejetées</p>
+	</ul>
+	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
+		<!-- TMPL_VAR name="tab_list" -->
+		<input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->">
+		<input type="submit" value="OK">
+		<a href="thesaurus.pl?op=add_form">Nouvelle catégorie...</a>
+	</form>
+	<!-- TMPL_LOOP name="hierarchy_loop" -->
+		<a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
+	<!-- /TMPL_LOOP -->
+	<table border=0 cellspacing=0 cellpadding=0>
+	<tr valign=top bgcolor=#99cc33>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%">&nbsp;</td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Formulaire libre</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Autorité</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%"><b>Extraire</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="10%"><b>Lié</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%"><b>Editer</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%"><b>Supprimer</b></td>
+	<!-- TMPL_LOOP name="loop" -->
+	</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+		<td>&nbsp;</td>
+		<td><!-- TMPL_VAR name="freelib" --></td>
+		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
+		<td><!-- TMPL_VAR name="dig" -->Extraire</a>&nbsp;&nbsp;</td>
+		<td><!-- TMPL_VAR name="related" -->Lié</a></td>
+		<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+		<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 	</tr>
-</table>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<input type="hidden" name="op" value="add_form">
-<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-<input type="hidden" name="branch" value="<TMPL_VAR name="branch">">
-<input type="hidden" name="father" value="<TMPL_VAR name="father">">
-<br><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" border="0"><br>
-</form>
-</TMPL_IF>
+	<!-- /TMPL_LOOP -->
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+	<input type=hidden name=op value=add_form>
+	</table>
+	<br/>
+	<table width=40% height="80">
+		<tr>
+			<td width=50%><a href="<!-- TMPL_VAR name="previous" -->" class="button">Previous</a></td>
+			<td width=50%><a href="<!-- TMPL_VAR name="next" -->" class="button"> Next</a></td>
+		</tr>
+	</table>
+	<br/>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+	<input type="hidden" name="op" value="add_form">
+	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
+	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->">
+	<br><input type=submit class="button"  value="Add" title="Ajouter une entrée du thésaurus" ALT="Ajouter une entrée du thésaurus"><br>
+	</form>
+
+
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
-</table>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl
index 93de6a83b7..e68f33fe95 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl
@@ -1,6 +1,6 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF NAME=add_form>
+<!-- TMPL_IF NAME=add_form -->
         <script>
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -51,18 +51,18 @@
                         _alertString += "- database missing\n";
                 }
                 if (isNaN(f.port.value)) {
-                        _alertString += "- port must be a number\n";
+                        _alertString += "- port doit be a number\n";
                 }
                 if (isNaN(f.rank.value)) {
-                        _alertString += "- rank must be a number\n";
+                        _alertString += "- rank doit be a number\n";
                 }
                 if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
-                        _alertString += "- checked must be 0 or 1\n";
+                        _alertString += "- checked doit be 0 ou 1\n";
                 }
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 = "Form not submitted because sur the following problem(s)\n";
                         alertString2 += "------------------------------------------------------------------------------------\n\n";
                         alertString2 += _alertString;
                         alert(alertString2);
@@ -70,77 +70,77 @@
         }
         </SCRIPT>
 
-        <TMPL_IF NAME=searchfield>
-                <h1>ModifierServeur Z39.50</h1>
-        <TMPL_ELSE>
-                <h1>Ajouter Serveur Z39.50</h1>
-        </TMPL_IF>
-        <form action="<TMPL_VAR NAME=script_name>" name=Aform method=post>
+        <!-- TMPL_IF NAME=searchfield -->
+                <h1>Modifier serveur Z39.50</h1>
+        <!-- TMPL_ELSE -->
+                <h1>Ajouter un serveur Z39.50</h1>
+        <!-- /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>
+        <!-- TMPL_IF NAME=searchfield -->
                 <tr>
                         <td>Serveur Z39.50</td>
                         <td>
-                                <input type=hidden name=searchfield value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
+                                <input type=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
                         </td>
                 </tr>
-        <TMPL_ELSE>
+        <!-- TMPL_ELSE -->
                 <tr>
-                        <td>Server Z39.50</td>
+                        <td>Serveur Z39.50</td>
                         <td>
                                 <input type=text name=searchfield size=100 maxlength=100 onBlur=toUC(this)>
                         </td>
                 </tr>
-        </TMPL_IF>
+        <!-- /TMPL_IF -->
 
 		<tr>
-			<td>Hostname</td>
+			<td>Nom de l'hébergeur</td>
 			<td>
-				<input type=text name=host size=30 value='<TMPL_VAR NAME=host>'>
+				<input type=text name=host size=30 value='<!-- TMPL_VAR NAME=host -->'>
 			</td>
 		</tr>
 		<tr>
 			<td>Port</td>
 			<td>
-				<input type=text name=port size=5 value='<TMPL_VAR NAME=port>' onBlur=isNum(this)>
+				<input type=text name=port size=5 value='<!-- TMPL_VAR NAME=port -->' onBlur=isNum(this)>
 			</td>
 		</tr>
 		<tr>
-			<td>Database</td>
+			<td>Base de données</td>
 			<td>
-				<input type=text name=db value='<TMPL_VAR NAME=db>'>
+				<input type=text name=db value='<!-- TMPL_VAR NAME=db -->'>
 			</td>
 		</tr>
 		<tr>
-			<td>Userid</td>
+			<td>Identifiant utilisateur</td>
 			<td>
-				<input type=text name=userid value='<TMPL_VAR NAME=userid>'>
+				<input type=text name=userid value='<!-- TMPL_VAR NAME=userid -->'>
 			</td>
 		</tr>
 		<tr>
-			<td>Password</td>
+			<td>Mot de passe</td>
 			<td>
-				<input type=text name=password value='<TMPL_VAR NAME=password>'>
+				<input type=text name=password value='<!-- TMPL_VAR NAME=password -->'>
 			</td>
 		</tr>
 		<tr>
-			<td>Actif</td>
+			<td>Coché (recherche par défaut)</td>
 			<td>
-				<input type=text size=1 name=checked value='<TMPL_VAR NAME=checked>' onBlur=isNum(this)>  
+				<input type=text size=1 name=checked value='<!-- TMPL_VAR NAME=checked -->' onBlur=isNum(this)>  
 		<tr>
-			<td>Priorité (d'affichage)</td>
+			<td>Rang (ordre d'affichage)</td>
 			<td>
-				<input type=text name=rank size=4 value='<TMPL_VAR NAME=rank>' onBlur=isNum(this)>
+				<input type=text name=rank size=4 value='<!-- TMPL_VAR NAME=rank -->' onBlur=isNum(this)>
 			</td>
 		</tr>
 		<tr>
-			<td>Syntaxe (les serveurs renvoient les données dans des formats variables. En choisir un)</td>
+			<td>Syntaxe (Z39.50 peut envoyer des notices en différents formats. Sélectionnez lequel)</td>
 			<td>
 				<select name="syntax">
-					<option value="USMARC">USMARC</option>
+					<option value="MARC21">MARC21</option>
 					<option value="UNIMARC">UNIMARC</option>
 				</select>
 			</td>
@@ -153,136 +153,136 @@
 		</tr>
         </table>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-        Donn&eacute;e enregistr&eacute;e
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=add_validate -->
+        Donnée enregistrée
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=submit value=OK>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
-	<TMPL_VAR NAME=reqsel>
+<!-- TMPL_IF NAME=delete_confirm -->
+	<!-- TMPL_VAR NAME=reqsel -->
 	
         <table border=0 cellspacing=0 cellpadding=5>
                 <tr bgcolor='#99cc33'>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'>
                                 <b>Site</b>
                         </td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'>
-                                <TMPL_VAR NAME=searchfield>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'>
+                                <!-- TMPL_VAR NAME=searchfield -->
                         </td>
                 </tr>
-                <form action='<TMPL_VAR NAME=script_name>' method=post>
+                <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=hidden name=searchfield value=<!-- TMPL_VAR NAME=searchfield -->>
                 <tr>
-                        <td>Hostname</td>
-                        <td><TMPL_VAR NAME=host></td>
+                        <td>Nom de l'hébergeur</td>
+                        <td><!-- TMPL_VAR NAME=host --></td>
                 </tr>
                 <tr>
                         <td>Port</td>
-                        <td><TMPL_VAR NAME=port></td>
+                        <td><!-- TMPL_VAR NAME=port --></td>
                 </tr>
                 <tr>
-                        <td>Database</td>
-                        <td><TMPL_VAR NAME=db></td>
+                        <td>Base de données</td>
+                        <td><!-- TMPL_VAR NAME=db --></td>
                 </tr>
                 <tr>
-                        <td>Userid</td>
-                        <td><TMPL_VAR NAME=userid></td>
+                        <td>Identifiant utilisateur</td>
+                        <td><!-- TMPL_VAR NAME=userid --></td>
                 </tr>
                 <tr>
-                        <td>Password</td>
-                        <td><TMPL_VAR NAME=password></td>
+                        <td>Mot de passe</td>
+                        <td><!-- TMPL_VAR NAME=password --></td>
                 </tr>
                 <tr>
-                        <td>Checked</td>
-                        <td><TMPL_VAR NAME=checked></td>
+                        <td>Vérifié</td>
+                        <td><!-- TMPL_VAR NAME=checked --></td>
                 </tr>
                 <tr>
-                        <td>Rank</td>
-                        <td><TMPL_VAR NAME=rank></td>
+                        <td>Rang</td>
+                        <td><!-- TMPL_VAR NAME=rank --></td>
                 </tr>
                 <tr>
                         <td colspan=2 align=center>CONFIRMER SUPPRESSION</td>
                 </tr>
                 <tr>
-                        <td><INPUT type=submit value='YES'></form></td>
-                        <td><form action='<TMPL_VAR NAME=script_name>' method=post><input type=submit value=NO></form></td>
+                        <td><INPUT type=submit value='OUI'></form></td>
+                        <td><form action='<!-- TMPL_VAR NAME=script_name -->' method=post><input type=submit value=NO></form></td>
                 </tr>
 	</table>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-        Donn&eacute;e supprim&eacute;e
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+<!-- TMPL_IF NAME=delete_confirmed -->
+        Donnée effacée
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
                 <input type=submit value=OK>
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=else>
-        <h2>Serveurs z3950</h2>
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
+<!-- TMPL_IF NAME=else -->
+        <h2>Admin Serveurs Z39.50</h2>
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
+                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
+                <input type=reset name=reset value="effacer">
         </form>
 
-        <TMPL_IF NAME=searchfield>
-                Rechercher sur <b><TMPL_VAR NAME=searchfield></b>
-        </TMPL_IF>
+        <!-- TMPL_IF NAME=searchfield -->
+                Votre recherche sur <b><!-- TMPL_VAR NAME=searchfield --></b>
+        <!-- /TMPL_IF -->
 
         <table border=0 cellspacing=0 cellpadding=5>
                 <tr bgcolor='#99cc33'>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Site</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Hostname</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Port</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Database</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Userid</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Password</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Checked</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Rank</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Syntax</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'> </td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'> </td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Site</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Nom de l'hébergeur</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Port</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Base de données</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Identifiant utilisateur</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Mot de passe</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Vérifié</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Rang</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Syntaxe</b></td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
+                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
                 </tr>
-                <TMPL_LOOP NAME=loop>
-                <tr bgcolor="<TMPL_VAR NAME=toggle>">
-                        <td><TMPL_VAR NAME=name></td>
-                        <td><TMPL_VAR NAME=host></td>
-                        <td><TMPL_VAR NAME=port></td>
-                        <td><TMPL_VAR NAME=db></td>
-                        <td><TMPL_VAR NAME=userid></td>
-                        <td><TMPL_VAR NAME=password></td>
-                        <td><TMPL_VAR NAME=checked></td>
-                        <td><TMPL_VAR NAME=rank></td>
-                        <td><TMPL_VAR NAME=syntax></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=add_form&searchfield=<TMPL_VAR NAME=name>"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" ALT="Edit" title="edit" BORDER=0 ></a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=name>"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" ALT="Delete" title="delete" BORDER=0 ></a></td>
+                <!-- TMPL_LOOP NAME=loop -->
+                <tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
+                        <td><!-- TMPL_VAR NAME=name --></td>
+                        <td><!-- TMPL_VAR NAME=host --></td>
+                        <td><!-- TMPL_VAR NAME=port --></td>
+                        <td><!-- TMPL_VAR NAME=db --></td>
+                        <td><!-- TMPL_VAR NAME=userid --></td>
+                        <td><!-- TMPL_VAR NAME=password --></td>
+                        <td><!-- TMPL_VAR NAME=checked --></td>
+                        <td><!-- TMPL_VAR NAME=rank --></td>
+                        <td><!-- TMPL_VAR NAME=syntax --></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=name -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" ALT="Edit" title="éditer" BORDER=0 ></a></td>
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=name -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" ALT="Delete" title="supprimer" BORDER=0 ></a></td>
 			</tr>
-                </TMPL_LOOP>
+                <!-- /TMPL_LOOP -->
 	</table>
 
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
+        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
         <input type=hidden name=op value=add_form>
                         
-        <TMPL_IF NAME=offsetgtzero>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prec</a>
-        </TMPL_IF>
+        <!-- TMPL_IF NAME=offsetgtzero -->
+                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->"><< Prev</a>
+        <!-- /TMPL_IF -->
         
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-        <TMPL_IF NAME=ltcount>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">suiv >></a>
-        </TMPL_iF>
+        <!-- TMPL_IF NAME=ltcount -->
+                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Suivant >></a>
+        <!-- /TMPL_iF -->
                 
         <br>
-        <input type=submit class="button" alt="Ajouter" value="Ajouter serveur Z39.50">
+        <input type=submit class="button" alt="Ajouter un serveur Z39.50" value="Ajouter un serveur Z39.50">
         <br>
         </form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/reports.tmpl b/koha-tmpl/intranet-tmpl/default/fr/reports.tmpl
new file mode 100644
index 0000000000..f8f690d0fb
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/reports.tmpl
@@ -0,0 +1,8 @@
+<!-- TMPL_INCLUDE Name="issues-top.inc" -->
+
+<H1> <!-- TMPL_VAR Name="type" --> reports </H1>
+
+<!-- TMPL_LOOP Name="dataloop" -->
+	<!-- TMPL_VAR Name="value" -->
+<!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE Name="issues-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl
index f0eca6f767..6914f32260 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl
@@ -1,15 +1,16 @@
-<TMPL_INCLUDE NAME="reports-top.inc">
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 <!-------------------------MAIN BODY OF PAGE-------------------------->
 
-<FONT SIZE=6><em>Reports</em></FONT><br>
+<h1>Rapports</h1><br>
 
 
 
 
-<ul>
-<li><a href=/cgi-bin/koha/stats.pl?time=yesterday>Rapprochement </a> Journalier (hier)</li>
-<li><a href=/cgi-bin/koha/stats.pl?time=today>Rapprochement </a> Journalier (aujourd'hui)</li>
-<li><a href=/cgi-bin/koha/overdue.pl>Retours en retard</a>
+<ul><li><a href=/cgi-bin/koha/stats.pl?time=yesterday>Jusqu'à la réconciliation:</a> Rapport quotidien (hier)
+<li><a href=/cgi-bin/koha/stats.pl?time=today>Jusqu'à la réconciliation:</a> Rapport quotidien (aujourd'hui)
+<li><a href=/cgi-bin/koha/overdue.pl>Ouvrages en retard</a>
+
+
 </ul>
-<TMPL_INCLUDE NAME="reports-bottom.inc">
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/request.tmpl b/koha-tmpl/intranet-tmpl/default/fr/request.tmpl
index 45549bf8b5..fa45999510 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/request.tmpl
@@ -1,167 +1,166 @@
-<TMPL_INCLUDE Name="cat-top.inc">
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 <form action="placerequest.pl" method=post>
-<input type=hidden name=biblio value="<TMPL_VAR Name="bib">">
+<input type=hidden name=biblio value="<!-- TMPL_VAR Name="bib" -->">
 <input type=hidden name=type value=str8>
-<input type=hidden name=title value="<TMPL_VAR Name="title">">
-<FONT SIZE=6><em>Réserver :
-<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="bib">><TMPL_VAR Name="title"></a>
-<TMPL_VAR Name="author">)</em></FONT>
+<input type=hidden name=title value="<!-- TMPL_VAR Name="title" -->">
+<h1>Réserver:
+<a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->><!-- TMPL_VAR Name="title" --></a>
+<!-- TMPL_VAR Name="author" --></h1><P>
 <p>
 
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Ordre</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>N° lecteur</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Notes</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Date</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Pris</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Réservé</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Rang</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>N° Lecteur</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Notes</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Date</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Ramassage</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Réservation</b></TD>
 	</TR>
 	<tr VALIGN=TOP  >
 		<td>
 			<select name=rank-request>
 			<!--$priorityoptions-->
-			<TMPL_LOOP Name="optionloop">
-				<option value="<TMPL_VAR Name="num">" <TMPL_IF Name="selected"> selected</TMPL_IF>>
-					<TMPL_VAR Name="num">
+			<!-- TMPL_LOOP Name="optionloop" -->
+				<option value="<!-- TMPL_VAR Name="num" -->" <!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR Name="num" -->
 				</option>
-			</TMPL_LOOP>
+			<!-- /TMPL_LOOP -->
 			</select>
 		</td>
 		<td><input type=text size=10 name=member></td>
 		<td><input type=text size=20 name=notes></td>
-		<td><TMPL_VAR Name=date></td>
-		<td><TMPL_VAR name="CGIbranch"></td>
+		<td><!-- TMPL_VAR Name=date --></td>
+		<td><!-- TMPL_VAR name="CGIbranch" --></td>
 		<td>
-			<input type=checkbox name=request value=any>Prochain dispo,<br>(ou choisir dans la liste ci après)
+			<input type=checkbox name=request value=tout>Prochain dispo, ou choix dans la liste
 		</td>
 	</tr>
 </table>
-<p><INPUT TYPE="submit" name="submit"  VALUE="R&eacute;server" class="button"></p>
-
+<INPUT type="submit" value="request" class="button">
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 <TR VALIGN=TOP>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Réservation</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Type exemplaire</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Classification</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Volume</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Date pub</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Copies</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Réservation</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Catég ouvrage</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Classification</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Volume</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Date de publication</b></TD>
+	<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Copies</b></TD>
 </TR>
 <!--$bibitemrows-->
-<TMPL_LOOP Name="bibitemloop">
+<!-- TMPL_LOOP Name="bibitemloop" -->
 	<tr VALIGN=TOP>
 		<TD>
-			<TMPL_IF Name="itemlost">
-				Sélection impossible
-			<TMPL_ELSE>
-				<input type=checkbox name=reqbib value=<TMPL_VAR Name="biblioitemnumber">>
-				<input type=hidden name=biblioitem value=<TMPL_VAR Name="biblioitemnumber">>
-			</TMPL_IF>
+			<!-- TMPL_IF Name="itemlost" -->
+				Ne peut pas être sélectionné
+			<!-- TMPL_ELSE -->
+				<input type=checkbox name=reqbib value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
+				<input type=hidden name=biblioitem value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
+			<!-- /TMPL_IF -->
 		</td>
 		<TD>
-			<TMPL_VAR Name="description">
+			<!-- TMPL_VAR Name="description" -->
 		</td>
 		<TD>
-			<TMPL_VAR Name="class">
+			<!-- TMPL_VAR Name="class" -->
 		</td>
 		<td>
-			<TMPL_VAR Name="volumeddesc">
+			<!-- TMPL_VAR Name="volumeddesc" -->
 		</td>
 		<td>
-			<TMPL_VAR Name="publicationyear">
+			<!-- TMPL_VAR Name="publicationyear" -->
 		</td>
 		<td>
-			<TMPL_LOOP Name="barcodeloop">
-				<TMPL_VAR Name="barcode"> <TMPL_VAR Name="message"><br>
-			</TMPL_LOOP>
+			<!-- TMPL_LOOP Name="barcodeloop" -->
+				<!-- TMPL_VAR Name="barcode" --> <!-- TMPL_VAR Name="message" --><br>
+			<!-- /TMPL_LOOP -->
 		</td>
 	</tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 
 </table>
+
 </form>
 <p>&nbsp;</p>
 
 
-<form name=T<TMPL_VAR Name="time"> action=modrequest.pl method=post>
+<form name=T<!-- TMPL_VAR Name="time" --> action=modrequest.pl method=post>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=7><B>Modifier réservations existantes</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=7><B>MODIFIER DEMANDES EXISTANTES </b></TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Ordre</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Lecteur</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Notes</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Date</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Pris</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Réservé</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Rang</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Lecteur</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Notes</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Date</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Ramassage</b></TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Réservation</b></TD>
 	</TR>
 	<!--$existingreserves-->
-	<TMPL_LOOP Name="reserveloop">
+	<!-- TMPL_LOOP Name="reserveloop" -->
 		<tr VALIGN=TOP>
 			<TD>
-			<input type=hidden name=borrowernumber value=<TMPL_VAR Name="borrowernumber">>
-			<input type=hidden name=biblio value=<TMPL_VAR Name="biblionumber">>
+			<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="borrowernumber" -->>
+			<input type=hidden name=biblio value=<!-- TMPL_VAR Name="biblionumber" -->>
 			<select name=rank-request>
-				<TMPL_IF Name="wait">
+				<!-- TMPL_IF Name="wait" -->
 					<option value=W selected>En attente</option>
-				</TMPL_IF>
-				<TMPL_LOOP Name="optionloop">
-					<option value="<TMPL_VAR Name="num">" <TMPL_IF Name="selected"> selected </TMPL_IF>>
-						<TMPL_VAR Name="num">
+				<!-- /TMPL_IF -->
+				<!-- TMPL_LOOP Name="optionloop" -->
+					<option value="<!-- TMPL_VAR Name="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+						<!-- TMPL_VAR Name="num" -->
 					</option>
-				</TMPL_LOOP>
-				<option value=del>Suppr</option>
+				<!-- /TMPL_LOOP -->
+				<option value=del>Suppr.</option>
 			</select></td>
 			<TD>
-			<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="borrowernumber">><TMPL_VAR Name="firstname"> <TMPL_VAR Name="surname"></a>
+			<a href=/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="borrowernumber" -->><!-- TMPL_VAR Name="firstname" --> <!-- TMPL_VAR Name="surname" --></a>
 			</td>
-			<td><TMPL_VAR Name="notes"></td>
-			<TD><TMPL_VAR Name="date"></td>
-			<TD><TMPL_IF Name="wait">
-				Exemplaire en attente à <b> <TMPL_VAR Name="wbrname"></b> <input type=hidden name=pickup value=<TMPL_VAR Name="wbrcd">>
-				<TMPL_ELSE>
+			<td><!-- TMPL_VAR Name="notes" --></td>
+			<TD><!-- TMPL_VAR Name="date" --></td>
+			<TD><!-- TMPL_IF Name="wait" -->
+				Ouvrage en attente à <b> <!-- TMPL_VAR Name="wbrname" --></b> <input type=hidden name=pickup value=<!-- TMPL_VAR Name="wbrcd" -->>
+				<!-- TMPL_ELSE -->
 					<select name=pickup>
-						<TMPL_LOOP Name="branchloop">
-							<option value=<TMPL_VAR Name="branch">
-								<TMPL_IF Name="selected">
-									selected
-								</TMPL_IF>
-							><TMPL_VAR Name="branchname"></option>
-						</TMPL_LOOP>
+						<!-- TMPL_LOOP Name="branchloop" -->
+							<option value="<!-- TMPL_VAR Name="branch" -->"<!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+								<!-- TMPL_VAR Name="branchname" -->
+							</option>
+						<!-- /TMPL_LOOP -->
 					</select>
-				</TMPL_IF>
+				<!-- /TMPL_IF -->
 			</td>
 			<TD>
-				<TMPL_IF Name="wait">
-					<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name=''biblionumber">&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
-						<TMPL_VAR Name="barcode">
+				<!-- TMPL_IF Name="wait" -->
+					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">
+						<!-- TMPL_VAR Name="barcode" -->
 					</a>
-				<TMPL_ELSE>
-					<TMPL_IF Name="constrainttypea">
-						Prochain dispo
-					<TMPL_ELSE>
-						<TMPL_IF Name="constrainttypeo">
-							Seulement du type <TMPL_VAR Name="volumeddesc"> <TMPL_VAR Name="itemtype">
-						</TMPL_IF>
-					</TMPL_IF>
-				</TMPL_IF>
-				$type
+				<!-- TMPL_ELSE -->
+					<!-- TMPL_IF Name="constrainttypea" -->
+						<i>Suivant</i>
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_IF Name="constrainttypeo" -->
+							This type only : <b><!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="itemtype" --></b>
+						<!-- /TMPL_IF -->
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_IF -->
+
 			</td>
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	<tr VALIGN=TOP>
 	<TD colspan=6 align=right>
-	Supprimer une réservation en choisissant "Suppr" dans la la liste d'ordre
-	<INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png"></td>
+		Supprimer une demande en sélectionnant "suppr." dans la liste.
+		<INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png">
+	</td>
 	</tr>
 </table>
 <P>
 <br>
 </form>
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/reservereport.tmpl b/koha-tmpl/intranet-tmpl/default/fr/reservereport.tmpl
new file mode 100644
index 0000000000..2f2fb4e8d5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/reservereport.tmpl
@@ -0,0 +1,29 @@
+<!-- TMPL_INCLUDE Name="reports-top.inc" -->
+
+<CENTER>
+<table border=0 cellspacing=0 cellpadding=5>
+	<!-- TMPL_LOOP Name="dataloop" -->
+		<tr valign=top bgcolor='white'>
+			<td>
+				<!-- TMPL_VAR Name="name" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="reservedate" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="title" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="classification" -->
+			</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	<tr>
+		<td>
+			<!-- TMPL_VAR Name="count" -->
+		</td>
+		<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+	</tr>
+</TABLE>
+
+<!-- TMPL_INCLUDE Name="reports-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl
index 081fc32ad4..5ca2684869 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl
@@ -1,10 +1,10 @@
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
 
-<span style="font-size:2em; text-align:left;">Résultats de la recherche MARC</span>
+<span style="font-size:2em; text-align:left;">Résultats d'une recherche MARC</span>
 <br>
 
 <center>
@@ -13,52 +13,52 @@
 	</tr>
 		<tr><tr height=20></tr>
 		<td align=middle>
-			<TMPL_IF NAME=displayprev>
-			<a href=search.pl?startfrom=<TMPL_VAR NAME="startfromprev">&<TMPL_LOOP NAME=searchdata><TMPL_VAR NAME="term">=<TMPL_VAR name="val" ESCAPE=URL>&</TMPL_LOOP>resultsperpage=<TMPL_VAR NAME="resultsperpage">&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
-			</TMPL_IF>
-			<TMPL_LOOP NAME=numbers>
-				<TMPL_IF NAME=highlight>
-			 	 <img src="/intranet-tmpl/default/images/numbers/<TMPL_VAR NAME=number>-highlight.gif">
-				<TMPL_ELSE>
-			  	  <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=searchdata><TMPL_VAR NAME="term">=<TMPL_VAR name="val" ESCAPE=URL>&</TMPL_LOOP>resultsperpage=<TMPL_VAR NAME="resultsperpage">&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<TMPL_VAR NAME=number>.gif" border=0></a>
-				</TMPL_IF>
-			</TMPL_LOOP>
-			<TMPL_IF NAME=displaynext>
-			<a href=search.pl?startfrom=<TMPL_VAR NAME="startfromnext">&<TMPL_LOOP NAME=searchdata><TMPL_VAR NAME="term">=<TMPL_VAR name="val" ESCAPE=URL>&</TMPL_LOOP>&resultsperpage=<TMPL_VAR NAME="resultsperpage">&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
-				</TMPL_IF>
+			<!-- TMPL_IF NAME=displayprev -->
+			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME=numbers -->
+				<!-- TMPL_IF NAME=highlight -->
+			 	 <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+				<!-- TMPL_ELSE -->
+			  	  <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF NAME=displaynext -->
+			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+				<!-- /TMPL_IF -->
 				</td>
 			</tr>
 
 		</table>
 </center>
 
-<TMPL_IF name=total>
-&nbsp<b>Résultats <TMPL_VAR name="from"> à <TMPL_VAR name="to"> de <TMPL_VAR name="total"> résultats </b><br><br>
-<TMPL_ELSE>
-&nbsp Aucun résultat trouvé pour vos critères de recherche<br>
-</TMPL_IF>
+<!-- TMPL_IF name=total -->
+&nbsp<b>Résultats <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> sur <!-- TMPL_VAR name="total" --></b><br><br>
+<!-- TMPL_ELSE -->
+&nbsp No Résultats trouvés.<br>
+<!-- /TMPL_IF -->
 
 <center>
 <table border=0 cellspacing=0 cellpadding=2 width="90%">
 <thead>
 	<tr
-	<TMPL_IF NAME="opac">
+	<!-- TMPL_IF NAME="opac" -->
 			bgcolor=#99cccc background=/images/background-opac.gif>
-		<TMPL_ELSE>
+		<!-- TMPL_ELSE -->
 			bgcolor="#ad11ad">
-		</TMPL_IF>
-	<th align="left"><span style="color:#FFFFFF;">Notice #</span></th>
+		<!-- /TMPL_IF -->
+	<th align="left"><span style="color:#FFFFFF;">N° Biblio</span></th>
 	<th align="left"><span style="color:#FFFFFF;">Auteur</span></th>
 	<th align="left"><span style="color:#FFFFFF;">Titre</span></th>
 	</tr>
 <tbody>
-	<TMPL_LOOP name="result">
+	<!-- TMPL_LOOP name="result" -->
 		<tr>
-			<td><a href="../MARCdetail.pl?bibid=<TMPL_VAR name="bibid">"><TMPL_VAR name="bibid"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="title"></td>
+			<td><a href="../MARCdetail.pl?bibid=<!-- TMPL_VAR name="bibid" -->"><!-- TMPL_VAR name="bibid" --></a></td>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td><!-- TMPL_VAR name="title" --></td>
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 </table>
 
 <table align=middle border=0 cellpadding=0 cellspacing=0 width=80%">
@@ -66,27 +66,27 @@
 	</tr>
 		<tr><tr height=20></tr>
 		<td align=middle>
-			<TMPL_IF NAME=displayprev>
-			<a href=search.pl?startfrom=<TMPL_VAR NAME="startfromprev">&<TMPL_LOOP NAME=searchdata><TMPL_VAR NAME="term">=<TMPL_VAR name="val" ESCAPE=URL>&</TMPL_LOOP>resultsperpage=<TMPL_VAR NAME="resultsperpage">&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
-			</TMPL_IF>
-			<TMPL_LOOP NAME=numbers>
-				<TMPL_IF NAME=highlight>
-			 	 <img src="/intranet-tmpl/default/images/numbers/<TMPL_VAR NAME=number>-highlight.gif">
-				<TMPL_ELSE>
-			  	  <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=searchdata><TMPL_VAR NAME="term">=<TMPL_VAR name="val" ESCAPE=URL>&</TMPL_LOOP>resultsperpage=<TMPL_VAR NAME="resultsperpage">&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<TMPL_VAR NAME=number>.gif" border=0></a>
-				</TMPL_IF>
-			</TMPL_LOOP>
-			<TMPL_IF NAME=displaynext>
-			<a href=search.pl?startfrom=<TMPL_VAR NAME="startfromnext">&<TMPL_LOOP NAME=searchdata><TMPL_VAR NAME="term">=<TMPL_VAR name="val" ESCAPE=URL>&</TMPL_LOOP>&resultsperpage=<TMPL_VAR NAME="resultsperpage">&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
-				</TMPL_IF>
+			<!-- TMPL_IF NAME=displayprev -->
+			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME=numbers -->
+				<!-- TMPL_IF NAME=highlight -->
+			 	 <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+				<!-- TMPL_ELSE -->
+			  	  <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF NAME=displaynext -->
+			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+				<!-- /TMPL_IF -->
 				</td>
 			</tr>
 
 		</table>
 </center>
 
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-bottom.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-bottom.inc">
-</TMPL_IF>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl
index 7aa5bde65a..c25ac1035d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl
@@ -1,8 +1,8 @@
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
 
 <span style="font-size:2em; text-align:left;">Recherche MARC</span>
 
@@ -11,65 +11,64 @@
 
 <input type="hidden" name="op" value="do_search">
 <input type="hidden" name="type" value="intranet">
-<input type="hidden" name="nbstatements" value="<TMPL_VAR NAME="nbstatements">">
+<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
 
-	<table border=0 cellspacing=0 cellpadding=2 width="80%>
+	<table border=0 cellspacing=0 cellpadding=2 width="100%">
 		<tr align="center">
-			<td colspan=3>
+			<td>
 				<div name="sql">
 				<textarea name="sql" rows=5 cols=60 disabled readonly></textarea>
 				</div>
 			</td>
-			<td colspan=2 bgcolor="#ad11ad" valign="top" align="left">
+			<td bgcolor="#ad11ad" valign="top" align="left">
 				<span style="color:#FFFFFF;">
 					<b>AIDE :</b><br/>
-					Construisez votre requète en utilisant les champs MARC puis lancez
-					la recherche pour afficher la liste des notices correspondant à vos critères.
-					En cliquant sur "Ajouter un critère" vous pouvez ajouter un critère de recherche sans perdre vos critères déjà entrés.
+					Construisez votre requête avec les champs et les sous-champs MARC. "Ajouter des critères" permet d'ajouter un autre critère à la recherche. "Recherche" lance la requête et affiche les résultats.
 				</span>
 			</td>
 		</tr>
-
-		<TMPL_LOOP NAME="statements">
+	</table>
+	<table border=0 cellspacing=0 cellpadding=2 width="100%">
+		<!-- TMPL_LOOP NAME="statements" -->
 		<tr>
 			<td>
-				<TMPL_IF NAME="first">
+				<!-- TMPL_IF NAME="first" -->
 					<input type="hidden" name="and_or" value="">&nbsp;
-				<TMPL_ELSE>
+				<!-- TMPL_ELSE -->
 					<select name="and_or" size="1" onchange="sql_update()">
-						<option value="and">et</option>
-						<option <TMPL_IF NAME="or">selected </TMPL_IF>value="or">ou</option>
+						<option value="et">et</option>
+						<option <!-- TMPL_IF NAME="ou" -->selected <!-- /TMPL_IF -->valeur="ou">ou</option>
 					</select>
-				</TMPL_IF>
+				<!-- /TMPL_IF -->
 			</td>
-			<td><TMPL_VAR name="marclist"></td>
+			<td><!-- TMPL_VAR name="marclist" --></td>
 			<td>
 				<select name="excluding" size="1" onchange="sql_update()">
 					<option value="0"> </option>
-					<option <TMPL_IF NAME="not">selected </TMPL_IF>value="1">non</option>
+					<option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->valeur="1">not</option>
 				</select>
 			</td>
 			<td>
 				<select name="operator" size="1" onchange="sql_update()">
-					<option <TMPL_IF NAME="contains">selected</TMPL_IF> value="contains">Contient</option>
-					<option <TMPL_IF NAME="eq">selected</TMPL_IF> value="=">Egale</option>
-					<option <TMPL_IF NAME="start">selected</TMPL_IF> value="start">Commence par</option>
-					<option <TMPL_IF NAME="gt">selected</TMPL_IF> value=">">Supérieur à</option>
-					<option <TMPL_IF NAME="ge">selected</TMPL_IF> value=">=">Supérieur ou égal à</option>
-					<option <TMPL_IF NAME="lt">selected</TMPL_IF> value="<">Inférieur à</option>
-					<option <TMPL_IF NAME="le">selected</TMPL_IF> value="<=">Inférieur ou égal à</option>
+					<option <!-- TMPL_IF NAME="contains" -->selected<!-- /TMPL_IF --> value="contains">Contains</option>
+					<option <!-- TMPL_IF NAME="eq" -->selected<!-- /TMPL_IF --> value="=">Is equal to</option>
+					<option <!-- TMPL_IF NAME="start" -->selected<!-- /TMPL_IF --> value="start">Starts with</option>
+					<option <!-- TMPL_IF NAME="gt" -->selected<!-- /TMPL_IF --> value=">">Is greater than</option>
+					<option <!-- TMPL_IF NAME="ge" -->selected<!-- /TMPL_IF --> value=">=">Is greater ou equal to</option>
+					<option <!-- TMPL_IF NAME="lt" -->selected<!-- /TMPL_IF --> value="<">Is lower than</option>
+					<option <!-- TMPL_IF NAME="le" -->selected<!-- /TMPL_IF --> value="<=">Is lower ou equal to</option>
 				</select>
 			</td>
-			<td><input type="text" name="value" onChange="sql_update()" <TMPL_IF NAME="value">value="<TMPL_VAR NAME="value">"</TMPL_IF>></td>
+			<td><input type="text" name="value" onChange="sql_update()" <!-- TMPL_IF NAME="value" -->valeur="<!-- TMPL_VAR NAME="value" -->"<!-- /TMPL_IF -->></td>
 		</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
 	<br>
 
 	<table width="90%">
 	<tr>
-	<td align="left" width="33%"><input type="button" value="Ajouter un critère" onClick="AddStatement()"></td>
-	<td align="center" width="33%"><input type="submit" value="Lancer la recherche"></td>
+	<td align="left" width="33%"><input type="button" value="Ajouter un critère" onClick="AddStatement()" class="button"></td>
+	<td align="middle" width="33%"><input type="submit" value="Lancer la recherche" class="button"></td>
 	<td align="right" width="33%">Résultats par page :
 		<select align="right" name="resultsperpage" size="1">
 			<option value="20">20</option>
@@ -104,9 +103,9 @@ function AddStatement() {
 }
 
 </script>
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-bottom.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-bottom.inc">
-</TMPL_IF>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+<!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/searchheader.tmpl b/koha-tmpl/intranet-tmpl/default/fr/searchheader.tmpl
index 1a10735fb3..4841e61882 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/searchheader.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/searchheader.tmpl
@@ -1,4 +1,2 @@
-<a href=search.pl?template=cmsdsearchresults.tmpl&startfrom=><TMPL_VAR NAME="startfrom">>R&eacute;sultats 
-tri&eacute;s selon l'indice dewey</a> | <a href=search.pl?template=searchresults.tmpl&startfrom=><TMPL_VAR NAME="startfrom">>R&eacute;sultats 
-tri&eacute;s selon la cote</a> 
-<hr>
+<a href=search.pl?template=cmsdsearchresults.tmpl&startfrom=<!-- TMPL_VAR NAME="startfrom" -->>Résultats with dewey</a> | <a href=search.pl?template=searchresults.tmpl&startfrom=<!-- TMPL_VAR NAME="startfrom" -->>Résultats with biblionumber</a>
+<hr>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/shelves.tmpl b/koha-tmpl/intranet-tmpl/default/fr/shelves.tmpl
new file mode 100644
index 0000000000..eeb889921b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/shelves.tmpl
@@ -0,0 +1,139 @@
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
+
+<!-- TMPL_IF Name="viewshelf" -->
+<center>
+<form>
+    <table border=0 cellpadding=2 cellspacing=0>
+    		<tr>
+			<th colspan=4 bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+				<font color=white>Contenu de <!-- TMPL_VAR Name="shelfname" --></font>
+			</th>
+		</tr>
+		<!-- TMPL_LOOP Name="itemsloop" -->
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
+				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
+				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
+				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<br>
+	<a href="shelves.pl" class="button">Liste des rayonnages</a>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=submit value="Enlever les ouvrages sélectionnés" class="button">
+</form>
+<form>
+	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type=hidden name=modifyshelfcontents value=1>
+	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<table>
+		<tr>
+			<td>
+				Ajouter un livre par son code barre dans <!-- TMPL_VAR name="shelfname" -->:
+			</td>
+			<td>
+				<input name="addbarcode">
+				<input type=hidden name=modifyshelfcontents value=1>
+				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+				<input type="submit" value="Enregistrer" class="button">
+			</td>
+		</tr>
+	</table>
+</form>
+<!-- TMPL_ELSE -->
+	<!-- TMPL_IF Name="shelves" -->
+		<!-- TMPL_IF Name="status1" -->
+			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP Name="paramsloop" -->
+			<!-- TMPL_IF Name="status" -->
+				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
+			<!-- /TMPL_IF -->
+		<!-- /TMPL_LOOP -->
+		<center>
+		<h1>Rayonnages</h1>
+		<table border=0 cellpadding=7>
+			<tr>
+				<td align=center valign="bottom">
+					<form>
+						<p>
+							<a href="shelves.pl" class="button">Liste des rayonnages</a>
+						</p>
+					</form>
+				</td>
+				<td align=center valign="bottom">
+					<form method=post>
+					<input type="hidden" name="shelves" value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Sélectionner des rayonnages à effacer</font>
+							</th>
+						</tr>
+						<!-- TMPL_LOOP Name="shelvesloop" -->
+						<tr>
+							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
+								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
+								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
+							</td>
+						</tr>
+						<!-- /TMPL_LOOP -->
+					</table>
+					<p>
+						<input type=submit value="Supprimer Rayonnages" class="button"></form>
+					</p>
+				</td>
+				<td align=center valign=bottom>
+					<form method=post>
+					<input type=hidden name=shelves value=1>
+					<table border=0 cellpadding=0 cellspacing=0>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Ajouter un rayonnage</font>
+							</th>
+						</tr>
+						<tr>
+							<td>
+								<p><input name=addshelf size=25></p>
+							</td>
+						</tr>
+					</table>
+								<p><input type=submit value="Ajouter un nouveau rayonnage" class="button"></p>
+					</form>
+				</td>
+			</tr>
+		</table>
+
+	<!-- TMPL_ELSE -->
+		<center>
+		<table border=0 cellpadding=4 cellspacing=0>
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+					<table border=0 cellpadding=5 cellspacing=0 width=100%>
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
+								<font color=white>Liste des rayonnages</font>
+							</th>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<!-- TMPL_LOOP Name="shelvesloop" -->
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR Name="color" -->">
+					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
+						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
+					</a>
+				</td>
+			</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<P>
+			<a href="shelves.pl?shelves=1" class="button">Ajouter ou Supprimer des rayonnages</a>
+		</p>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/stats.tmpl b/koha-tmpl/intranet-tmpl/default/fr/stats.tmpl
new file mode 100644
index 0000000000..567244e619
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/stats.tmpl
@@ -0,0 +1,33 @@
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
+
+<CENTER>
+	<table border=0 cellspacing=0 cellpadding=5>
+		<tr bgcolor='#99cc33'>
+			<td background='/images/background-mem.gif'><b>Nom</b></td>
+			<td background='/images/background-mem.gif'><b>Saisir</b></td>
+			<td background='/images/background-mem.gif'><b>Date/Heure</b></td>
+			<td background='/images/background-mem.gif'><b>Montant</b></td>
+			<td background='/images/background-mem.gif'><b>Annexe</b></td>
+		<tr>
+		<!-- TMPL_LOOP name=loop1 -->
+		<tr>
+			<td><!-- TMPL_VAR NAME=name --></td>
+			<td><!-- TMPL_VAR NAME=type --></td>
+			<td><!-- TMPL_VAR NAME=time --></td>
+			<td><!-- TMPL_VAR NAME=amount --></td>
+			<td><!-- TMPL_VAR NAME=branch --></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+</CENTER>
+
+
+<p>
+	<b>Total payé: <!-- TMPL_VAR NAME=total --></b>
+	<br>
+	<b>Total déduit: <!-- TMPL_VAR NAME=totalw --></b>
+</p>
+
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
+</BODY>
+</HTML>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl
index 26529b8b36..bdacb503ce 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl
@@ -1,48 +1,42 @@
 <html>
 <head>
-	<title>Saisie des entr&eacute;es du th&eacute;saurus</title>
+	<title>Constructeur de valeur pour les catégories du thésaurus <!-- TMPL_VAR name="category" --></title>
 </head>
 <body>
 	<form name="f_pop" action="thesaurus_popup.pl" method="post">
-		<textarea name="result" rows=10 cols=50><TMPL_VAR name="result"></textarea>
+		<textarea name="result" rows=10 cols=60><!-- TMPL_VAR name="result" --></textarea></br>
 		<br/><input type="button" value="OK" onClick="javascript:report()">
 		<p>
-			Rechercher : <input type="text" name="search_string" value="<TMPL_VAR name="search_string">">
-			<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-			<input type="hidden" name="index" value="<TMPL_VAR name="index">">
+			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
+			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
+			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 			<input type="hidden" name="op" value="search">
-			<input type="submit" value="OK">
+			<input type="submit" value="Search">
 		</p>
 	</form>
+<!-- TMPL_IF name="search_string" -->
 	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
-	Descendre : <TMPL_VAR name="dig_list">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	<input type="hidden" name="index" value="<TMPL_VAR name="index">">
+	<!-- TMPL_VAR name="select_list" -->
+	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="op" value="select">
-	<input type="hidden" name="result" value="<TMPL_VAR name="result">">
+	<input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
 	<input type="submit" name="OK" value="OK">
 	</form>
-
-<TMPL_IF name="search_string">
-	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
-	Sélectionner : <TMPL_VAR name="select_list">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	<input type="hidden" name="index" value="<TMPL_VAR name="index">">
-	<input type="hidden" name="op" value="select">
-	<input type="hidden" name="result" value="<TMPL_VAR name="result">">
-	<input type="submit" name="OK" value="OK">
-	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
-	<input type="hidden" name="index" value="<TMPL_VAR name="index">">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
 	<input type="hidden" name="op" value="add">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	Insérer une nouvelle autorité : <input type="text" name="insert" value="<TMPL_VAR name="search_string">">
-	<input type="submit" name="NEW" value="Ajouter">
+	Insérer une nouvelle autorité : <input type="text" name="insert">
+	<input type="submit" name="NEW" value="NEW">
 	</form>
 	<script>
 		function report() {
-			opener.document.f.field_value[<TMPL_VAR name="index">].value= document.f_pop.result.value;
+			opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.result.value;
 			self.close();
 			return false;
 		}
diff --git a/koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl b/koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl
new file mode 100644
index 0000000000..20091c660d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl
@@ -0,0 +1,18 @@
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
+
+
+<!-- TMPL_VAR Name="error" -->
+<p> Cliquer "Soumettre" pour forcer le sujet
+<br>
+<form action="/cgi-bin/koha/updatebiblio.pl" method=post>
+<table border=0 cellspacing=0 cellpadding=5>
+<!-- TMPL_LOOP Name="dataloop" -->
+	<input type=hidden name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
+<!-- /TMPL_LOOP -->
+	<input type=hidden name="Force" value="<!-- TMPL_VAR NAME="substring" -->">
+<TR><TD><input type=submit></TD></TR>
+</TABLE>
+</form>
+
+
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl b/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl
index 86875a4ede..318705e011 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl
@@ -1,148 +1,89 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<TMPL_IF NAME="loggedinuser">
-   <p align=left>Connect&eacute; : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-   <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<TMPL_IF NAME="loggedinuser">
-	
-<p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> 
-[<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<!-- TMPL_IF NAME="loggedinuser" -->
+	<p align=left>Connecté comme: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Déconnecter</a>]</p>
 	<p>
 	<center>
-	
-<h3>Ceci est une page de d&eacute;monstration</h3>
+	<h3>Cette page est juste une maquette</h3>
 
 	<table border=0 cellspacing=15>
-	<tr>
-<td valign=top>
+	<tr><td valign=top>
 
 	<table border=1 cellpadding=10>
-	<tr>
-<th bgcolor=#99cccc background=/images/background-opac.gif>
-<font size=+2>R&eacute;servations</font></th></tr>
+	<tr><th bgcolor=#99cccc background=/images/background-opac.gif><font size=+2>Réservations</font></th></tr>
 	<tr><td>
-	
-<b>Les livres ci dessous sont &aacute; votre disposition:</b>
+	<b>Vous avez les livres suivants en attente:</b>
 	<ul>
-	<li>
-The Great Mom Swap par Betsy Hanes &aacute la Biblioth&egrave;que Centrale
-	<li>
-Between Brothers par Irene Morck &aacute la Biblioth&egrave;que Centrale
+	<li>The Great Mom Swap by Betsy Hanes at Bibliothèque principale
+	<li>Between Brothers by Irene Morck at Bibliothèque principale
 	</ul>
 	<p>
-	
-<b>Vous avez des r&eacute;servations en cours pour les documents ci dessous:</b>
+	<b>Vous avez les demandes suivantes pour des ouvrages en prêt:</b>
 	<ul>
-	<li>
-The Amazing Apple Book par Paulette Bourgeois
-	<li>
-Tracey the Great par Alan Cliburn
-	<li>
-The biography of a grizzly par Ernest Thompson Seton
+	<li>The Amazing Apple Book by Paulette Bourgeois
+	<li>Tracey the Great by Alan Cliburn
+	<li>The biography sur a grizzly by Ernest Thompson Seton
 	</ul>
 	</td></tr>
-	
-</table>
+	</table>
 
 	</td><td valign=top>
 
 		<form method=post>
-		
-<table border=1 cellpadding=10>
-		<tr>
-<th bgcolor=#99cccc background=/images/background-opac.gif><font size=+2>User Preferences</font>
-</th></tr>
+		<table border=1 cellpadding=10>
+		<tr><th bgcolor=#99cccc background=/images/background-opac.gif><font size=+2>Préférences utilisateur</font></th></tr>
 		<tr><td align =center>
-		
-<table border=0 cellpadding=5>
-			<tr>
-<td>Langue</td><td>
-			
-<select name=language>
-			
-<option value=english>Anglais
-			
-<option value=english>Fran&ccedil;ais
-			
-<option value=english>Allemand
-			
-<option value=english>Polonais
+		<table border=0 cellpadding=5>
+			<tr><td>Langue</td><td>
+			<select name=language>
+			<option value=english>Anglais
+			<option value=english>Français
+			<option value=english>Allemand
+			<option value=english>Polonais
 			</select>
-			
-</td></tr>
-			<tr><td>Adresse &eacute;lectronique</td>
-<td><input name=email size=30 value=<TMPL_VAR NAME=loggedinuser>@mylibrary.com></td></tr>
-
-			<tr><td>Site s&eacute;lectionn&eacute;<br>pour les retrait des r&eacute;servations</td><td>
-
+			</td></tr>
+			<tr><td>Adresse Mail</td><td><input name=email size=30 value=<!-- TMPL_VAR NAME=loggedinuser -->@mylibrary.com></td></tr>
+			<tr><td>Annexe préférée<br>ouvrages réservés</td><td>
 			<select name=pickupbranch>
-			
-<option value=MAIN>Biblioth&egrave;que Centrale
-
-			<option value=SEDGE>Biblioth&egrave;que Sedgewick
-
-			<option value=HANSEN selected>Biblioth&egrave;que Rick Hansen
-
-			<option value=CAT>Biblioth&egrave;que Cataline
-
+			<option value=MAIN>Bibliothèque principale
+			<option value=SEDGE>Sedgewick Library
+			<option value=HANSEN selected>Rick Hansen Library
+			<option value=CAT>Cataline Library
 			</select>
-			
-</td></tr>
+			</td></tr>
 			<tr><td colspan=2>
-
-
-<input name=specialeventsbyemail type=checkbox checked> M'informer par courrier &eacute;lectronique des &eacute;v&egrave;nements particuliers<br>
-
-<input name=overduesbyemail type=checkbox checked> Me pr&eacutevenir par courrier &eacute;lectronique en cas de retards<br>
-			
-<input name=recordreadingrecord type=checkbox> Conserver un historique des livres que j'ai lus<br>
-			
-<input name=recordreadingrecord type=checkbox>
- Autoriser le personnel de la bibliothèque &aacute; voir mon historique d'emprunt<br>
-</td></tr>
-			<tr>
-<td align=center colspan=2>
-<input type=submit value="Set Preferences">
-
-</td>
+			<input name=specialeventsbyemail type=checkbox checked> Avertissez-moi par mail des événements spéciaux<br>
+			<input name=overduesbyemail type=checkbox checked> Avertissez-moi par mail des retards<br>
+			<input name=recordreadingrecord type=checkbox> Conserver une trace des livres que j'ai lu.<br>
+			<input name=recordreadingrecord type=checkbox> Permettre au personnel de la bibliothèque de voir la liste de mes prêts<br>
+			</td></tr>
+			<tr><td align=center colspan=2>
+			<input type=submit value="Définir des préférences">
+			</td>
 			</tr>
 		</table>
 		</td></tr>
-
 	</table>
 	</form>
 
 	</td></tr>
 	</table>
 
-	
-</center>
-<TMPL_ELSE>
+	</center>
+<!-- TMPL_ELSE -->
 	<center>
-	
-<form method=post>
-		
-<table border=1 cellpadding=10>
-		
-<tr><th bgcolor=#99cccc background=/images/background-opac.gif colspan=2>
-<font size=+2>Pr&eacute;f&eacute;rences de l'usager</font></th></tr>
-		<tr>
-<td>Name:</td><td><input name="userid"></td></tr>
-		<tr>
-<td>Mot de passe:</td><td><input type=password name=password></td></tr>
-		<tr>
-<td align=center colspan=2>
-		    
-<input type=submit value="Login">
+	<form method=post>
+		<table border=1 cellpadding=10>
+		<tr><th bgcolor=#99cccc background=/images/background-opac.gif colspan=2><font size=+2>Préférences utilisateur</font></th></tr>
+		<tr><td>Nom:</td><td><input name="userid"></td></tr>
+		<tr><td>Mot de passe:</td><td><input type=password name=password></td></tr>
+		<tr><td align=center colspan=2>
+		    <input type=submit value="Identifiant">
 		</td>
 		</tr>
-	    
-</table>
+	    </table>
 	</form>
 	</center>
-</TMPL_IF>
-
-<TMPL_INCLUDE NAME="opac-bottom.inc">
+<!-- /TMPL_IF -->
 
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_100.tmpl
index 854535c1d5..2ddf5600d0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_100.tmpl
@@ -1,51 +1,48 @@
-<html>
-<head>
-<title>UNIMARC constructeur champ 100</title>
-</head>
-<body>
-<form name="f_pop" onSubmit="javascript:report()">
-<table>
-	<tr>
-		<td>Date d'enregistrement </td>
-		<td><input type="text" name="f1" maxlength=8 size=8 value="<TMPL_VAR name="f1">"></td>
-	</tr>
-	<tr>
-		<td>Code date publication </td><td><select name="f2" size="1">
-		<option value="a" ><TMPL_IF name="f2a">SELECTED</TMPL_IF>>p&eacute;riodique en cours</option>
-			<option value="b" ><TMPL_IF name="f2b">SELECTED</TMPL_IF>>p&eacute;riodique mort</option>
-			<option value="c" ><TMPL_IF name="f2c">SELECTED</TMPL_IF>>p&eacute;riodique d'&eacute;tat inconnu</option>
-			<option value="d" ><TMPL_IF name="f2d">SELECTED</TMPL_IF>>monographie compl&egrave;te</option>
-			<option value="e" ><TMPL_IF name="f2e">SELECTED</TMPL_IF>>reproduction</option>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		
-	  <td>Ann&eacute;e d&eacute;but</td>
-		<td><input type="text" name="f3" maxlength=4 size=5 value="<TMPL_VAR name="f3">"></td>
-	</tr>
-	<tr>
-	  <td>
-		<p>Ann&eacute;e fin</p>
-		</td>
-	<td><input type="text" name="f4" maxlength=4 size=5 value="<TMPL_VAR name="f4">"></td>
-	</tr>
-	<tr><td colspan=2><input type="submit" value="Envoyer"></td></tr>
-</table>
-</form>
-<script>
-	function report() {
-		document.f_pop.f1.value=document.f_pop.f1.value+'        ';
-		document.f_pop.f3.value=document.f_pop.f3.value+'    ';
-		document.f_pop.f4.value=document.f_pop.f4.value+'    ';
-		document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
-		document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
-		document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
-
-		opener.document.f.field_value[<TMPL_VAR name="index">].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value;
-		self.close();
-		return false;
-	}
-</script>
-</body>
-</html>
+<html>
+<head>
+<title>UNIMARC constructeur champ 100</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>Date d'enregistrement </td>
+		<td><input type="text" name="f1" maxlength=8 size=8 value="<!-- TMPL_VAR name="f1" -->"></td>
+	</tr>
+	<tr>
+		<td>Code date publication </td><td><select name="f2" size="1">
+		<option value="a" <!-- TMPL_IF name="f2a" -->SELECTED<!-- /TMPL_IF -->>périodique en cours</option>
+			<option value="b" <!-- TMPL_IF name="f2b" -->SELECTED<!-- /TMPL_IF -->>périodique mort</option>
+			<option value="c" <!-- TMPL_IF name="f2c" -->SELECTED<!-- /TMPL_IF -->>périodique d'état inconnu</option>
+			<option value="d" <!-- TMPL_IF name="f2d" -->SELECTED<!-- /TMPL_IF -->>monographie complète</option>
+			<option value="e" <!-- TMPL_IF name="f2e" -->SELECTED<!-- /TMPL_IF -->>reproduction</option>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Année début</td>
+		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
+	</tr>
+	<tr>
+	<td>Année fin</td>
+	<td><input type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
+	</tr>
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+	function report() {
+		document.f_pop.f1.value=document.f_pop.f1.value+'        ';
+		document.f_pop.f3.value=document.f_pop.f3.value+'    ';
+		document.f_pop.f4.value=document.f_pop.f4.value+'    ';
+		document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
+		document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
+		document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
+
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_105.tmpl
new file mode 100644
index 0000000000..6f573bb3d7
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_105.tmpl
@@ -0,0 +1,48 @@
+<html>
+<head>
+<title>UNIMARC constructeur champ 100</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>Date d'enregistrement </td>
+		<td><input type="text" name="f1" maxlength=8 size=8 value="<!-- TMPL_VAR name="f1" -->"></td>
+	</tr>
+	<tr>
+		<td>Code date publication </td><td><select name="f2" size="1">
+		<option value="a" <!-- TMPL_IF name="f2a" -->SELECTED<!-- /TMPL_IF -->>p?riodique en cours</option>
+			<option value="b" <!-- TMPL_IF name="f2b" -->SELECTED<!-- /TMPL_IF -->>p?riodique mort</option>
+			<option value="c" <!-- TMPL_IF name="f2c" -->SELECTED<!-- /TMPL_IF -->>p?riodique d'?tat inconnu</option>
+			<option value="d" <!-- TMPL_IF name="f2d" -->SELECTED<!-- /TMPL_IF -->>monographie compl?te</option>
+			<option value="e" <!-- TMPL_IF name="f2e" -->SELECTED<!-- /TMPL_IF -->>reproduction</option>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Ann?e d?but</td>
+		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
+	</tr>
+	<tr>
+	<td>Ann?e fin</td>
+	<td><input type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
+	</tr>
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+	function report() {
+		document.f_pop.f1.value=document.f_pop.f1.value+'        ';
+		document.f_pop.f3.value=document.f_pop.f3.value+'    ';
+		document.f_pop.f4.value=document.f_pop.f4.value+'    ';
+		document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
+		document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
+		document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
+
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_225a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_225a.tmpl
new file mode 100644
index 0000000000..cf9d621728
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_225a.tmpl
@@ -0,0 +1,23 @@
+<html>
+<head>
+<title>UNIMARC constructeur champ 225a</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>Sélectionner une collection</td>
+		<td><!-- TMPL_VAR name="collection" --></td>
+	</tr>
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+	function report() {
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl
index 927f8c4517..855b1e5b69 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>Recherche Th&eacute;saurus</title>
+	<title>Recherche Thésaurus</title>
 </head>
 <body>
 	<script>
@@ -15,14 +15,14 @@
 	</script>
 	<script>
 		function finish() {
-			opener.document.f.field_value[<TMPL_VAR name="index">].value= document.f_pop.result.value;
+			opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.result.value;
 			self.close();
 			return false;
 		}
 	</script>
 	<form name="f_pop" action="plugin_launcher.pl" method="post">
 		<input type="hidden" name="plugin_name" value="unimarc_field_60X.pl">
-		<textarea name="result" rows=10 cols=50><TMPL_VAR name="result"></textarea>
+		<textarea name="result" rows=10 cols=50><!-- TMPL_VAR name="result" --></textarea>
 		<br/><input type="button" value="OK" onClick="javascript:finish()">
 		<p><h2>Recherche</h2>
 			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=A">A</a>
@@ -52,9 +52,9 @@
 			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Y">Y</a>
 			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Z">Z</a>
 			<br/>
-			<input type="text" name="search_string" value="<TMPL_VAR name="search_string">">
-			<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-			<input type="hidden" name="index" value="<TMPL_VAR name="index">">
+			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
+			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 			<input type="hidden" name="op" value="search">
 			<input type="submit" value="Chercher">
 		</p>
@@ -64,45 +64,45 @@
 		<td valign="top">
 		<h2>Résultats</h2>
 			<table>
-				<TMPL_LOOP name="results">
+				<!-- TMPL_LOOP name="results" -->
 					<tr>
 					<td>
-						<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&index=<TMPL_VAR name="index">&level=<TMPL_VAR name="level">&search_string=<TMPL_VAR name=value ESCAPE=URL>">
-							<TMPL_VAR name="value">
+						<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&index=<!-- TMPL_VAR name="index" -->&level=<!-- TMPL_VAR name="level" -->&search_string=<!-- TMPL_VAR name=value ESCAPE=URL -->">
+							<!-- TMPL_VAR name="value" -->
 						</a>
 					</td>
 					<td>
-						<input type="button" value="Reporter" OnClick="javascript:report('<TMPL_VAR name="value">')"><br/>
+						<input type="button" value="Reporter" OnClick="javascript:report('<!-- TMPL_VAR name="value" -->')"><br/>
 					</td>
 					</tr>
-				</TMPL_LOOP>
+				<!-- /TMPL_LOOP -->
 			</table>
 		</td>
 		<td>
-		<TMPL_IF name=deeper>
+		<!-- TMPL_IF name=deeper -->
 		<td valign="top">
-			<h2>Dépendances</h2>
-			</TMPL_IF>
+			<h2>Subordinations</h2>
+			<!-- /TMPL_IF -->
 			<table>
-			<TMPL_LOOP name="deeper">
+			<!-- TMPL_LOOP name="deeper" -->
 				<tr><td>
-				<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&index=<TMPL_VAR name="index">&level=<TMPL_VAR name="level">&search_string=<TMPL_VAR ESCAPE="URL" name="father">+<TMPL_VAR ESCAPE="URL" name="stdlib">">
-					<TMPL_VAR name="father"> <TMPL_VAR name="stdlib">
+				<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&index=<!-- TMPL_VAR name="index" -->&level=<!-- TMPL_VAR name="level" -->&search_string=<!-- TMPL_VAR ESCAPE="URL" name="father" -->+<!-- TMPL_VAR ESCAPE="URL" name="stdlib" -->">
+					<!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" -->
 				</a></td>
 				<td>
-					<input type="button" value="Reporter" OnClick="javascript:report('<TMPL_VAR ESCAPE=HTML name="father"> <TMPL_VAR ESCAPE=HTML name="stdlib">')"><br/>
+					<input type="button" value="Reporter" OnClick="javascript:report('<!-- TMPL_VAR ESCAPE=HTML name="father" --> <!-- TMPL_VAR ESCAPE=HTML name="stdlib" -->')"><br/>
 				</td></tr>
-			</TMPL_LOOP>
+			<!-- /TMPL_LOOP -->
 			</table>
 		</td>
 	</tr>
 	</table>
-<h2>Création</h2>
+<h2>Ajout</h2>
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
-	<input type="hidden" name="index" value="<TMPL_VAR name="index">">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="op" value="add">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	Insérer une nouvelle autorité : <input type="text" name="insert" value="<TMPL_VAR name="search_string">">
+	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+	Create a new authority/thesaurus entry : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
 	<input type="submit" name="NEW" value="Ajouter">
 	</form>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700-4.tmpl
index be75dd66bb..791ef2f6ab 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700-4.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700-4.tmpl
@@ -1,36 +1,34 @@
-<html>
-<head>
-<title>UNIMARC constructeur champ 700-4</title>
-</head>
-<body>
-<p>Sélectionnez la valeur pour la zone 700 $4. Elle sera automatiquement reportée 
-  dans la zone 700 $8.</p>
-<form name="f_pop" onSubmit="javascript:report()">
-<table>
-	<tr>
-		<td>Code date publication </td>
-		<td><select name="f1" size="1">
-		  <option value="075 - postface" selected>SELECTED>postface</option>
-		  <option value="651 - dir. de publication">SELECTED>dir. de publication</option>
-		  <option value="440 - illustrateur">SELECTED>illustrateur</option>
-		  <option value="080 - pr&eacute;face, notes">SELECTED>pr&eacute;face, notes</option>
-		  <option value="730 - traducteur">SELECTED>traducteur</option>
-		</select>
-		</td>
-	</tr>
-	<tr><td colspan=2><input type="submit" value="Envoyer"></td></tr>
-</table>
-</form>
-<script>
-	function report() {
-		x = document.f_pop.f1.value.split(' - ');
-		opener.document.f.field_value[<TMPL_VAR name="index">].value= x[0];
-		if (<TMPL_VAR name="index2">>0) {
-			opener.document.f.field_value[<TMPL_VAR name="index2">].value= x[1];
-		}
-		self.close();
-		return false;
-	}
-</script>
-</body>
-</html>
+<html>
+<head>
+<title>UNIMARC constructeur champ 700-4</title>
+</head>
+<body>
+<p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>Code date publication </td><td><select name="f1" size="1">
+		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
+			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
+			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
+			<option value="080 - préface, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>préface, notes</option>
+			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
+			</select>
+		</td>
+	</tr>
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+	function report() {
+		x = document.f_pop.f1.value.split(' - ');
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= x[0];
+		if (<!-- TMPL_VAR name="index2" -->>0) {
+			opener.document.f.field_value[<!-- TMPL_VAR name="index2" -->].value= x[1];
+		}
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl
new file mode 100644
index 0000000000..4087633bf0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl
@@ -0,0 +1,65 @@
+<html>
+<head>
+<title>Constructeur des autorités personnes</title>
+</head>
+<body>
+	<form name="f_pop" action="plugin_launcher.pl" method="post">
+	<input type="hidden" name="plugin_name" value="unimarc_field_700_701_702.pl">
+	<textarea name="result" rows=10 cols=60><!-- TMPL_VAR name="result" --></textarea></br>
+	<p><input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+	<input type="hidden" name="op" value="search">
+	<input type="hidden" name="a" value="<!-- TMPL_VAR name="a" -->">
+	<input type="hidden" name="b" value="<!-- TMPL_VAR name="b" -->">
+	<input type="hidden" name="c" value="<!-- TMPL_VAR name="c" -->">
+	<input type="hidden" name="f" value="<!-- TMPL_VAR name="f" -->">
+	<input type="submit" value="Search"><input type="button" value="FIN" onClick="javascript:report()">
+	</form>
+<!-- TMPL_IF name="search_string" -->
+	<form name="f2_pop"  action="plugin_launcher.pl" method="post">
+	<input type="hidden" name="plugin_name" value="unimarc_field_700_701_702.pl">
+	<!-- TMPL_VAR name="select_list" -->
+	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+	<input type="hidden" name="op" value="select">
+	<input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
+	<input type="submit" name="OK" value="OK">
+	</form>
+<!-- /TMPL_IF -->
+	<form name="f3_pop"  action="plugin_launcher.pl" method="post">
+	<input type="hidden" name="plugin_name" value="unimarc_field_700_701_702.pl">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+	<input type="hidden" name="op" value="add">
+	Insérer une nouvelle autorité : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
+	<input type="submit" name="NEW" value="NEW">
+	</form>
+		<script>
+		function report() {
+			var index_start=<!-- TMPL_VAR name="index" -->;
+			opener.document.f.field_value[index_start].value= document.f_pop.result.value;
+			var whichfield = opener.document.f.tag[index_start].value;
+			for (i=index_start ; i<opener.document.f.field_value.length ; i++) {
+				if (opener.document.f.tag[i].value == whichfield && opener.document.f.subfield[i].value == 'a') {
+					opener.document.f.field_value[i].value = document.f_pop.a.value;
+				}
+			}
+			for (i=index_start ; i<opener.document.f.field_value.length ; i++) {
+				if (opener.document.f.tag[i].value == whichfield && opener.document.f.subfield[i].value == 'b') {
+					opener.document.f.field_value[i].value = document.f_pop.b.value;
+				}
+			}
+			for (i=index_start ; i<opener.document.f.field_value.length ; i++) {
+				if (opener.document.f.tag[i].value == whichfield && opener.document.f.subfield[i].value == 'c') {
+					opener.document.f.field_value[i].value = document.f_pop.c.value;
+				}
+			}
+			for (i=index_start ; i<opener.document.f.field_value.length ; i++) {
+				if (opener.document.f.tag[i].value == whichfield && opener.document.f.subfield[i].value == 'f') {
+					opener.document.f.field_value[i].value = document.f_pop.f.value;
+				}
+			}
+			self.close();
+			return false;
+		}
+		</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/default/fr/z3950/searchresult.tmpl
new file mode 100644
index 0000000000..f1b9d431e8
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/fr/z3950/searchresult.tmpl
@@ -0,0 +1,44 @@
+<HTML>
+<!-- TMPL_IF name="refresh" -->
+	<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR name="refresh" -->">
+<!-- /TMPL_IF -->
+<font size="6"><em>Résultats Recherche Z39.50</em></font><br />
+
+<table width="80%" cellpadding="3">
+	<tr valign="center">
+	<td><font size="4">Notices bibliographiques trouvées</font></td>
+	</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="5" width="80%">
+	<tr valign=top bgcolor=#ffcc00>
+		<td><b>Titre</b></td>
+		<td><b>Auteur</b></td>
+		<td><b>ISBN</b></td>
+		<td><b>provenant de</b></td>
+		<td><b>&nbsp;</b></td>
+		<td>&nbsp;</td>
+	</tr>
+	<!-- TMPL_IF name="breeding_loop" -->
+	<!-- TMPL_LOOP name="breeding_loop" -->
+		<tr valign="top" bgcolor="<!-- TMPL_VAR name="toggle" -->">
+			<td><!-- TMPL_VAR name="title" --></a>
+			<td><!-- TMPL_VAR name="author" --></td>
+			<td><!-- TMPL_VAR name="isbn" --></td>
+			<td><!-- TMPL_VAR name="file" --></td>
+			<td><a href="javascript:Importer(<!-- TMPL_VAR name="id" -->)">Importer this biblio</a></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+		<tr><td colspan=6>Rien trouvé</td></tr>
+	<!-- /TMPL_IF -->
+</table>
+<!-- TMPL_IF name="numberpending" --><H1><center>Still <!-- TMPL_VAR name="numberpending" --> requests to go</center></H1><!-- /TMPL_IF -->
+<br />
+<script>
+	function Importer(GetThisOne) {
+		opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR name="oldbiblionumber" -->&breedingid="+GetThisOne;
+		self.close();
+		return false;
+	}
+</script>
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/images/front-arrow.gif b/koha-tmpl/opac-tmpl/css/en/images/front-arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8496171333b1aa98da37b5bbcaac42b27a1d5411
GIT binary patch
literal 294
zcmZ?wbhEHblx7fPIP#w%-8kJ<#Z6gQg`Z!5nT1tSRzb|vhC@h%jhjc-FGMXRhhJTb
zTSiX1sz$%N=fHsj%<Sx<Vq(gwDuzaejEsy7gn;5t7N8=21|5(>kev>!ixVcRoJ*dU
zv1%5lAVY!9VJ0U<&&Au`%eaWPIBxX%m;^L-lY&_Jx|t%Hjv*49Ax%sRWs1&!NY?JS
z)As05;H)JA8<sw=vho!YyQLxfA=>P*TOgw_vnV^8Ri-+psChz{w!3}0--P5U52hI3
zuHs;?IF+m!)dnqnojOaF8qN}Jm{-Ec$|AzU)v(GohsSYF(GvT%jJYhrEp7eN__?^Z
L?>w!h$Y2cs4tq^u

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/css/en/images/front-background-med.gif b/koha-tmpl/opac-tmpl/css/en/images/front-background-med.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ac89693382b1b8e390246125e69e39f2a0529750
GIT binary patch
literal 10810
zcmV-AD#g`DNk%w1VKxD{0fYbm>E-G4@$~QP@88_t`1bhD%+CG%{rvm<`uX~`w6#x6
zQFLd7dU}x*794<%o`#~UA22lzgNp-|mjsQE1Y%^sz`+0i|Nj2|00030|NsC0|NsC0
z|NsC0|NsC0|NsC0A^8LW0018VEC2ui05$=*0RRR5;3tk`X`X1Ru59bRa4gSsZQppV
z?|kq7ED3N(EE<o<q)Rf1I3tv(bUKAbCKHKJ$?bZ-;2IVxg+LnUG-l0iW6}+?^ct?)
z?|2@Qd`7$ffPrmjauis3h>41Kdr@kFkdcCfQHP6{n3*|EQD>5CX=V@#q@|_`qJENS
zl@pq;u(2eZo{)s33l0wn2?YfMzybmQ!~g@nzPt_$3#5IM4VALf)OWNE(4!0vy#oOP
z1Qr$-;^pS&<_HAD1-uN-*ntpH)%Es85>T~&aS98&0|X!-hpwQ(gXIngXqTYbzCrWu
zNt|dy0)>ZdMlI+T4xz`72-mf9pg<KwLlpi~syvbJVmvnxawQnh5v0wV21Sy@7zgFb
zpAsiH0yN4&0RcFZDm92eK!SHKLCtdov}!D&7%>z*ieRbNujUpeK=o&;)w7GRMtuW;
zK>+|=!OE4ZuptCDaU!7IYX@st1rG+qolAHwfv0x|`Q*zOiO{uL86*f$xN_wH1sEh|
z6S1*pAdm4Xa3I*S>B<NSEQlJ7>gU%tEN*5qy7cMWg#(O*Nns1@-!NPb0$kt#?&FmS
zJYc;TxN{T{FpdU*ygF*tFeCVW&OLOS+61kOpBv!8>}cD$!}iXZ!GQ4N<I63eKyiBY
zjPuQoTmZiO|6c*%Kvd1)w-<YFDE@F1fDF#%)NByAX5d-T!Sn!i4Q2?IZuPOzfL;?;
zg<wqYX=vhC7hvZh1tI=)(QpY2cH)dm4Y1mZEmAZhX*BleRR9dU6itrzROsOX1^B4s
zQV5ubBazcs6cq#xAhqO`I9-r{kSsz83wsSHXdISg-ju**=y{omk!!RyK$&pbq$QeN
zs+owC-zDH*oO~LzrH3Hei3gZS_G#!xe}WRIpkc77)dN-@DrrHw3ArevT;NGtl9P5y
z>42Qwhp7=@y65Ss=m6P9Z=)t5R7MX_hU%>42(ZAatsXJKYzo9k>#yPr(BT_(=K8~n
zpeP9JvKG+ip@hcnK!K18{$R)~u!(9VYP2;>>tU7GUb`F{#d0f#w{0dcX1L2Da4RU~
znj6Ebo3hKUu+Pdn!>-?PYHzq_k_)ZAEAY!kwg3L>0ImeLVDK9ZM4E881PmKt!z-}a
zK*SR#T)<`pVmv|wLW0|I!r8_vGRYn$P}9lw3SjZT4YQms%qI^3vdAN#t5pIx!#wUA
zm+EWt&q2d1GiNKm1cARvcl<HD4Nu@S&{4zeE@w2idNc%BXAQH?<jVVX*kTKvZ?tTJ
zop#ay46CxB4?q2O)I&GWwU>3HeYetbxB74ce*X<~qIzRW?;GkG9yJ1i3u=*vu{xf0
z0r7k&C<WiXY&p*U0YvVl&kT6}InIdht)9;dNPK$Gp_ff0n+jO_den(t+~UKv-=6l;
zYs~E&?{E5^b^=UKIQh-Sr;RVs6QWCa^LH;Cyn)g?AS3lrPyL4Kjj_3atlX#lE(XFk
z#=Gt1XPrCvXf3Wl@$IJ_JM_SD-X_%bi=AltXpvsw`WH2_eQ!O9*%<i<D7LL#?=ufW
z7z6M2zt`vw1M{2U-=3Ga#-Ph>8oV0<7(g|~SPc{p2%+IH7rbq)L;{-`p9=pLH%0N~
zf*G9Q->iqey?l^=Iux7t02q`6K45!6%vuc(D5484z;sE>8VQMI6&%tpif^kRP;53m
zEYh$;5ODrsJq*?W2YAtO@6wz~mWM(1ozZ`?O9{G^^~S#qQ6*$dVIBW=fi%MJ6>NOs
z9t~$bHA-ZTR~%&8SlGiNf?|M*EFc)g_zEX3Fp>>?m+tC;NK6{;0c<GRRT2nEPbN)^
z)wm!7kZ8&RCWckiuvrdU`8Ee`G8Qm=BrQJ)ia#O(T{7Gy1>-?PL>P>Y!hD+ni-`v|
z>M@yb10Doq0Zi9HGi%nnB_?vI6(C*{cQ&jf8_f94VLot8@#tMSmHA3d(5s8<{9T8b
z35IIM^KP2-r56llw|l;=koxR`x5~&$f1(Z>hD^jU6KT+--Ek56gJ(mP*iJ>*Yyo?k
zDE{ccsEFlBRHI2VKt2<Ju2q6GZ2&c<{`z@R_aRi2^#lbuTk5_NG9odvq^UzIdWVQU
zAfr0%*z@RFgkxGWs3!v+QHc;yZz8p06>AeEbrp}+JynWr3Mdc;TFR>?43ta+!wE64
zfOUBlb>WOD($0FywC=O2mt<?l0@lbctkkJ;{TJDW^o6mSG_N=V08a(FKfnfUiA&vq
zUkhqjb|F@)I?x|78{4r9OtK4OohfBIX3MGiV5JP*ti5ar*&F!PtfEa=N|kWe)WR&A
zr4>VBFzVWqfi<B<Xl-rh+Dj$OHm<t`*h`ZT(XIv;TL?{T4Q30}<1UMlF!ce;{yys5
za4}N3GT>%Tt83l6@U^J%FfMmzHMQ?DbqxwQ>Ue=Q0Ai9V9)DeLch5Nl-O6{qbp--9
z8E{{FEwcy%#cO|2C0P3YV7BTVFsg=1gcDL%!L(YYXZIypH$r$;h#i81HGAP-6*#{=
z@D@uu{Hy=|z+ektEQu#I)CtF6y5e22p-kKZdZ|;!5gx2!<MB)!&x*mHEv%1e^-vzr
ztE@xLv4L{{<0KPV$2pK}Xq|j0??smeex)*b-OB^}YPnM^G%pU0oZv6V=})-5!E}3U
zW=Wy>$}#|Ln?3br#m*Lrb3U_M)r`;>=XptmgmZA(H03{&=>o9T0g4U&J*g>n5C>dk
z^r8Bg)f_DE#*&Ux05s`h6=W9AnO>4oJDq|6hq_OXjWT*IeCj1-c+81mfB{+^CmP!z
z0-z8ut!Z>!99){!yY5kWu{(=cqc+$|s`Cv*>}O;*2zmIkfs~z%B?GKhwrf}bwaGL^
zZOWj@+rH9BrQIfAhdV=21#xy~d+c+Y2*@=6x4U~}>lt`?-X|(D4J2D;eE&z;Smv?6
zdj#z?2M3|L9(a7NZEy4zTH*2;_r78cT!_mj-P4SBcr9+CSMQt99M_P(=f&@kXK2_p
zkU%^fFl&=D2+gtmfV^G)ABM+ZrRJtNZYZslm?K!{|4BD2Wnlg=4g=jf@cwqLk1n5)
z4;q6HXS!(sE`y&-T|5PkZPBkT9-fDh2DpAh!ny9CdB#?<V<$UUJWg`-_FL`qf$|bo
z4tL~G9R@S6yJZj!3R3q>$a*)8ExWbqz@J8`G~ng}T5kBtINb#fW^?1`a`zW7d-9e6
z)uV6jaLgCx0Gy^UdMobvq_7<ZnJqnG9`CR|tDf@1ok7?ekoMOf#O9XoyzRYWt0gZ1
zr=Z@wN0JVM{kB{9AL;eJ5Gr}(gJfKrKRDx@pA-UUlJHu|IrYzR`lqLN`!`{I3udcg
z@S6kXiKn~yKSEltyMFy1>AvL=4u6k`p9S}>|2fb<gZ@ju-Tc;9X%m-iq*s6P2YJS(
ze+B_vVjyq|SP-`rb9wiG7SMazf_)=KffXosxu+FTw|-$JXev;08Ym73fO{{XUB_2{
zh=*+$z+X|*T)}mJEHGBhcP$r?gF3i_JSc;Pm36oFe!$X$J7@q#XaEP0ga>ehMo5G?
z*jNFm70aeeJ^~*)I1Wz8g9ea;M|c1T@P%JU0Ae_XVhDy`sDw?(gL368>UMM3kbxRP
z5LcLmJ!phU2!>=B0D8EG!XONL_=jW&hDn%)Pxw@5Mr<N5Z6`v9bl8PqD29C4hr>_|
zlvs(92#95f086-qSEy6n=65AfVJ5<ePH2aC{zw3NC=AAs3=Yr?r~nxdfeVuH3jv{r
z1aO9g=!4(Xf;NCtx_BDo5R9Z)gh=>^dq@lekN^+h5TEb~VImU)007`{i<{Vq4HagH
z_yLOsAWt}qTv&|ifQsL+imjLx&Df0nzzwyCi#upgiDm-^!vHG?jNbT-;3$sYa10Gm
z641~OrLX`18IZ163eNzGZ1E4#c#8;-hWDgYF((3<^^0;LjP-br;y4WLumJlp2w@_N
z3%~%|0Fojpk`Ay8%)kr)NeYip78~IW)X0evIY>0v0uy)}6={l)IF8Av8G(QXvIvqT
zIg&y-ltcNEAnA(ch(SgH4w?v)*90p5-WF#<h#bS{h!-gU$3PN*a0^Bmlp#r!U^$XT
zd6GiuiYCDs8vy{f$dJP1kT@`VwWkym$%r_aiU3dm%Lo}h=?^Apl3y8?MM;(@iIN`)
zkYcHlYY`?1pq2~CiMuqDEzndpDGpUxj2C&A@4yco`H{=enLtUBA?cZbd6Xhqm?tTa
zW9bly*(;36mY#%yaRzeqNSAe)k9NTiKk1cU>6yGal72awrdgPVDV)Q}j4;xgg&0Xf
z7g@TuccfUCs@M>ap%I_im)04Y*eRNSIhv<QoC4XM#_1sn5&&Q5n2H3ML7<3*QJG<A
zm#Q(HhWVNDxedJ;l=az{+gbjWq$!+)iJAe)3}i6~?opoR`9>EIfjR(umGPXGNdT(&
zo}w|9e`%j3*_jnep%+S_y9u1&>7V`yp!?A)0<nb2=|%UGjU>Qa>q(p8sFOG12L2$F
zylJ7KX`l32pEsJFU}==W*`FTzpUuD;3qTVKS)x&do;7%9bJ2}iXqh_cBrqzW8+x4=
zdZQV7r8+vFf$5z;+NHyiE&@=EXVh&ES!`<%UtrOQ2A~e^`K9O;pE6pV7CNU_nxR&T
zrTH0{9onV-c^(V^7X=zbCu(PB%6MKumtH82#sDgA0H>fiqZN9mbvmh$I-^=znn%f{
zeCnV4xG4lcqA^K5hyJ)@YhZM8*`$f8lWwXNQaY40N~e?>tCLEffXSnKx~T#QA(K(0
zp=vxq(sQI*MiW_zPD%`PMH>nbmaht{vf8YbI;A_Rskq9igYW=rX`~E<SfGdkW7TZv
zK$mPfiNDGj$vT?L>a6G*t9h!Q(mJh$NiF4xt^G5qJ76>3Y7TQrjNxhw<NBt`s-x)|
zuvjXZzbTft>aM6c8&6cEA+%{y#RE0@5pqa`Yl@1)U?amJnE!gNvHAeI@Ub2nvXpA2
zw5q4X>7xi6kYB0*<hg|!RBw<rl{e9(6`PML(k2qxszAxC9V@W2>Xq7wsXUsp9txo1
zDG-6$KG0XD{w6Sc_ez-*TeIx2vOo%!ehI0Q>aifZwIVCB=(?_@*{&%Ik}Hd}@@hP(
z)@AgU6#04qMi{QgK()52v5%UgKC87Kd!b%ir&(&UV(YF)`5k84t6Ah-C~5*C7MD<4
zhj7b=Z(5vm>zlONvs_!bTkEVPTd-tVoJ8BDFTt|BT0RFrrk}O8SyG1wV6nz<J{YvQ
z<|?Pninn-Ml3FXfmpihWYp_7txu}VfZ7@Cz%RR)$oZWP~sEYtD`W=vKnpTUoS30}3
zTe*9yw*%X^LYt|)TePhEL<exTp96$J_68q_uXR|l7yF_Zbh6AFr`Cy~SxdXr+qLjJ
zy?m?wo6(B0*(;D9QaasBxQ7*brCYopfvOJ5ugd$K>$|a%`n>RKxp_;!^$WB_8JxW9
z4?mijj}*GTgL20LcoNIFsAvqkfwRMTnxx6TJe#4=+rS`OyS59#kqWl^d9eA5!D2@M
zE_*v8B!J-yhX--Is*08$s<W<|os?Ul)BC~!Te1dA!}*)5v@rnvdppA`EwcH+TBr^e
zJ4FeCz$Q$@MvSgr8@(YLy$<}W5<J0Q+_@G!#4o|U-g`W;*TEh*z#x3F*^;cgo51W_
zqbbb7NIbuJ`@rdXsVDrmPYjSP6TFrKIW1IQ9{j^Sn7TG=F-7aT8~eu$Y`gK>z_b1v
z!T7nQPCTt`45Y)NAWir=%C}XKToC!XrpZgfC0w=tTBDQetV+zuW<0Voyq}5OrOdDy
zrIW*k6NMQE$#smyTu8|xycwnZohDqw)p^SS`^lcnzyoWenmf0M%)89cGE=-l9B9R2
zr_5Z4ycl`Py*sqriKFSd%koRe)?B^0E41B=tIw>m2NM9qTs=IzRc|<UMVPu5%cu>o
z&i{GB3S6Z=JID>Kp<rvPocqf_nmI1xzu|I#UAA-x!MK%78+)9oO)R<7Jf{mByO+Dm
z>YB!)OwlR%p{EQ0ajZ7cHUv)V5n4#lt1H9^jj4c%pB#(JvO3S%ytCXX(f%%7(diP-
zVsoO~Dt)xq(OEo>$C}TB$;Z-csoMO|4*j*dS<j<P(Kb9j{oFmtbp)3u$vTLH1&p!&
zI?D=O%SKGiTrIG68?@Jp)QSAe%n%O{FaTv8G}43w5xcnOY?}$h*9nc)aXQxwebROP
zv!M)}6kNf;JS^HX)Bh4MVrJ7ai?3M7g(2+Lt-HH3{JJGw(vkhplPkkRd(XU^P5=<t
zFw<?swQ&YPk>-00F=W~${L_-_yxI)et3B68Ez<b=%OIH;V8hfngQR1|d{TYb2K>1E
zDWzaM&9)rIt6j)ATB{-r+dpd6m^}~}eJZ2-&)`+6YVEc<{XAsl{>42C+*yjow(P#$
zUBB1~-dCN}!--R~ecql@#Tu3v4$xd{jm`tWLou<ukt@v;y5FFj-}>E~psA;>E8e(j
zw2b529Rr)75o@`<gYSLH-5Jf?DWAg~!+vbi6u#2EoZ<d$n3(P13G-oxi+Zt^QNqa9
z!;m|KiOIliseatz?n~T}E#Wba)M3r1ialEajx(CawDa;?Bks1yyVGyYpFVB16H244
zt<^|Q;b9)*Yn;@<yg#(<So7os3hK%^=!F;CAqOqw*{z*1+`bDesbfy&1iPbRS=otf
z!|Ed7hjLpY*aMe_XF90G$q3Td{or+*qqltDMXt#&F6LnV9k#wK)}8tQBq~&G?ggUw
zt%r@3=cC7SE7wenp?6KPkxkUzz29ma-Wm?fFIp{YzAV-@$6O$1a1P7Hz})kl-IUJI
zF7E2F-pMd5tJd4Z6r9`$o90lr>+EHAb_EJk7UvH7=;-yuLr#)ft?c;S=hU0hn{3yc
zp4To-=TdCwaZ*S*Zf~Z04p`pp=L6TZ?BaI{>&aftgq+e3Fz~tT>=13TXYS1yOnU?2
zF{AzkHA&si)8K-svp@~2dtTRLtP5q_!YT~U&AOq0e(RSVUe-P<1mI|i4g@xHgIFE_
z0FWqp9M^rUq2!L~J?p{&KkzL~@MYZb9N*P=y6OHs`o!P729p8rWHLll-hk|F>N?HE
zG5XsiJ?={^)aTyuJn!>d+qFO+&$9~X37^046#z<)B`RMBS@x~wyF?o!>A~IaneM_{
zul4fl^90ZFbszLwFZA0z@)JF_8kubZaPpo4-TF0Kt_;gq$=oPj^OgGIb}z_v|MPk8
z^<K~SnorbWS?o1D_+%y1XYV6XXmEsuL2>o+F;5$(UBtq@?DAase9!fGPy4m6_ge4w
zHX5yhKDHf_UWPv@L-f=eoqcQ{!aT&-DsJuoKfiZB`Fk(>c<=E)ulGT3r}dn(HO!N3
z6#R$cuwhjPz>cp5fQoLtF{^&zL9Ow$oBsK>U;FTX`F$V%^RM}l58ks(v}Egc-ft+V
zWCtKXHCU5aCwd)(06-X~EDST#H|;o#-upi=_;3t~!w2$+G%k-sBNN(8I;+g(6Uf8i
zY_kP8EFP0*3YY?5xS-nZH#{z%)9V(%83UPo`u;y)px_{3V8lqt+XX^^z`#gM4cDX&
zPtZ?MrjApOmD1-G6{slH6KT|^RnOMWq!-OsnXFA-+L|41uI{eI10+RZu<&r;1f+x8
zg-QTG0u08h&CO10<z-gqrjL?oDe0-`m6Ui@c{%oK>m+Q=tUDM(tr{C|z5VV$-X1Z3
zzu?3R3=EPPU<AOyvoGs%Sh|J@{#`a~-oQ0M6)p)mi`_;+thB`yyIAkU(2#fQ9?Fz(
z3?L){%pXjD5&|v=(B?uxW(#0I=)$EMwM(i@5j7X;8&ZrHr%cSql#?}e3l)weQxeTQ
zm0GnH2nZo2*nSky47iyS4^K(ba8PULP*c&Osglm6tJKpbP24I%4f@fiT9H*}1XLj4
z<krOXc9Mt?_OY<BB+8~RK!91{g=|>?QMEVjUb~|C9!-_kBF7(^Z%`c^=4y<rif89a
z5Rifd$hrqb;Ax^Vqen2P{^aa13n#pzmyh1)9Lu?mmi~f-=lToH!}Mr#mlGgQ1IN3^
z|2ahB_X(Vg3M5?3%5Ap(Ov<}$WN!bd6i;`@6-hTWq;*x*00{#DAl4m%ZTJGiOXN8S
z5DWtW7l1Rvu|o-bLd6GKe)ri&&S#`e0fiP)RTtP`1H#~df!igRU_LzY;UJBL5m4D>
zEj0jGamH;Z7iy(>IOK>TYJ`Ok@2%6CYw<vm00IZT$Xx&oz|cU0G>#{MWNA!jr5>zd
zn4wVmX=56Z9~uQ6M-`PwU3G%J6VEdR5a8mJ+}XyHmRd^IKmijnrht3zbw(6@bt#(W
zeI1fmB%-TmM%;C<0eS$Qc`7CVW8w8lqj`y>ms2evVR&4k`N_qohpMu9WM5IW^`D$`
z7B&E;nQE%lf*Af}`RQ)PtO%R{rMlOa5ZVCw6stqRsvKYaNjhm@?Tn;iY-{McD@rkv
zFe9+zK?n^3qcTF1shjzD=#kGh+bE>?aibctwAMNcwk%4?ZAu7q`fIqlbqRpE0ib&<
znLu{P?7OYT8zOXXnt0*8?$8MXl>72~PXfPy8}M$DK@g|~>IDFaG;2*`=vxpo+^}6o
zf#}pFaB`s#iWV~v5TFPsv+c&Zc<U+1<e7)TZ#Z3sGR5lzm2AW=!%QT9ZH|~uy^~hD
z03@~m9ds@Tfaz<|4-#1LGdG`_u(Ht#IW^p+bY#tHvE+=e0>==bE!ZgSsmI4<LpH7g
z<(i!Kh5id6`%v3V)fabj4}&JHe@X&YaT%5-V1UMb<5KLE01N(@$O9;2SpbNqyE5Bt
zr#cbjYKj(V<<v51G1p`r(7ESy9MBTkqmw5Y(x+dhdg47kt!!MOyd68dc+qRQy#nST
z(B41yzDrkEiYI)q1R9_Eim<$*?r~<C1HH4OxcR2-c3->ml?Cjs{q~=OCp!3G5xxfM
zkS7Vnt&4f*fF1j0C$EU1!%*(QoK>#3fO+6Ae{{Hj1AdX4{*9+}hl^0tinF|AE$ev+
z49!w#m!w(IsvXwS8F(HLC1sS%f_3N^Prk=Nfn6y99~1~{aJDvfap*41D&pj5W~3k}
z{%K-jav|;*69ZiRjD|Lp1L$0`L!*f=Cj<)N5U<gn10JzWs{%*6DCZw1sttl;s6jw5
z;D8xg@rrRc00T6*MRD2400%f32v>(bSw#d|k7JG!n<tS-sga4ZV&ed<^FmqF;297Y
zfX}LE$2j2dTYDTHPwck>l(m95J!;*V&e*CA%?BfoqR%30#zJaM5_fT&qqZuzNfZo?
zf1ivA@f=VP0vt?`KN;aR9-<%nD4>}<kRAz{hpNg!@^ZJ!+{LDNzdG&`1p$zvFMkOW
zVa0#|2S7kEai+4xwXT)-*%>0936WT#qmhoJ8$<pBMFHjRJapt{H+umIqKR|<H(mh%
z0tirxQmREW$aEbm*JqbJKBEB(7^5_&>5%E<6Ovx|Xf5BkfH*Ed0C&=4Ku^%U#uOBk
z=OKVX(ZEoZt!!~`nOvhFais+yN2926U^Ufdt&qMkn<M)tKsSjN2DOxn!!hTeeDWHn
zO-DnA(o1vV_zVTi&8I;9NHrd4KJ(2fn<YTNHos;;mRK@yO%00#x`s(GK|mcs6k!3c
zs><eE?-`NsYQ5<8$U;5wqi)0&_Wqet6#T6LZhdQ5{*-_NJm5+*9UuYIr&oz4MITZO
z(=}L@wOJCDV)83%KVuL8q%PJ11-M=~A?ptjL<j*D0^(Tj$`HYd5mEk&q6=dnkN}GA
zv_#YdD_#qAKEV*xI&oA$0nn;Rwf1hQzS^K{bu$yPuqTiWrRipTno6wNrBew20CCYk
zrmBwCW~G(i-HJL=OD4daRZQv?e+P+uWH(rn6#&z|o4l{0N?N}~3Yc~TfC2ms4LlWW
zK1*A-YPpdl^Ysl{bE(Tsc9Nj|6&T6{P?*btcee#jCba01!QlX4!3pTAMH|vY>b*Bz
zr==t;bShkPYM2ew?b}L&_u<`aR}bDIRBkaFUK5M=z^5ooi(6cP)W+b!$dxciBKgAR
zjv;UKB>+-4d`0WxX2>o@T5zReN~#i)gsntP5^7O^768Bz4gMwpq5R@ru>$D3sO{^>
zz?`f529yB(<gb}S)-~V-(S>Zzt5x?JB=feI&I5R@UmE}cD`VMI@U3tpwF=$Ua_+uA
z1{($ks>4JN&MUV~Sv1((=9|6_xR$N60CFwm^x`=OK@}vWUK1b-*TBnLwUcyBozlj}
zmesSp5^=eTA|=<<*AI1bX-Y%flC~h%-fo7md4l8#cR`Y$&YVINpw$LA002BTHGVDV
zt?N2_OGj&_dOdxtSx3{IM!A)@11^9748Q^FhCrUPTrEF0*Uu2psU8v#fOji9pw>ln
zy|v3T@RYluYeOaDIExeq=wr^f7I+J$3~^15JIk>S{ty%wuI`mD0NK0ialG@#skUa^
zL9~rQdj$MwtZ7s}uL}iu&MWXne4D|2757?RE|Pr;8x}M7YYfhdfDFU?)IlS_idouo
z@{CKT(uS`?IRo-SF6s(nV?e+g5rDbRUDr;>I-XlDRgg*&2Uo|sa0dY9DB)bp7Q8^O
zu!P;QYxhrGYxMc>DqiG-C{aj=_5k8OaJtt$<uAs20~#QM62n8w#m*bVdGdhF55Dk*
zw_t;t&G>#ufSdyrQ{N>IX{)~M6#7Vjx0%j)&JWzh;m$O|r|JqY%slmIIPb)H?0T;U
z4bu#I?CjyHRST(;s!YCiL>y(LIQKB_!>9ZHW$NzY3*((92yZ6*|K9#hLw~h|?|RPj
zcX8}zKP*SvYM+&uUw|LGkP!ln%>razuAN`>!BqOq-GUXs0~}xbRUqIkKmrUv^r6+D
z;UD$!3jj!wWA&ed)ZPo|801k~6HVTDHHG7N#heM>@Hrq2K49H3n3Gsw`-z?d6u<xg
zz}%VB0i+fF)zB{OT<DOXpQPS$?c44t({m`rQGka7EZ_{*AQnELw_RERIKTol)5C?H
zrX`;PWMG{IAqSS42fkkZR7pk2o)Y@QxB#HtP+MRXU3?f|v^)R;YT)JtVFS|O)(s*J
z5}&SBTDR3%r3K;O4WSyYVgB_FOX&U-9L6C(<i=Q_;KF5=X!X`1xs53Np4?rbAP%A_
z5+Y1Z90Q`C18&{TJt8E2Ais1Hy;))j&Y^_}9r~;t6pCDFND<tf9~Pb>S{36tol`Mx
z-QW>p8gkC`!P{a{NE}fB|Jfo~NC20Rz*eo<(4kUt)Q8NN#(ot5=MCdB4&o5*jyiHq
zIy#~=zT-Q_BB9A5w=@{WStF52Km=?brHly+o{145P$)h_6#`-nGGjBsqe8-?JQg86
z?utEDBR*aump~k$=$5)XAuHvDip>Rajf_E-B06&5D=s7~HlznGmh}P7ME1!9>?6eK
z8|%ml+o(}MCI!-^&E_5CDgL&jNuJI#qGW5S)b)5+OXlMTOu)|#2S&~$0p_8|Erlo$
z7ocPzG5RD!qGT-A&_nLZN*d)+=A#K>oyR%NQ;L!7P=N#qo=Cc4I{u_q7U58$z*nwX
zSZ+z}EhRKWo>R8ds(j*dgdNhDR4evmNjhU(c3sIt;uQrMSl*>}eE>GXq+bnKc<~z%
zIgBVsQJ|fpDY|1kCZ@7=Wza~YB~>D1(jGQeq+gZZI(4Fk$cK{&B>9nrXS(HK1|=kN
zC24XC0es#YrY4Q##%k)LUaH{t#bzf&rH4EhLVf02Dx_#GW^eL~0KC}Bp{8&W1946!
z1!z@Iq@6}mo(b7U{(7YWI!0$!HY8UX;anCR1!Bo|_DOLXr%uHfP1#fdp2osN&NrMV
zCXu9cuHjtTK>@%M=xOJCUgBg%z&`qw-t889VOx0;NqUWpdLm{@7U&!xz?6Y!a4zU@
zO6F=h=u*a*to0jC!OVqD)?w}@hr$7c9N)uLlwFD_k&$SF_LU5X5CQ51oHdMKvfF@e
zXpE-E0MHNCh2Cl6=%>`DgFa}`nWbN%P}~??MHz;M66lfsCIzCwecq^(l1Fixs3u-!
z!hEBZ!i}gEz)3<QhaNz|)hOU`m5xc|m_9~#Mu0v_X}(D)?^R9gBtUIi)-%Sa08HTa
zkw8x%!JX#*X}FYWl-_54?%n}aXqpfzuR)jV6=(u*jq@QK72MW6LMnZhXat;Swe{8*
z&F0i#X+@RPXm*n_$f=Uz9akj*q52gynrgs6se_8zOr|ME_Gbb;9lIR{-)s`+I0DJ-
z;HG^8CE}^CMkcEIX(ZHCW?G(T5Nf7AfVaY`C9NJ#*pLb!0E0d2{N<{&CSkP}4Y2-S
zj13^v0A{x~43+6Y4+g*ic#Z)y0)w$%rimT{Bn6#9fP%g&TwSZGBG*kZC*%-nxW=af
zKwov{!UZq`4t^;Kh~7nY7L#h4m@4e4UMqM`Lu{^3d3r0jA_2=X3dx0P&1IeebjKgL
zSPuT~Ai>5A>V+Nz@af`_EU<KEgJNr4>E~6s>S(;|(zfgpaIEM(fDZ~lxuC=WI6?s=
zfERM?l_1>ntU?(2>;$Z)(88;Z_9?a|T)jGuU9ha%x@_CRt<&l%6^xYgIat9afDg79
z-6d2)(OnB%S^^O2*4}MJC12j+WDkI<7*YVxVq@8sO}xhBgod2biUQNht+!?_DZFhG
z!~>n`Ec_|o3xT2GRus$eRCBCC-h?5-M!?uYZsfviiT3GI_QbUrUGHIT=YFf)!fm*I
zVd&~0@j~nSsc!F{!YYhZ*#7L}2JP%ds-&jsK;bTh?(T9(tmXo5%W`h_jw%(zgZ}BB
zt_Aw+@jlb`dM}ccMDr?ugBEA>j!u2r?m!_~$_8mtXfLB|?%e*a)4uEuFkk!)aQwjo
zM}qG+crWWd90NP<^TsduOfPMPp0p|F<?`;!@^An8FWvsH2XimosxQ-yFz?2U4%n?2
zy6^KsF9d^3yiTyDWr%?p>wRSI+mbK>=WhvzFbMyy{&KM5#;h13T$GY+3-`|pBLcy$
z?V2)&=jO2gk}&`3?+^cQ6vGS=z|#;rF#H}d5}$39iog&*SOH$J1}AR@L$UhOg%s!T
z89PhQvfTUDrx$b3{D!d@Y8n|gj-Yyo2zM|Cdu|%{?;2w<<NB-v!>$q6{_zgIaM)VZ
z!@f%)1Mw3B@(EqU4#Y78IPVHG@+ZYBWm2#*EfcG}G3QS5C3jUEYg!_Au_u4B1aEQ*
zlSzs}Pa&gnnrIXX4{;H@@+<Gr9Y^USH>v^I>m@@^SFI51=CR1mu`mBJEKhIqiE<&m
z(lJ9$GS^Nit@7(Sv+P21OO+|werF!%*^d;-HN&hu)y_gp^B6{HCxi1_1#_wn^B(hY
zI#bO$<5M-MTk~>qJj=6efwDUvZOH9aK6^t?Nlc-bE&~&BFE6q{540mQGgtZ6nj|zP
z?=y`}f<ODL9QP?5PxO$9Gdy$i9s_9;pU^^w)~^ZgCO@<adov6ElQcz7Z#`SIJZ<D2
zBC}^m2ZXtTKf5l%wem>YG^^2b1h})ueq$0{Fd|9eK9g1ueY8x&b3h}tvzatJ%W@uX
z+Ci_0F~>}FIQ0tA7)*b4QN#26YW3JDbv-|_9><dUh)8Jg2P#0+MyW#pf3&8t+)UGS
zO}lkcgYr_#HOm!jH9s{vyGqp16GQj)Ftc1Dukbe$_Uys+VI%gYDK<v^^j$ahIP{bn
zxka%}_9iPpWm`68$Km`It%)M`80Hz0;4^6h=_|GLC46B)n{QwXc5CCKIHRqJGPQ3b
zFGl4dc|t{Uht~Kq^K7s7YX^5rzBX2;s&Nl-GtIzhG!o$DF!x5Dwru;hbhkBi-{or)
zcWjUM5TEY>&&6}J0{pRed#m<!Pv$e9cUY!3pJMfQ(l;~5GyxAd7<x5yL$`phwq;AS
zey1jXt2cHV_<>J2g;#ihZ!!gNaYRpdgF9(@!#3;|cT8J2iBot?Bdmgd_+@wan5y`-
zhPa7Rz)=5niG%cstG0soH-4Kpi<7L21MPLgbB1TQY8Ux;%J`6HI9n69i|2QbE3Avh
z?)wHgl~?(cH#yl3_LG+_mZPdZez}f^d6#qemdo>)WBGzlx0aVVG@rSfuQ{7*NeBP{
EJKO_pP5=M^

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/css/en/images/front-background-small.gif b/koha-tmpl/opac-tmpl/css/en/images/front-background-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..31add9c944e1cf0c1b8fcb84e4b1143c323a13f6
GIT binary patch
literal 1426
zcmV;D1#S9ANk%w1VN3vS0E7Sl4ugvXVq^r3j}#Uh0000VFf~t1Q3I8i&dkpL|NrUb
z>F@0C^zrom{{DcDp7{3o{QLa1w6*&A`i7#bbZ3P9{QckD-+FqH|NsC0|NsC0|NsC0
z|NsC0|NsC0|NsC0A^sIZa%Ew3Wn>_CX>@2HRA^-&M@dak03rDV0SW*g04x9i002w?
zZU6uU{@^E$WNDsg`T;>32x=_PbO{VZJ`{#g;JH9;NK_qi1w>-WY$g<j9IQyK1qcI$
zbGu#Ss^HYsz%6qbghF`z5v0v<Zj@ccHR5<Df<PZ09eIIG4SanvSAvO6g@!0^ijZE7
zCj@|ymlKSW9|T&Lp9Dgi1P`C437UNbr>6)5jjODusbK^VvZoTXR0IpSth+=65x=Y!
zuV6gIvcWR~1Iw}$qD8UMz`PRI%tZy3+ou!&e%9cp$Ta2Vrp+b=#Ov7U@v;t6G3xY}
z3)CqBWcuW($QKY&yAJ^-6cp%aAwv@ZlsGh{CI!KXf(#r$5fP&)dksB)iqLO_0C*z)
zAt5L!;$liX7Fhm!c}W3FXfz?kG~qI*nVlp$`b@O4M9-mIB8($}6KNm{_Yit=n#X`q
zs)EpoXo@wCCZS!uk~kW6i6*jTwNfY>=K-|>zSx?Ha1U+RiY?{B(F9O07e)Xi`rU$#
z>tH4m>K-OMcCnMQj+<!h>lma604NhRXixz{h0S*yew|td^yUf@7+7#nKnDd23?PKo
zr)j|KEv73xSU|z`h2Iw_L`lP-0==RmT!OB^U=INUz#TXM9-M;p914t^OGR+`gFOR&
zOCK+tdUXmHa!9znj63el5)|YRPrg2N>-c*kV2_LBRVSN0U;zQ>T~ObF)BXOIAASV#
z_YfxlHt-#R(bYG>1P)-B;CTx^=b$NC<;4Vi1DZFTbQoS}pMncscfp5{P_WT|OK>J%
zfz%<Gp@!z=XTWu(;IfM~n=!zHbtdYFVUI1MM*xh1AV*^Z5DbW9jt1(uA#hDnFhFLY
zgj6H}=4E-JmgRBT<&&)7MPmh4=7{EjOtxstEEd%$!H-y;S)P_Xa%i0aU@8(~V+l0i
z#g*d8IbMngs@bApiL`@L12;NqA&NU@=xLfP=4TfdhX$oZ1r8MG=Ybcd*s7~MhKeMc
z2E`x%AP|s=9;-XP3TdmHZfGZzWmw=Q3eY@2W`(f&>a4GzE|?y%fBwy|in5Ms*z2>;
zMvLFHid?`FB?;(Kp{LDqt0Jdda%cdxkI|4Uh4cZd?yJ3?D5;mE<#A9@5ny}nw)d*I
zZh{?Z7l<oE3}7yf<Q42Hc?RzLZl%IJeD1RbY)Wyvv&tsOza|WTEyU<<n**I?b{GM?
zOR!eN0Z{}uu)!CSS;@!uomW5sn+1|<74u!GWhM&@*zuOKrdNQ-fsl+WbecL_fCURI
z&>D+2BiUO7pN$+95eE#wCw&$!X}|&uFd*M^3jT&e0S|x{NCD#xQS`tB6VNsT4?Ms?
z1Ucwn!2_QKorjlfxM8!IDEit9;15V(IRuqUkhtP`5Z(t4`e;WiIp7j_wz+9AC$L8!
z2LQ0_&Gr(2z~!ggEr{oalpP-AkxOoYXSRp?MI)`h{wTq%KDW7{&q+=874;U}8s~8|
zkRAa!Zz4kL1BCbJy%A*62^>)5K*5DOXg@;n(LWphtF2*yo^XX1fG^%Ns{cXp-@p3)
zh2aZetN!=C|9J@j`P1M2Za@J}x$l1xLtg<9sK63%&l|mqAh5_|fB{gjf+lEP2Sryf
zPf^DQ2KXQdL&&`We5!;SLZJ#*h=SJLz<a&x6nVTffB?*phAB9J4S%qM^S$Z<9qe8T
gg$P7H2yuu+>>l0#fIucTu?kPjVivDBf)D@zJB&+(&;S4c

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc
new file mode 100644
index 0000000000..8f699ec2e8
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc
@@ -0,0 +1,14 @@
+<div id="bottombloc">
+<!-- TMPL_IF NAME="loggedinusername" -->
+	<p>
+		Logged in as <b><!-- TMPL_VAR NAME="loggedinusername" --></b> <a href="/cgi-bin/koha/opac-user.pl">Members Home</a>
+		|| <a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>
+	</p>
+<!-- TMPL_ELSE -->
+	<p>
+		<a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha
+	</p>
+<!-- /TMPL_IF -->
+</div>
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc b/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc
new file mode 100644
index 0000000000..7bfe22f03e
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
+	<title><!--TMPL_VAR name="LibraryName"--></title>
+</head>
+<body>
+	<!-- MENUS -->
+	<div id="menuline">
+		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" />
+		<span class="LibraryName"><!--TMPL_VAR name="LibraryName"--></span>
+		<span class="spacer">&nbsp;</span>
+		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
+		<span class="spacer">&nbsp;</span>
+		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
+		<span class="spacer">&nbsp;</span>
+		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member Home page" >Members</a>
+	</div>
+	<!-- MAIN BODY OF PAGE -->
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac.css b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
new file mode 100644
index 0000000000..4d74cd5fe4
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
@@ -0,0 +1,276 @@
+body {
+	background-color:#009999;
+	font-family:verdana,arial,helvetica;
+	font-size:12pt;
+	margin:0px;
+	padding:0px
+}
+
+/* base tags */
+a {
+	background-color: #ACE6E6;
+	text-decoration:none;
+	color:#000000;
+}
+
+a.transparent {
+	background-color: transparent;
+	text-decoration:none;
+	color:#000000;
+}
+
+a:hover {
+	background-color: #FF6600;
+	text-decoration:none;
+	color:#000000;
+}
+
+label {
+	float:left;
+	width: 10em;
+}
+
+img {
+	border-width:0px;
+	text-align:left;
+}
+
+
+h1 {
+	color:#FFD9BF;
+	background-color:#FF6600;
+	font-weight:bold;
+	font-size: 150%;
+	text-align:center;
+	padding: 2px;
+	border: 4px inset #FFD9BF;
+	width:60%;
+}
+
+/* style for library name, on top of menu (defined in LibraryName systempref) */
+.LibraryName {
+	color:#FFD9BF;
+	background-color:transparent;
+	font-weight:bold;
+	font-size: 150%;
+	text-align:center;
+	vertical-align:top;
+	padding: 2px;
+	border: 4px inset #FF6600;
+	width:75%;
+}
+
+h2 {
+	color:#FFD9BF;
+	background-color:#FF6600;
+	font-weight:bold;
+	font-size: 125%;
+}
+
+p {
+	padding-left:10pt;
+	padding-bottom:0pt;
+	margin:0pt;
+}
+p.center {
+	padding-left:10pt;
+	padding-bottom:0pt;
+	margin:0pt;
+	text-align:center;
+}
+p.copyright {
+	border-top: 1px solid #000000;
+	margin-top:10px;
+	text-align:center;
+}
+
+/* TABLES */
+table {
+	border:1px solid #000000;
+	border-collapse:collapse;
+	width:90%;
+}
+/* header */
+th {
+	background-color: #99cccc;
+	background-image: url(/opac-tmpl/css/en/images/background-opac.gif);
+	font-weight:bold;
+	text-align:center;
+	font-size:10pt;
+	border-left:1px solid #000000;
+	border-bottom:1px solid #000000;
+	border-top:1px solid #000000;
+	padding:5px;
+}
+/* standard cell */
+td {
+	font-size:10pt;
+	border-left:1px solid #000000;
+}
+
+/* hilighted cell */
+td.hilighted {
+	font-size:10pt;
+	border-left:1px solid #000000;
+	background-color:#ffffcc;
+}
+
+/* FORMS */
+/* class used in form buttons */
+.button {
+	text-align: center;
+	padding: 2px 2px;
+	border-style: solid;
+	border-width: 1px;
+	border-color: black;
+	text-decoration: none;
+	color: black;
+	line-height:175%;
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	background-color:#FFD9BF;
+}
+
+.button:hover {
+	text-align: center;
+	padding: 2px 2px;
+	border-style: solid;
+	border-width: 1px;
+	border-color: black;
+	text-decoration: none;
+	color: black;
+	line-height:175%;
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	background-color:#FF6600;
+}
+
+input {
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#009999;
+}
+
+input:hover {
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#FF6600;
+}
+
+select {
+	background-color: #ACE6E6;
+	text-decoration:none;
+	color:#000000;
+}
+
+/* span classes */
+/* used to show small 1,2,3, to reach other pages when too much results */
+.smallnumber {
+	background-color:#99cccc;
+	font-family:Times,serif;
+	font-size:small;
+	border:1px solid #000000;
+	padding:1pt;
+	vertical-align:top;
+}
+
+.smallnumberactive {
+	background-color:#FF6600;
+	font-family:Times,serif;
+	font-size:small;
+	border:1px solid #000000;
+	padding:1pt;
+	vertical-align:top;
+}
+
+/* BLOCS */
+
+/* the mainbloc : everything is in mainbloc, except menu */
+#mainbloc {
+	float:left;
+	width:90%;
+	background-color:#ACE6E6;
+	border:1px solid #000000;
+	margin-left:10px;
+	margin-right:10px;
+	padding-bottom:100px;
+	padding-left:10px;
+	padding-top:10px;
+	padding-right:10px;
+}
+
+#homebloc {
+	float:left;
+	width:60%;
+	border:0;
+}
+
+#leftbloc {
+	float:left;
+	width=30%;
+	border:1;
+}
+
+#bottombloc {
+	width:100%;
+	height:200%;
+	margin-top:10px;
+	vertical-align:top;
+	text-align:center;
+	float:left;
+}
+
+/* used in members */
+#bloc20 {
+	float:left;
+	width:30%;
+	border:0;
+	border:1px solid #000000;
+	margin-right:20px;
+	margin-bottom:20px;
+}
+#bloc60 {
+	float:left;
+	width:60%;
+	border:0;
+	border:1px solid #000000;
+	margin-right:20px;
+	margin-bottom:20px;
+}
+
+/* used in biblio detail */
+
+#bibliobloc {
+	float:left;
+	width:40%;
+	border:0;
+}
+
+#itembloc {
+	float:left;
+	width:50%;
+	border:0;
+}
+
+/* menu styles */
+.menu {
+	border:1px solid #000000;
+	padding-left:10pt;
+	padding-right:10pt;
+	float:left;
+	margin-bottom:10px;
+	-moz-border-radius: 6px;
+}
+#menuline {
+	width:100%;
+	height:200%;
+	vertical-align:top;
+	float:none;
+	position:relative;
+}
+
+/* a little spacer. should not be used */
+.spacer {
+	padding-left:20pt;
+	float:left;
+}
diff --git a/koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl b/koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl
new file mode 100644
index 0000000000..09b6e87531
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl
@@ -0,0 +1,17 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+
+<center>
+<table border=1 cellspacing=5 bgcolor=red>
+<tr><td>
+<table border=0 bgcolor=#dddddd>
+<tr><th>An Error has Occurred</th></tr>
+<tr><td><!-- TMPL_VAR NAME=errormessage --></td></tr>
+</table>
+</td></tr>
+</table>
+</center>
+
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl
new file mode 100644
index 0000000000..e9cc73b83b
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl
@@ -0,0 +1,40 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+<div id="mainbloc">
+	<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+	<h2>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
+	<!-- /TMPL_LOOP -->
+	<table cellspacing=0>
+		<tr>
+			<th colspan=2>Fines & charges</th>
+			<th>Amount</th>
+			<th>Still owing</th>
+		</tr>
+
+		<!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
+		<tr>
+			<td>
+				<!-- TMPL_VAR NAME="date" -->
+			</td>
+			<TD>
+				<!-- TMPL_VAR NAME="description" -->
+				<!-- TMPL_IF NAME="print_title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF -->
+			</td>
+
+			<td align="right">
+				<!-- TMPL_VAR NAME="amount" -->
+			</td>
+			<TD>
+				<!-- TMPL_VAR NAME="amountoutstanding" -->
+			</td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+
+		<tr>
+			<th colspan=2><b>Total Due</th>
+			<th align="right"><!-- TMPL_VAR NAME="total" --></th>
+			<th>&nbsp;</th>
+		</tr>
+	</table>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl
new file mode 100644
index 0000000000..b63c4cf50e
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl
@@ -0,0 +1,38 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="nopermission" -->
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="timed_out" -->
+<!-- This is what is displayed if login has timed out -->
+<h2>Sorry, your session has timed out, please login again.<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="different_ip" -->
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>You are accessing koha from a different ip address! please login again.<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="invalid_username_or_password" -->
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>You entered an incorrect username or password, please try again.<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="loginprompt" -->
+<!-- login prompt time-->
+
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
+	<h1>Koha Login</h1>
+	<p><label>Cardnumber</label><input name="userid" /></p>
+	<p><label>Password</label><input type="password" name="password" /></p>
+	<!-- TMPL_LOOP NAME="INPUTS" -->
+		<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
+	<!-- /TMPL_LOOP -->
+	<input type="submit" value="login" class="button" />
+</form>
+
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
new file mode 100644
index 0000000000..d53d2c1b29
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
@@ -0,0 +1,79 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
+
+	<div id="bibliobloc">
+	<table cellspacing="0">
+		<!-- BIBLIO RECORD TABLE -->
+		<tr>
+			<th>
+				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
+				<!-- TMPL_IF name="author" --><b>Author:</b> <a href="/cgi-bin/koha/opac-search.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br />
+				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
+				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
+				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
+				<!-- TMPL_IF name="subject" --><b>Subject:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subject" --><br />
+				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
+				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
+				<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
+				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
+				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
+				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
+			</td>
+		</tr>
+	</table>
+	</div>
+	<!-- /TMPL_LOOP -->
+
+	<div id="itembloc">
+	<table cellspacing="0">
+		<tr>
+			<th colspan="6">Item</th>
+		</tr>
+		<tr>
+			<th>type</th>
+			<th>class</th>
+			<th>location</th>
+			<th>date Due</th>
+			<th>last Seen</th>
+			<th>barcode</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+			<tr>
+				<td><!-- TMPL_VAR NAME="itemtype" --></td>
+				<td><!-- TMPL_VAR NAME="class" --></td>
+				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="bulk" -->(<!-- TMPL_VAR NAME="bulk" -->)<!-- /TMPL_IF --></td>
+				<td><!-- TMPL_VAR NAME="datedue" --></td>
+				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
+				<td><!-- TMPL_VAR NAME="barcode" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
+			<tr>
+				<td><!-- TMPL_VAR NAME="itemtype" --></td>
+				<td>Website</td>
+				<td>Online</td>
+				<td>Available</td>
+				<td>&nbsp;</td>
+				<td><!-- TMPL_VAR NAME="url" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<!-- TMPL_UNLESS NAME="norequests" -->
+	<p>
+		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Request</a>
+	</p>
+	<!-- /TMPL_UNLESS -->
+	</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
new file mode 100644
index 0000000000..225100c1dd
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
+	<title><!--TMPL_VAR name="LibraryName"--></title>
+</head>
+
+<body>
+<div id="leftbloc">
+	<img src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
+</div>
+
+<div id="homebloc">
+	<h1 class="LibraryName"><TMPL_VAR name="LibraryName"></h1>
+	<h2>Search the catalogue</h2>
+	<form action="/cgi-bin/koha/opac-searchresults.pl">
+		<p>
+			<input type="hidden" name="type" value="opac" />
+			<input type="text" size="27" name="keyword" tabindex="1" /> <input type="submit" value="OK" class="button" /><br />
+		</p>
+		<p>
+			<a href="/cgi-bin/koha/opac-search.pl">Advanced Search, More Options	</a>
+		</p>
+	</form>
+
+	<h2>Recent acquisitions</h2>
+	<form action="/cgi-bin/koha/opac-new.pl">
+		<p>
+		<!-- TMPL_VAR name="CGIitemtype" --> acquired in the last <b><input type="text" name="duration" value="30" size="3" /></b> days
+		<input type="submit" value="OK" class="button" />
+		</p>
+	</form>
+	<!-- TMPL_IF NAME="loggedinusername" -->
+		<h2>Logged in as <!-- TMPL_VAR NAME="loggedinusername" --></h2>
+		<p><a href="/cgi-bin/koha/opac-user.pl">Members Home</a> || <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></p>
+	<!-- TMPL_ELSE -->
+	<h2><a href="/cgi-bin/koha/opac-user.pl">Log In to Koha</a></h2>
+	<!-- /TMPL_IF -->
+	<p class="copyright">
+		This Library is powered by <a href="http://www.koha.org">Koha</a> free software ILS, and compliant with web standards
+		<a href="http://validator.w3.org/check/referer">
+			<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="16" width="44" />
+		</a>
+	</p>
+</div>
+
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl
new file mode 100644
index 0000000000..dbd299ee8a
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl
@@ -0,0 +1,106 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<center>
+
+<br>
+<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
+<a href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->
+<img src=/images/requests.gif
+width=120 height=42 border=0 align=right border=0></a>
+<FONT SIZE=6><em><a
+href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra><!-- TMPL_VAR NAME="title" -->
+(<!-- TMPL_VAR NAME="author" -->)</a></em></FONT><P>
+<p>
+<form action=/cgi-bin/koha/modbibitem.pl>
+<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
+<input type=hidden name=biblio value=<!-- TMPL_VAR NAME="biblionumber" -->>
+<!-------------------BIBLIO ITEM------------>
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
+<TR VALIGN=TOP>
+<td  bgcolor="99cc33" background="/images/background-mem.gif"
+><B><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP - <!-- TMPL_VAR NAME="description" --> </b> </TD>
+</TR>
+<tr VALIGN=TOP  >
+<TD width=210 >
+<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93
+BORDER=0 src="/images/modify-mem.gif">
+<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93
+BORDER=0 src="/images/delete-mem.gif">
+<br>
+<FONT SIZE=2  face="arial, helvetica">
+<b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
+<b>Item Type:</b> <!-- TMPL_VAR NAME="itemtype" --><br>
+<b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
+<b>Loan Length:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
+<b>Rental Charge:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
+<b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --><br>
+<b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
+<b>Publisher:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
+<b>Place:</b> <!-- TMPL_VAR NAME="place" --><br>
+<b>Date:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
+<b>Volume:</b> <!-- TMPL_VAR NAME="volumeddesc" --><br>
+<b>Pages:</b> <!-- TMPL_VAR NAME="pages" --><br>
+<b>Illus:</b> <!-- TMPL_VAR NAME="illus" --><br>
+<b>Size:</b> <!-- TMPL_VAR NAME="size" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
+<b>No. of Items:</b> <!-- TMPL_VAR NAME="count" -->
+</font>
+</TD>
+</tr>
+</table>
+</form>
+<!-- /TMPL_LOOP -->
+<!-- TMPL_LOOP NAME="ITEM_DATA" -->
+<img src="/images/holder.gif" width=16 height=300 align=left>
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
+<TR VALIGN=TOP>
+<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>BARCODE
+<!-- TMPL_VAR NAME="barcode" --></b></TD>
+</TR>
+<tr VALIGN=TOP>
+<TD width=220>
+<form action=/cgi-bin/koha/moditem.pl method=post>
+<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblionumber" -->>
+<input type=hidden name=item value=<!-- TMPL_VAR NAME="itemnumber" -->>
+<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
+<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93
+BORDER=0 src="/images/modify-mem.gif">
+<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93
+BORDER=0 src="/images/delete-mem.gif">
+<br>
+<FONT SIZE=2  face="arial, helvetica">
+<b>Home Branch:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+<b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+<b>Last borrowed:</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
+on issue bit <!-- FIXME - What's this, then? -->
+<b>Last Borrower 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+<b>Last Borrower 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+<b>Current Branch:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+<b>Replacement Price:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+<b>Item lost:</b> <!-- TMPL_VAR NAME="itemlost" --><br>
+<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
+<b>Renewals:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">
+Accession</a>
+Date:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
+<b>Cancelled: <!-- TMPL_VAR NAME="wthdrawn" --><br>
+<b><a
+href=/cgi-bin/koha/bookcount.pl?&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&itm=<!-- TMPL_VAR NAME="itemnumber" -->>Total
+Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
+<b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
+<b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
+
+
+
+</font>
+</TD>
+</tr>
+</table>
+</form>
+<!-- /TMPL_LOOP -->
+
+<p>
+</form>
+</center>
+
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl
new file mode 100644
index 0000000000..8be6eebe45
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl
@@ -0,0 +1,85 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+<h2>Reserve page for <u><!-- TMPL_VAR NAME="title" --></u> (<!-- TMPL_VAR NAME="author" -->, N°<!-- TMPL_VAR name="biblionumber" -->)</h2>
+<!-- TMPL_IF NAME="message" -->
+	<h2>Impossible to set reserve because </h2>
+	<ul>
+		<!-- TMPL_IF NAME="too_much_oweing" --><li>you owe <!-- TMPL_VAR NAME="too_much_oweing" --></li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="too_many_reserves" --><li>you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="already_reserved" --><li>you already have a reserve placed on this item.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="no_items_selected" --><li>you must select at least on item type!</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="no_branch_selected" --><li>you must select a branch for pickup!</li><!-- /TMPL_IF -->
+	</ul>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="select_item_types" -->
+	<!-- The first time round you select which bibitems you want -->
+	<p> There are <b><!-- TMPL_VAR NAME="reservecount" --></b> reserves already on this item. </p>
+	<p>Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you.</p>
+
+	<FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
+		<input type="hidden" name="item_types_selected" value="1">
+		<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->">
+		<TABLE cellspacing=0>
+			<tr>
+				<th>Request</th>
+				<th>Item Type</th>
+				<th>Copies</th>
+			</tr>
+			<!-- TMPL_LOOP NAME="TYPES" -->
+				<tr>
+					<!-- TMPL_UNLESS NAME="notforloan" -->
+						<td><input type="checkbox" name="itemtype" value="<!-- TMPL_VAR NAME='itemtype' -->" checked></td>
+					<!-- TMPL_ELSE -->
+						<td>Cannot be Reserved</td>
+					<!-- /TMPL_UNLESS -->
+					<td><!-- TMPL_VAR NAME="description" --></td>
+					<td><!-- TMPL_VAR NAME="copies" --></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<p>Please select the branch from which you want to collect the item: <!-- TMPL_VAR NAME="CGIbranch" --></p>
+		<p>Reserve on this date:
+			<select name=required-day><option value=0>Day<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
+			<select name=required-month><option value=0>Month<option value=1 >Jan<option value=2 >Feb<option value=3 >Mar<option value=4 >Apr<option value=5 >May<option value=6 >Jun<option value=7 >Jul<option value=8 >Aug<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
+			<select name=required-year><option value=0>Year<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+		</p>
+		<p>End reserve on this date:
+			<select name=expires-day><option value=0>Day<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
+			<select name=expires-month><option value=0>Month<option value=1 >Jan<option value=2 >Feb<option value=3 >Mar<option value=4 >Apr<option value=5 >May<option value=6 >Jun<option value=7 >Jul<option value=8 >Aug<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
+			<select name=expires-year><option value=0>Year<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+		</p>
+		<INPUT class="button" type="submit" value="Submit">
+	</FORM>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="item_types_selected" -->
+<!-- if the bibitems have already been selected -->
+	<p>Please confirm that you wish to request an item of these types:<p>
+
+	<FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
+		<input type="hidden" name="place_reserve" value="1">
+		<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME='biblionumber' -->">
+		<input type="hidden" name="required_date" value="<!-- TMPL_VAR NAME='required_date' -->">
+		<input type="hidden" name="expires_date" value="<!-- TMPL_VAR NAME='expires_date' -->">
+		<ul>
+			<!-- TMPL_LOOP NAME="TYPES" -->
+					<input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME='itemtype' -->"></td>
+					<li><!-- TMPL_VAR NAME="description" --></li>
+			<!-- /TMPL_LOOP -->
+		</ul>
+		Which is to be picked up from
+		<ul>
+			<li>
+				<!-- TMPL_VAR NAME="branchname" -->
+			</li>
+		</ul>
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME='branch' -->">
+		<!-- TMPL_IF NAME="fee" -->
+			<p>Note there will be a reserve charge of <b>$<!-- TMPL_VAR NAME="fee" --></b></p>
+		<!-- /TMPL_IF -->
+		<INPUT class="button" type="submit" value="Place Reserve">
+	</FORM>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
new file mode 100644
index 0000000000..e984080100
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
@@ -0,0 +1,35 @@
+<!-- TMPL_INCLUDE name="opac-top.inc" -->
+
+<div id="mainbloc">
+	<h1>Advanced search</h1>
+	<form action="/cgi-bin/koha/opac-searchresults.pl" method="get">
+	<ul>
+		<li><label>keyword</label><input type="text"  size="25"   name="keyword" /></li>
+	</ul>
+	<p><b>OR :</b></p>
+	<ul>
+		<li><label>subject</label><input type="text"  size="25"   name="subject" /></li>
+	</ul>
+	<p><b>OR one or more from :</b></p>
+	<ul>
+		<li><label>Title</label><input type="text"  size="25"   name="title" /></li>
+		<li><label>Author</label><input type="text"  size="25"   name="author" /></li>
+		<li><label>Illustrator</label><input type="text"  size="25"   name="illustrator" /></li>
+		<li><label>Item type</label>
+			<select size="1"  name="class">
+				<option value="">Any</option>
+				<!-- TMPL_VAR name="classlist" -->
+			</select>
+		</li>
+		<li><label>Barcode</label><input type="text"  size="25"   name="itemnumber" /></li>
+	</ul>
+		<p>using <input type="radio" name="ttype" value="normal" />Normal or <input type="radio" name="ttype" value="exact" />Exact search</p>
+
+	<p>
+		<input type="submit" value="OK Start Search" class="button" />
+		<input type="reset"  value="Clear All Fields" class="button" />
+	</p>
+	<p>Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used</p>
+	</form>
+</div>
+<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
new file mode 100644
index 0000000000..9367a61b42
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
@@ -0,0 +1,150 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="searchdesc" -->
+    <p class="center">You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b></p>
+<!-- TMPL_ELSE -->
+	<!-- TMPL_IF name="searchnew" -->
+		<p><!-- TMPL_VAR name=itemtype --> acquired in the last <i><!-- TMPL_VAR name="duration" --></i> days</p>
+	<!-- TMPL_ELSE -->
+		<p>You did not specify any search criteria</p>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<p class="center"><!-- TMPL_VAR NAME="numrecords" --> results found</p>
+<p class="center">
+    <!-- Row of numbers corresponding to search result pages -->
+    <!-- TMPL_IF NAME="displayprev" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME='prevstartfrom' --><!-- TMPL_LOOP NAME='FORMINPUTS' -->&amp;<!-- TMPL_VAR NAME='field' -->=<!-- TMPL_VAR NAME='value' ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="numbers" -->
+	<!-- TMPL_IF NAME="highlight" -->
+		<span class="smallnumberactive"><!--TMPL_VAR name="number" --></span>&nbsp;
+	<!-- TMPL_ELSE -->
+		<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->" class="smallnumber">
+			<!--TMPL_VAR name="number" -->
+		</a>&nbsp;
+	<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_IF NAME="displaynext" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+</p>
+<p>&nbsp;</p>
+<!-- Search Results Table -->
+<!-- TMPL_IF NAME="numrecords" -->
+	<!-- If we have a subject table -->
+		<!-- TMPL_IF NAME="subjectsearch" -->
+		<table border="0" cellspacing="0" cellpadding="2">
+			<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+				<th>Subject</th>
+			</tr>
+			<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+				<tr>
+					<td><a href="/cgi-bin/koha/opac-searchresults.pl?&subjectitems=<!-- TMPL_VAR NAME=subject ESCAPE=URL -->"><!-- TMPL_VAR NAME=subject --></a></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
+			<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+				<td colspan="4">
+					&nbsp;
+				</td>
+			</tr>
+		</table>
+
+<!-- Else we have a list of items -->
+<!-- TMPL_ELSE -->
+	<table cellspacing="0">
+	<tr>
+		<th>Title</th>
+		<th>Author</th>
+		<th>&copy;</th>
+		<th>Item Count</th>
+		<th>Location</th>
+		<th>&nbsp;</th>
+	</tr>
+<!-- Actual Search Results -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
+	<tr>
+		<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+			<a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->"><!-- TMPL_VAR NAME="title" --></a>
+		</td>
+		<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+			<a class="transparent" href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->"><!-- TMPL_VAR NAME="author" --></a>
+		</td>
+		<td align="center"<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_VAR NAME="copyrightdate" -->
+		</td>
+		<td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_VAR NAME="itemcount" -->
+		</td>
+		<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_VAR NAME="location" -->
+		</td>
+		<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_UNLESS NAME="norequests" -->
+				<a class="transparent" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Request</a>
+			<!-- TMPL_ELSE -->
+				Not Reservable
+			<!-- /TMPL_UNLESS -->
+		</td>
+	</tr>
+<!-- /TMPL_LOOP -->
+	<tr>
+		<th align="left">
+			<!-- TMPL_IF NAME="displayprev" -->
+				<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME=FORMINPUTS -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;&lt; Previous</a>
+			<!-- TMPL_ELSE -->
+				&nbsp;
+			<!-- /TMPL_IF -->
+		</th>
+		<th colspan="3">&nbsp;</th>
+		<th colspan="2" align="right">
+			<!-- TMPL_IF NAME="displaynext" -->
+				<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME=FORMINPUTS -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">Next &gt;&gt;&gt;</a>
+			<!-- TMPL_ELSE -->
+				&nbsp;
+			<!-- /TMPL_IF -->
+		</th>
+	</tr>
+</table>
+<!-- /TMPL_IF -->
+
+<p class="center">
+	Results <i><!-- TMPL_VAR NAME="startfrom" --></i> through <i><!-- TMPL_VAR NAME="endat" --></i> of <i><!-- TMPL_VAR NAME="numrecords" --></i> records.
+</p>
+
+<p class="center">
+    <!-- Row of numbers corresponding to search result pages -->
+    <!-- TMPL_IF NAME="displayprev" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME='prevstartfrom' --><!-- TMPL_LOOP NAME='FORMINPUTS' -->&amp;<!-- TMPL_VAR NAME='field' -->=<!-- TMPL_VAR NAME='value' ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="numbers" -->
+	<!-- TMPL_IF NAME="highlight" -->
+		<span class="smallnumberactive"><!--TMPL_VAR name="number" --></span>&nbsp;
+	<!-- TMPL_ELSE -->
+		<a class="smallnumber" href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">
+			<!--TMPL_VAR name="number" -->
+		</a>&nbsp;
+	<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_IF NAME="displaynext" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+</p>
+
+<!-- TMPL_ELSE -->
+<p class="center">	Sorry, there were no results </p>
+<!-- /TMPL_IF -->
+
+<p class="center">
+	Try another <a href="/cgi-bin/koha/opac-search.pl">search</a>
+</p>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
new file mode 100644
index 0000000000..cb350e710e
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
@@ -0,0 +1,99 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac-user.css">
+<div id="mainbloc">
+<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+	<div id="bloc20">
+		<h2>Are our records correct ?</h2>
+		<p>Library Card: <!-- TMPL_VAR NAME="cardnumber" --> </p>
+		<p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="title" -->) </p>
+		<p><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></p
+		<p><!-- TMPL_VAR NAME="phone" --> (hm)</p>
+		<p><!-- TMPL_VAR NAME="faxnumber" --> (wk)</p>
+		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
+		<p>Something new : <a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Update Record</a></p>
+	</div>
+	<!-- TMPL_IF NAME="amountoverfive" -->
+	<div id="bloc20">
+		<h2>You have outstanding charges and fines of <!-- TMPL_VAR NAME="amountoutstanding" --></b>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">View Accounts</a>
+	</div>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF NAME="amountoverzero" -->
+	<div id="bloc20">
+		<h2>You have outstanding charges and fines of <!-- TMPL_VAR NAME="amountoutstanding" --></h2>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">View Accounts</a>
+	</div>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF NAME"amountlessthanzero" -->
+	<div id="bloc20">
+		<p>You have a credit of <!-- TMPL_VAR NAME="amountoutstanding" --></p>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">View Accounts</a>
+	</div>
+	<!-- /TMPL_IF -->
+
+<!-- /TMPL_LOOP -->
+
+<!-- TMPL_IF NAME="waiting_count" -->
+<div id="bloc60">
+	<h2>You have reserved items waiting:</h2>
+	<ul>
+		<!-- TMPL_LOOP NAME="WAITING" -->
+			<li><!-- TMPL_VAR NAME="btitle" -->, pick up at: <b><!-- TMPL_VAR NAME="branch" --></b></li>
+		<!-- /TMPL_LOOP -->
+	</ul>
+</div>
+<!-- /TMPL_IF -->
+
+<div id="bloc60">
+	<!-- TMPL_IF NAME="issues_count" -->
+		You have <b><!-- TMPL_VAR NAME="issues_count" --></b> items currently issued.<br>
+		<table cellspacing=0 >
+			<tr>
+				<th>Title</th>
+				<th>Author</th>
+				<th>Due date</th>
+				<th>Itemtype</th>
+				<th>Charges</th>
+				<th>Current Loan</th>
+			</TR>
+			<!-- TMPL_LOOP NAME="ISSUES" -->
+				<TR>
+					<TD><!-- TMPL_VAR NAME="title" --></TD>
+					<TD><!-- TMPL_VAR NAME="author" --></TD>
+					<TD><!-- TMPL_VAR NAME="date_due" --></TD>
+					<TD><!-- TMPL_VAR NAME="itemtype" --></TD>
+					<TD><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
+					<TD><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
+				</TR>
+			<!-- /TMPL_LOOP -->
+		</table>
+	<!-- TMPL_ELSE -->
+		<h2>You have no items on issue.</h2>
+	<!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_IF NAME="reserves_count" -->
+<div id="bloc60">
+	<h2>You have <b><!-- TMPL_VAR NAME="reserves_count" --></b> items currently reserved.</h2>
+	<table cellspacing=0 align="center">
+		<Tr>
+			<th>Title</th>
+			<th>Author</th>
+			<th>Reserve date</th>
+		</TR>
+		<!-- TMPL_LOOP NAME="RESERVES" -->
+			<TR VALIGN=TOP>
+			<TD><!-- TMPL_VAR NAME="btitle" --></TD>
+			<TD><!-- TMPL_VAR NAME="author" --></TD>
+			<TD><!-- TMPL_VAR NAME="reservedate" --></TD>
+			</TR>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<br/>
+</div>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl
new file mode 100644
index 0000000000..61f1b2173d
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl
@@ -0,0 +1,22 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+<div id="mainbloc">
+<h2>Member informations change</h2>
+<p><i>Please, change what's needed. An email will be sent to the library.<br />
+Your changes won't appear until the library has validated them.</i></p>
+
+<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+<form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
+	<p>Surname: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='surname' -->"  NAME="surname"></p>
+	<p>Title: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='title' -->"  NAME="title"></p>
+	<p>Firstname: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='firstname' -->"  NAME="firstname"></p>
+	<p>Street address: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='streetaddress' -->"  NAME="streetaddress"></p>
+	<p>City: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='city' -->"  NAME="city"></p>
+	<p>Home phone: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='phone' -->"  NAME="phone"></p>
+	<p>Work/Fax phone: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='faxnumber' -->"  NAME="faxnumber"></p>
+	<p>Email: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='emailaddress' -->"  NAME="emailaddress"></p>
+	<p><input type="submit" value="Submit" class="button" /></p>
+</form>
+</div>
+<!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/subject.tmpl b/koha-tmpl/opac-tmpl/css/en/subject.tmpl
new file mode 100644
index 0000000000..5f69922036
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/subject.tmpl
@@ -0,0 +1,42 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+<center>
+
+<table border=0 cellspacing=0 cellpadding=2>
+<tr bgcolor=#99cccc background=<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif>
+<th>Subject</th></tr>
+<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+  <tr>
+  <td><a href=./dosearch.pl?&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=URL -->><!-- TMPL_VAR NAME=subject --></a></td>
+  </tr>
+<!-- /TMPL_LOOP -->
+<tr bgcolor=#99cccc background=<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif><td colspan=4>
+&nbsp;</td></tr>
+</table>
+<br>
+Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
+<br>
+    <!-- TMPL_IF NAME="displayprev" -->
+	<a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif border=0></a>
+    <!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="numbers" -->
+	<!-- TMPL_IF NAME="highlight" -->
+	    <img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif> 
+	<!-- TMPL_ELSE -->
+	    <a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0></a> 
+	<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_IF NAME="displaynext" -->
+	<a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif border=0></a>
+    <!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+    <!-- /TMPL_IF -->
+
+
+<hr>
+
+
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/images/front-arrow.gif b/koha-tmpl/opac-tmpl/css/fr/images/front-arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8496171333b1aa98da37b5bbcaac42b27a1d5411
GIT binary patch
literal 294
zcmZ?wbhEHblx7fPIP#w%-8kJ<#Z6gQg`Z!5nT1tSRzb|vhC@h%jhjc-FGMXRhhJTb
zTSiX1sz$%N=fHsj%<Sx<Vq(gwDuzaejEsy7gn;5t7N8=21|5(>kev>!ixVcRoJ*dU
zv1%5lAVY!9VJ0U<&&Au`%eaWPIBxX%m;^L-lY&_Jx|t%Hjv*49Ax%sRWs1&!NY?JS
z)As05;H)JA8<sw=vho!YyQLxfA=>P*TOgw_vnV^8Ri-+psChz{w!3}0--P5U52hI3
zuHs;?IF+m!)dnqnojOaF8qN}Jm{-Ec$|AzU)v(GohsSYF(GvT%jJYhrEp7eN__?^Z
L?>w!h$Y2cs4tq^u

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/css/fr/images/front-background-med.gif b/koha-tmpl/opac-tmpl/css/fr/images/front-background-med.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ac89693382b1b8e390246125e69e39f2a0529750
GIT binary patch
literal 10810
zcmV-AD#g`DNk%w1VKxD{0fYbm>E-G4@$~QP@88_t`1bhD%+CG%{rvm<`uX~`w6#x6
zQFLd7dU}x*794<%o`#~UA22lzgNp-|mjsQE1Y%^sz`+0i|Nj2|00030|NsC0|NsC0
z|NsC0|NsC0|NsC0A^8LW0018VEC2ui05$=*0RRR5;3tk`X`X1Ru59bRa4gSsZQppV
z?|kq7ED3N(EE<o<q)Rf1I3tv(bUKAbCKHKJ$?bZ-;2IVxg+LnUG-l0iW6}+?^ct?)
z?|2@Qd`7$ffPrmjauis3h>41Kdr@kFkdcCfQHP6{n3*|EQD>5CX=V@#q@|_`qJENS
zl@pq;u(2eZo{)s33l0wn2?YfMzybmQ!~g@nzPt_$3#5IM4VALf)OWNE(4!0vy#oOP
z1Qr$-;^pS&<_HAD1-uN-*ntpH)%Es85>T~&aS98&0|X!-hpwQ(gXIngXqTYbzCrWu
zNt|dy0)>ZdMlI+T4xz`72-mf9pg<KwLlpi~syvbJVmvnxawQnh5v0wV21Sy@7zgFb
zpAsiH0yN4&0RcFZDm92eK!SHKLCtdov}!D&7%>z*ieRbNujUpeK=o&;)w7GRMtuW;
zK>+|=!OE4ZuptCDaU!7IYX@st1rG+qolAHwfv0x|`Q*zOiO{uL86*f$xN_wH1sEh|
z6S1*pAdm4Xa3I*S>B<NSEQlJ7>gU%tEN*5qy7cMWg#(O*Nns1@-!NPb0$kt#?&FmS
zJYc;TxN{T{FpdU*ygF*tFeCVW&OLOS+61kOpBv!8>}cD$!}iXZ!GQ4N<I63eKyiBY
zjPuQoTmZiO|6c*%Kvd1)w-<YFDE@F1fDF#%)NByAX5d-T!Sn!i4Q2?IZuPOzfL;?;
zg<wqYX=vhC7hvZh1tI=)(QpY2cH)dm4Y1mZEmAZhX*BleRR9dU6itrzROsOX1^B4s
zQV5ubBazcs6cq#xAhqO`I9-r{kSsz83wsSHXdISg-ju**=y{omk!!RyK$&pbq$QeN
zs+owC-zDH*oO~LzrH3Hei3gZS_G#!xe}WRIpkc77)dN-@DrrHw3ArevT;NGtl9P5y
z>42Qwhp7=@y65Ss=m6P9Z=)t5R7MX_hU%>42(ZAatsXJKYzo9k>#yPr(BT_(=K8~n
zpeP9JvKG+ip@hcnK!K18{$R)~u!(9VYP2;>>tU7GUb`F{#d0f#w{0dcX1L2Da4RU~
znj6Ebo3hKUu+Pdn!>-?PYHzq_k_)ZAEAY!kwg3L>0ImeLVDK9ZM4E881PmKt!z-}a
zK*SR#T)<`pVmv|wLW0|I!r8_vGRYn$P}9lw3SjZT4YQms%qI^3vdAN#t5pIx!#wUA
zm+EWt&q2d1GiNKm1cARvcl<HD4Nu@S&{4zeE@w2idNc%BXAQH?<jVVX*kTKvZ?tTJ
zop#ay46CxB4?q2O)I&GWwU>3HeYetbxB74ce*X<~qIzRW?;GkG9yJ1i3u=*vu{xf0
z0r7k&C<WiXY&p*U0YvVl&kT6}InIdht)9;dNPK$Gp_ff0n+jO_den(t+~UKv-=6l;
zYs~E&?{E5^b^=UKIQh-Sr;RVs6QWCa^LH;Cyn)g?AS3lrPyL4Kjj_3atlX#lE(XFk
z#=Gt1XPrCvXf3Wl@$IJ_JM_SD-X_%bi=AltXpvsw`WH2_eQ!O9*%<i<D7LL#?=ufW
z7z6M2zt`vw1M{2U-=3Ga#-Ph>8oV0<7(g|~SPc{p2%+IH7rbq)L;{-`p9=pLH%0N~
zf*G9Q->iqey?l^=Iux7t02q`6K45!6%vuc(D5484z;sE>8VQMI6&%tpif^kRP;53m
zEYh$;5ODrsJq*?W2YAtO@6wz~mWM(1ozZ`?O9{G^^~S#qQ6*$dVIBW=fi%MJ6>NOs
z9t~$bHA-ZTR~%&8SlGiNf?|M*EFc)g_zEX3Fp>>?m+tC;NK6{;0c<GRRT2nEPbN)^
z)wm!7kZ8&RCWckiuvrdU`8Ee`G8Qm=BrQJ)ia#O(T{7Gy1>-?PL>P>Y!hD+ni-`v|
z>M@yb10Doq0Zi9HGi%nnB_?vI6(C*{cQ&jf8_f94VLot8@#tMSmHA3d(5s8<{9T8b
z35IIM^KP2-r56llw|l;=koxR`x5~&$f1(Z>hD^jU6KT+--Ek56gJ(mP*iJ>*Yyo?k
zDE{ccsEFlBRHI2VKt2<Ju2q6GZ2&c<{`z@R_aRi2^#lbuTk5_NG9odvq^UzIdWVQU
zAfr0%*z@RFgkxGWs3!v+QHc;yZz8p06>AeEbrp}+JynWr3Mdc;TFR>?43ta+!wE64
zfOUBlb>WOD($0FywC=O2mt<?l0@lbctkkJ;{TJDW^o6mSG_N=V08a(FKfnfUiA&vq
zUkhqjb|F@)I?x|78{4r9OtK4OohfBIX3MGiV5JP*ti5ar*&F!PtfEa=N|kWe)WR&A
zr4>VBFzVWqfi<B<Xl-rh+Dj$OHm<t`*h`ZT(XIv;TL?{T4Q30}<1UMlF!ce;{yys5
za4}N3GT>%Tt83l6@U^J%FfMmzHMQ?DbqxwQ>Ue=Q0Ai9V9)DeLch5Nl-O6{qbp--9
z8E{{FEwcy%#cO|2C0P3YV7BTVFsg=1gcDL%!L(YYXZIypH$r$;h#i81HGAP-6*#{=
z@D@uu{Hy=|z+ektEQu#I)CtF6y5e22p-kKZdZ|;!5gx2!<MB)!&x*mHEv%1e^-vzr
ztE@xLv4L{{<0KPV$2pK}Xq|j0??smeex)*b-OB^}YPnM^G%pU0oZv6V=})-5!E}3U
zW=Wy>$}#|Ln?3br#m*Lrb3U_M)r`;>=XptmgmZA(H03{&=>o9T0g4U&J*g>n5C>dk
z^r8Bg)f_DE#*&Ux05s`h6=W9AnO>4oJDq|6hq_OXjWT*IeCj1-c+81mfB{+^CmP!z
z0-z8ut!Z>!99){!yY5kWu{(=cqc+$|s`Cv*>}O;*2zmIkfs~z%B?GKhwrf}bwaGL^
zZOWj@+rH9BrQIfAhdV=21#xy~d+c+Y2*@=6x4U~}>lt`?-X|(D4J2D;eE&z;Smv?6
zdj#z?2M3|L9(a7NZEy4zTH*2;_r78cT!_mj-P4SBcr9+CSMQt99M_P(=f&@kXK2_p
zkU%^fFl&=D2+gtmfV^G)ABM+ZrRJtNZYZslm?K!{|4BD2Wnlg=4g=jf@cwqLk1n5)
z4;q6HXS!(sE`y&-T|5PkZPBkT9-fDh2DpAh!ny9CdB#?<V<$UUJWg`-_FL`qf$|bo
z4tL~G9R@S6yJZj!3R3q>$a*)8ExWbqz@J8`G~ng}T5kBtINb#fW^?1`a`zW7d-9e6
z)uV6jaLgCx0Gy^UdMobvq_7<ZnJqnG9`CR|tDf@1ok7?ekoMOf#O9XoyzRYWt0gZ1
zr=Z@wN0JVM{kB{9AL;eJ5Gr}(gJfKrKRDx@pA-UUlJHu|IrYzR`lqLN`!`{I3udcg
z@S6kXiKn~yKSEltyMFy1>AvL=4u6k`p9S}>|2fb<gZ@ju-Tc;9X%m-iq*s6P2YJS(
ze+B_vVjyq|SP-`rb9wiG7SMazf_)=KffXosxu+FTw|-$JXev;08Ym73fO{{XUB_2{
zh=*+$z+X|*T)}mJEHGBhcP$r?gF3i_JSc;Pm36oFe!$X$J7@q#XaEP0ga>ehMo5G?
z*jNFm70aeeJ^~*)I1Wz8g9ea;M|c1T@P%JU0Ae_XVhDy`sDw?(gL368>UMM3kbxRP
z5LcLmJ!phU2!>=B0D8EG!XONL_=jW&hDn%)Pxw@5Mr<N5Z6`v9bl8PqD29C4hr>_|
zlvs(92#95f086-qSEy6n=65AfVJ5<ePH2aC{zw3NC=AAs3=Yr?r~nxdfeVuH3jv{r
z1aO9g=!4(Xf;NCtx_BDo5R9Z)gh=>^dq@lekN^+h5TEb~VImU)007`{i<{Vq4HagH
z_yLOsAWt}qTv&|ifQsL+imjLx&Df0nzzwyCi#upgiDm-^!vHG?jNbT-;3$sYa10Gm
z641~OrLX`18IZ163eNzGZ1E4#c#8;-hWDgYF((3<^^0;LjP-br;y4WLumJlp2w@_N
z3%~%|0Fojpk`Ay8%)kr)NeYip78~IW)X0evIY>0v0uy)}6={l)IF8Av8G(QXvIvqT
zIg&y-ltcNEAnA(ch(SgH4w?v)*90p5-WF#<h#bS{h!-gU$3PN*a0^Bmlp#r!U^$XT
zd6GiuiYCDs8vy{f$dJP1kT@`VwWkym$%r_aiU3dm%Lo}h=?^Apl3y8?MM;(@iIN`)
zkYcHlYY`?1pq2~CiMuqDEzndpDGpUxj2C&A@4yco`H{=enLtUBA?cZbd6Xhqm?tTa
zW9bly*(;36mY#%yaRzeqNSAe)k9NTiKk1cU>6yGal72awrdgPVDV)Q}j4;xgg&0Xf
z7g@TuccfUCs@M>ap%I_im)04Y*eRNSIhv<QoC4XM#_1sn5&&Q5n2H3ML7<3*QJG<A
zm#Q(HhWVNDxedJ;l=az{+gbjWq$!+)iJAe)3}i6~?opoR`9>EIfjR(umGPXGNdT(&
zo}w|9e`%j3*_jnep%+S_y9u1&>7V`yp!?A)0<nb2=|%UGjU>Qa>q(p8sFOG12L2$F
zylJ7KX`l32pEsJFU}==W*`FTzpUuD;3qTVKS)x&do;7%9bJ2}iXqh_cBrqzW8+x4=
zdZQV7r8+vFf$5z;+NHyiE&@=EXVh&ES!`<%UtrOQ2A~e^`K9O;pE6pV7CNU_nxR&T
zrTH0{9onV-c^(V^7X=zbCu(PB%6MKumtH82#sDgA0H>fiqZN9mbvmh$I-^=znn%f{
zeCnV4xG4lcqA^K5hyJ)@YhZM8*`$f8lWwXNQaY40N~e?>tCLEffXSnKx~T#QA(K(0
zp=vxq(sQI*MiW_zPD%`PMH>nbmaht{vf8YbI;A_Rskq9igYW=rX`~E<SfGdkW7TZv
zK$mPfiNDGj$vT?L>a6G*t9h!Q(mJh$NiF4xt^G5qJ76>3Y7TQrjNxhw<NBt`s-x)|
zuvjXZzbTft>aM6c8&6cEA+%{y#RE0@5pqa`Yl@1)U?amJnE!gNvHAeI@Ub2nvXpA2
zw5q4X>7xi6kYB0*<hg|!RBw<rl{e9(6`PML(k2qxszAxC9V@W2>Xq7wsXUsp9txo1
zDG-6$KG0XD{w6Sc_ez-*TeIx2vOo%!ehI0Q>aifZwIVCB=(?_@*{&%Ik}Hd}@@hP(
z)@AgU6#04qMi{QgK()52v5%UgKC87Kd!b%ir&(&UV(YF)`5k84t6Ah-C~5*C7MD<4
zhj7b=Z(5vm>zlONvs_!bTkEVPTd-tVoJ8BDFTt|BT0RFrrk}O8SyG1wV6nz<J{YvQ
z<|?Pninn-Ml3FXfmpihWYp_7txu}VfZ7@Cz%RR)$oZWP~sEYtD`W=vKnpTUoS30}3
zTe*9yw*%X^LYt|)TePhEL<exTp96$J_68q_uXR|l7yF_Zbh6AFr`Cy~SxdXr+qLjJ
zy?m?wo6(B0*(;D9QaasBxQ7*brCYopfvOJ5ugd$K>$|a%`n>RKxp_;!^$WB_8JxW9
z4?mijj}*GTgL20LcoNIFsAvqkfwRMTnxx6TJe#4=+rS`OyS59#kqWl^d9eA5!D2@M
zE_*v8B!J-yhX--Is*08$s<W<|os?Ul)BC~!Te1dA!}*)5v@rnvdppA`EwcH+TBr^e
zJ4FeCz$Q$@MvSgr8@(YLy$<}W5<J0Q+_@G!#4o|U-g`W;*TEh*z#x3F*^;cgo51W_
zqbbb7NIbuJ`@rdXsVDrmPYjSP6TFrKIW1IQ9{j^Sn7TG=F-7aT8~eu$Y`gK>z_b1v
z!T7nQPCTt`45Y)NAWir=%C}XKToC!XrpZgfC0w=tTBDQetV+zuW<0Voyq}5OrOdDy
zrIW*k6NMQE$#smyTu8|xycwnZohDqw)p^SS`^lcnzyoWenmf0M%)89cGE=-l9B9R2
zr_5Z4ycl`Py*sqriKFSd%koRe)?B^0E41B=tIw>m2NM9qTs=IzRc|<UMVPu5%cu>o
z&i{GB3S6Z=JID>Kp<rvPocqf_nmI1xzu|I#UAA-x!MK%78+)9oO)R<7Jf{mByO+Dm
z>YB!)OwlR%p{EQ0ajZ7cHUv)V5n4#lt1H9^jj4c%pB#(JvO3S%ytCXX(f%%7(diP-
zVsoO~Dt)xq(OEo>$C}TB$;Z-csoMO|4*j*dS<j<P(Kb9j{oFmtbp)3u$vTLH1&p!&
zI?D=O%SKGiTrIG68?@Jp)QSAe%n%O{FaTv8G}43w5xcnOY?}$h*9nc)aXQxwebROP
zv!M)}6kNf;JS^HX)Bh4MVrJ7ai?3M7g(2+Lt-HH3{JJGw(vkhplPkkRd(XU^P5=<t
zFw<?swQ&YPk>-00F=W~${L_-_yxI)et3B68Ez<b=%OIH;V8hfngQR1|d{TYb2K>1E
zDWzaM&9)rIt6j)ATB{-r+dpd6m^}~}eJZ2-&)`+6YVEc<{XAsl{>42C+*yjow(P#$
zUBB1~-dCN}!--R~ecql@#Tu3v4$xd{jm`tWLou<ukt@v;y5FFj-}>E~psA;>E8e(j
zw2b529Rr)75o@`<gYSLH-5Jf?DWAg~!+vbi6u#2EoZ<d$n3(P13G-oxi+Zt^QNqa9
z!;m|KiOIliseatz?n~T}E#Wba)M3r1ialEajx(CawDa;?Bks1yyVGyYpFVB16H244
zt<^|Q;b9)*Yn;@<yg#(<So7os3hK%^=!F;CAqOqw*{z*1+`bDesbfy&1iPbRS=otf
z!|Ed7hjLpY*aMe_XF90G$q3Td{or+*qqltDMXt#&F6LnV9k#wK)}8tQBq~&G?ggUw
zt%r@3=cC7SE7wenp?6KPkxkUzz29ma-Wm?fFIp{YzAV-@$6O$1a1P7Hz})kl-IUJI
zF7E2F-pMd5tJd4Z6r9`$o90lr>+EHAb_EJk7UvH7=;-yuLr#)ft?c;S=hU0hn{3yc
zp4To-=TdCwaZ*S*Zf~Z04p`pp=L6TZ?BaI{>&aftgq+e3Fz~tT>=13TXYS1yOnU?2
zF{AzkHA&si)8K-svp@~2dtTRLtP5q_!YT~U&AOq0e(RSVUe-P<1mI|i4g@xHgIFE_
z0FWqp9M^rUq2!L~J?p{&KkzL~@MYZb9N*P=y6OHs`o!P729p8rWHLll-hk|F>N?HE
zG5XsiJ?={^)aTyuJn!>d+qFO+&$9~X37^046#z<)B`RMBS@x~wyF?o!>A~IaneM_{
zul4fl^90ZFbszLwFZA0z@)JF_8kubZaPpo4-TF0Kt_;gq$=oPj^OgGIb}z_v|MPk8
z^<K~SnorbWS?o1D_+%y1XYV6XXmEsuL2>o+F;5$(UBtq@?DAase9!fGPy4m6_ge4w
zHX5yhKDHf_UWPv@L-f=eoqcQ{!aT&-DsJuoKfiZB`Fk(>c<=E)ulGT3r}dn(HO!N3
z6#R$cuwhjPz>cp5fQoLtF{^&zL9Ow$oBsK>U;FTX`F$V%^RM}l58ks(v}Egc-ft+V
zWCtKXHCU5aCwd)(06-X~EDST#H|;o#-upi=_;3t~!w2$+G%k-sBNN(8I;+g(6Uf8i
zY_kP8EFP0*3YY?5xS-nZH#{z%)9V(%83UPo`u;y)px_{3V8lqt+XX^^z`#gM4cDX&
zPtZ?MrjApOmD1-G6{slH6KT|^RnOMWq!-OsnXFA-+L|41uI{eI10+RZu<&r;1f+x8
zg-QTG0u08h&CO10<z-gqrjL?oDe0-`m6Ui@c{%oK>m+Q=tUDM(tr{C|z5VV$-X1Z3
zzu?3R3=EPPU<AOyvoGs%Sh|J@{#`a~-oQ0M6)p)mi`_;+thB`yyIAkU(2#fQ9?Fz(
z3?L){%pXjD5&|v=(B?uxW(#0I=)$EMwM(i@5j7X;8&ZrHr%cSql#?}e3l)weQxeTQ
zm0GnH2nZo2*nSky47iyS4^K(ba8PULP*c&Osglm6tJKpbP24I%4f@fiT9H*}1XLj4
z<krOXc9Mt?_OY<BB+8~RK!91{g=|>?QMEVjUb~|C9!-_kBF7(^Z%`c^=4y<rif89a
z5Rifd$hrqb;Ax^Vqen2P{^aa13n#pzmyh1)9Lu?mmi~f-=lToH!}Mr#mlGgQ1IN3^
z|2ahB_X(Vg3M5?3%5Ap(Ov<}$WN!bd6i;`@6-hTWq;*x*00{#DAl4m%ZTJGiOXN8S
z5DWtW7l1Rvu|o-bLd6GKe)ri&&S#`e0fiP)RTtP`1H#~df!igRU_LzY;UJBL5m4D>
zEj0jGamH;Z7iy(>IOK>TYJ`Ok@2%6CYw<vm00IZT$Xx&oz|cU0G>#{MWNA!jr5>zd
zn4wVmX=56Z9~uQ6M-`PwU3G%J6VEdR5a8mJ+}XyHmRd^IKmijnrht3zbw(6@bt#(W
zeI1fmB%-TmM%;C<0eS$Qc`7CVW8w8lqj`y>ms2evVR&4k`N_qohpMu9WM5IW^`D$`
z7B&E;nQE%lf*Af}`RQ)PtO%R{rMlOa5ZVCw6stqRsvKYaNjhm@?Tn;iY-{McD@rkv
zFe9+zK?n^3qcTF1shjzD=#kGh+bE>?aibctwAMNcwk%4?ZAu7q`fIqlbqRpE0ib&<
znLu{P?7OYT8zOXXnt0*8?$8MXl>72~PXfPy8}M$DK@g|~>IDFaG;2*`=vxpo+^}6o
zf#}pFaB`s#iWV~v5TFPsv+c&Zc<U+1<e7)TZ#Z3sGR5lzm2AW=!%QT9ZH|~uy^~hD
z03@~m9ds@Tfaz<|4-#1LGdG`_u(Ht#IW^p+bY#tHvE+=e0>==bE!ZgSsmI4<LpH7g
z<(i!Kh5id6`%v3V)fabj4}&JHe@X&YaT%5-V1UMb<5KLE01N(@$O9;2SpbNqyE5Bt
zr#cbjYKj(V<<v51G1p`r(7ESy9MBTkqmw5Y(x+dhdg47kt!!MOyd68dc+qRQy#nST
z(B41yzDrkEiYI)q1R9_Eim<$*?r~<C1HH4OxcR2-c3->ml?Cjs{q~=OCp!3G5xxfM
zkS7Vnt&4f*fF1j0C$EU1!%*(QoK>#3fO+6Ae{{Hj1AdX4{*9+}hl^0tinF|AE$ev+
z49!w#m!w(IsvXwS8F(HLC1sS%f_3N^Prk=Nfn6y99~1~{aJDvfap*41D&pj5W~3k}
z{%K-jav|;*69ZiRjD|Lp1L$0`L!*f=Cj<)N5U<gn10JzWs{%*6DCZw1sttl;s6jw5
z;D8xg@rrRc00T6*MRD2400%f32v>(bSw#d|k7JG!n<tS-sga4ZV&ed<^FmqF;297Y
zfX}LE$2j2dTYDTHPwck>l(m95J!;*V&e*CA%?BfoqR%30#zJaM5_fT&qqZuzNfZo?
zf1ivA@f=VP0vt?`KN;aR9-<%nD4>}<kRAz{hpNg!@^ZJ!+{LDNzdG&`1p$zvFMkOW
zVa0#|2S7kEai+4xwXT)-*%>0936WT#qmhoJ8$<pBMFHjRJapt{H+umIqKR|<H(mh%
z0tirxQmREW$aEbm*JqbJKBEB(7^5_&>5%E<6Ovx|Xf5BkfH*Ed0C&=4Ku^%U#uOBk
z=OKVX(ZEoZt!!~`nOvhFais+yN2926U^Ufdt&qMkn<M)tKsSjN2DOxn!!hTeeDWHn
zO-DnA(o1vV_zVTi&8I;9NHrd4KJ(2fn<YTNHos;;mRK@yO%00#x`s(GK|mcs6k!3c
zs><eE?-`NsYQ5<8$U;5wqi)0&_Wqet6#T6LZhdQ5{*-_NJm5+*9UuYIr&oz4MITZO
z(=}L@wOJCDV)83%KVuL8q%PJ11-M=~A?ptjL<j*D0^(Tj$`HYd5mEk&q6=dnkN}GA
zv_#YdD_#qAKEV*xI&oA$0nn;Rwf1hQzS^K{bu$yPuqTiWrRipTno6wNrBew20CCYk
zrmBwCW~G(i-HJL=OD4daRZQv?e+P+uWH(rn6#&z|o4l{0N?N}~3Yc~TfC2ms4LlWW
zK1*A-YPpdl^Ysl{bE(Tsc9Nj|6&T6{P?*btcee#jCba01!QlX4!3pTAMH|vY>b*Bz
zr==t;bShkPYM2ew?b}L&_u<`aR}bDIRBkaFUK5M=z^5ooi(6cP)W+b!$dxciBKgAR
zjv;UKB>+-4d`0WxX2>o@T5zReN~#i)gsntP5^7O^768Bz4gMwpq5R@ru>$D3sO{^>
zz?`f529yB(<gb}S)-~V-(S>Zzt5x?JB=feI&I5R@UmE}cD`VMI@U3tpwF=$Ua_+uA
z1{($ks>4JN&MUV~Sv1((=9|6_xR$N60CFwm^x`=OK@}vWUK1b-*TBnLwUcyBozlj}
zmesSp5^=eTA|=<<*AI1bX-Y%flC~h%-fo7md4l8#cR`Y$&YVINpw$LA002BTHGVDV
zt?N2_OGj&_dOdxtSx3{IM!A)@11^9748Q^FhCrUPTrEF0*Uu2psU8v#fOji9pw>ln
zy|v3T@RYluYeOaDIExeq=wr^f7I+J$3~^15JIk>S{ty%wuI`mD0NK0ialG@#skUa^
zL9~rQdj$MwtZ7s}uL}iu&MWXne4D|2757?RE|Pr;8x}M7YYfhdfDFU?)IlS_idouo
z@{CKT(uS`?IRo-SF6s(nV?e+g5rDbRUDr;>I-XlDRgg*&2Uo|sa0dY9DB)bp7Q8^O
zu!P;QYxhrGYxMc>DqiG-C{aj=_5k8OaJtt$<uAs20~#QM62n8w#m*bVdGdhF55Dk*
zw_t;t&G>#ufSdyrQ{N>IX{)~M6#7Vjx0%j)&JWzh;m$O|r|JqY%slmIIPb)H?0T;U
z4bu#I?CjyHRST(;s!YCiL>y(LIQKB_!>9ZHW$NzY3*((92yZ6*|K9#hLw~h|?|RPj
zcX8}zKP*SvYM+&uUw|LGkP!ln%>razuAN`>!BqOq-GUXs0~}xbRUqIkKmrUv^r6+D
z;UD$!3jj!wWA&ed)ZPo|801k~6HVTDHHG7N#heM>@Hrq2K49H3n3Gsw`-z?d6u<xg
zz}%VB0i+fF)zB{OT<DOXpQPS$?c44t({m`rQGka7EZ_{*AQnELw_RERIKTol)5C?H
zrX`;PWMG{IAqSS42fkkZR7pk2o)Y@QxB#HtP+MRXU3?f|v^)R;YT)JtVFS|O)(s*J
z5}&SBTDR3%r3K;O4WSyYVgB_FOX&U-9L6C(<i=Q_;KF5=X!X`1xs53Np4?rbAP%A_
z5+Y1Z90Q`C18&{TJt8E2Ais1Hy;))j&Y^_}9r~;t6pCDFND<tf9~Pb>S{36tol`Mx
z-QW>p8gkC`!P{a{NE}fB|Jfo~NC20Rz*eo<(4kUt)Q8NN#(ot5=MCdB4&o5*jyiHq
zIy#~=zT-Q_BB9A5w=@{WStF52Km=?brHly+o{145P$)h_6#`-nGGjBsqe8-?JQg86
z?utEDBR*aump~k$=$5)XAuHvDip>Rajf_E-B06&5D=s7~HlznGmh}P7ME1!9>?6eK
z8|%ml+o(}MCI!-^&E_5CDgL&jNuJI#qGW5S)b)5+OXlMTOu)|#2S&~$0p_8|Erlo$
z7ocPzG5RD!qGT-A&_nLZN*d)+=A#K>oyR%NQ;L!7P=N#qo=Cc4I{u_q7U58$z*nwX
zSZ+z}EhRKWo>R8ds(j*dgdNhDR4evmNjhU(c3sIt;uQrMSl*>}eE>GXq+bnKc<~z%
zIgBVsQJ|fpDY|1kCZ@7=Wza~YB~>D1(jGQeq+gZZI(4Fk$cK{&B>9nrXS(HK1|=kN
zC24XC0es#YrY4Q##%k)LUaH{t#bzf&rH4EhLVf02Dx_#GW^eL~0KC}Bp{8&W1946!
z1!z@Iq@6}mo(b7U{(7YWI!0$!HY8UX;anCR1!Bo|_DOLXr%uHfP1#fdp2osN&NrMV
zCXu9cuHjtTK>@%M=xOJCUgBg%z&`qw-t889VOx0;NqUWpdLm{@7U&!xz?6Y!a4zU@
zO6F=h=u*a*to0jC!OVqD)?w}@hr$7c9N)uLlwFD_k&$SF_LU5X5CQ51oHdMKvfF@e
zXpE-E0MHNCh2Cl6=%>`DgFa}`nWbN%P}~??MHz;M66lfsCIzCwecq^(l1Fixs3u-!
z!hEBZ!i}gEz)3<QhaNz|)hOU`m5xc|m_9~#Mu0v_X}(D)?^R9gBtUIi)-%Sa08HTa
zkw8x%!JX#*X}FYWl-_54?%n}aXqpfzuR)jV6=(u*jq@QK72MW6LMnZhXat;Swe{8*
z&F0i#X+@RPXm*n_$f=Uz9akj*q52gynrgs6se_8zOr|ME_Gbb;9lIR{-)s`+I0DJ-
z;HG^8CE}^CMkcEIX(ZHCW?G(T5Nf7AfVaY`C9NJ#*pLb!0E0d2{N<{&CSkP}4Y2-S
zj13^v0A{x~43+6Y4+g*ic#Z)y0)w$%rimT{Bn6#9fP%g&TwSZGBG*kZC*%-nxW=af
zKwov{!UZq`4t^;Kh~7nY7L#h4m@4e4UMqM`Lu{^3d3r0jA_2=X3dx0P&1IeebjKgL
zSPuT~Ai>5A>V+Nz@af`_EU<KEgJNr4>E~6s>S(;|(zfgpaIEM(fDZ~lxuC=WI6?s=
zfERM?l_1>ntU?(2>;$Z)(88;Z_9?a|T)jGuU9ha%x@_CRt<&l%6^xYgIat9afDg79
z-6d2)(OnB%S^^O2*4}MJC12j+WDkI<7*YVxVq@8sO}xhBgod2biUQNht+!?_DZFhG
z!~>n`Ec_|o3xT2GRus$eRCBCC-h?5-M!?uYZsfviiT3GI_QbUrUGHIT=YFf)!fm*I
zVd&~0@j~nSsc!F{!YYhZ*#7L}2JP%ds-&jsK;bTh?(T9(tmXo5%W`h_jw%(zgZ}BB
zt_Aw+@jlb`dM}ccMDr?ugBEA>j!u2r?m!_~$_8mtXfLB|?%e*a)4uEuFkk!)aQwjo
zM}qG+crWWd90NP<^TsduOfPMPp0p|F<?`;!@^An8FWvsH2XimosxQ-yFz?2U4%n?2
zy6^KsF9d^3yiTyDWr%?p>wRSI+mbK>=WhvzFbMyy{&KM5#;h13T$GY+3-`|pBLcy$
z?V2)&=jO2gk}&`3?+^cQ6vGS=z|#;rF#H}d5}$39iog&*SOH$J1}AR@L$UhOg%s!T
z89PhQvfTUDrx$b3{D!d@Y8n|gj-Yyo2zM|Cdu|%{?;2w<<NB-v!>$q6{_zgIaM)VZ
z!@f%)1Mw3B@(EqU4#Y78IPVHG@+ZYBWm2#*EfcG}G3QS5C3jUEYg!_Au_u4B1aEQ*
zlSzs}Pa&gnnrIXX4{;H@@+<Gr9Y^USH>v^I>m@@^SFI51=CR1mu`mBJEKhIqiE<&m
z(lJ9$GS^Nit@7(Sv+P21OO+|werF!%*^d;-HN&hu)y_gp^B6{HCxi1_1#_wn^B(hY
zI#bO$<5M-MTk~>qJj=6efwDUvZOH9aK6^t?Nlc-bE&~&BFE6q{540mQGgtZ6nj|zP
z?=y`}f<ODL9QP?5PxO$9Gdy$i9s_9;pU^^w)~^ZgCO@<adov6ElQcz7Z#`SIJZ<D2
zBC}^m2ZXtTKf5l%wem>YG^^2b1h})ueq$0{Fd|9eK9g1ueY8x&b3h}tvzatJ%W@uX
z+Ci_0F~>}FIQ0tA7)*b4QN#26YW3JDbv-|_9><dUh)8Jg2P#0+MyW#pf3&8t+)UGS
zO}lkcgYr_#HOm!jH9s{vyGqp16GQj)Ftc1Dukbe$_Uys+VI%gYDK<v^^j$ahIP{bn
zxka%}_9iPpWm`68$Km`It%)M`80Hz0;4^6h=_|GLC46B)n{QwXc5CCKIHRqJGPQ3b
zFGl4dc|t{Uht~Kq^K7s7YX^5rzBX2;s&Nl-GtIzhG!o$DF!x5Dwru;hbhkBi-{or)
zcWjUM5TEY>&&6}J0{pRed#m<!Pv$e9cUY!3pJMfQ(l;~5GyxAd7<x5yL$`phwq;AS
zey1jXt2cHV_<>J2g;#ihZ!!gNaYRpdgF9(@!#3;|cT8J2iBot?Bdmgd_+@wan5y`-
zhPa7Rz)=5niG%cstG0soH-4Kpi<7L21MPLgbB1TQY8Ux;%J`6HI9n69i|2QbE3Avh
z?)wHgl~?(cH#yl3_LG+_mZPdZez}f^d6#qemdo>)WBGzlx0aVVG@rSfuQ{7*NeBP{
EJKO_pP5=M^

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/css/fr/images/front-background-small.gif b/koha-tmpl/opac-tmpl/css/fr/images/front-background-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..31add9c944e1cf0c1b8fcb84e4b1143c323a13f6
GIT binary patch
literal 1426
zcmV;D1#S9ANk%w1VN3vS0E7Sl4ugvXVq^r3j}#Uh0000VFf~t1Q3I8i&dkpL|NrUb
z>F@0C^zrom{{DcDp7{3o{QLa1w6*&A`i7#bbZ3P9{QckD-+FqH|NsC0|NsC0|NsC0
z|NsC0|NsC0|NsC0A^sIZa%Ew3Wn>_CX>@2HRA^-&M@dak03rDV0SW*g04x9i002w?
zZU6uU{@^E$WNDsg`T;>32x=_PbO{VZJ`{#g;JH9;NK_qi1w>-WY$g<j9IQyK1qcI$
zbGu#Ss^HYsz%6qbghF`z5v0v<Zj@ccHR5<Df<PZ09eIIG4SanvSAvO6g@!0^ijZE7
zCj@|ymlKSW9|T&Lp9Dgi1P`C437UNbr>6)5jjODusbK^VvZoTXR0IpSth+=65x=Y!
zuV6gIvcWR~1Iw}$qD8UMz`PRI%tZy3+ou!&e%9cp$Ta2Vrp+b=#Ov7U@v;t6G3xY}
z3)CqBWcuW($QKY&yAJ^-6cp%aAwv@ZlsGh{CI!KXf(#r$5fP&)dksB)iqLO_0C*z)
zAt5L!;$liX7Fhm!c}W3FXfz?kG~qI*nVlp$`b@O4M9-mIB8($}6KNm{_Yit=n#X`q
zs)EpoXo@wCCZS!uk~kW6i6*jTwNfY>=K-|>zSx?Ha1U+RiY?{B(F9O07e)Xi`rU$#
z>tH4m>K-OMcCnMQj+<!h>lma604NhRXixz{h0S*yew|td^yUf@7+7#nKnDd23?PKo
zr)j|KEv73xSU|z`h2Iw_L`lP-0==RmT!OB^U=INUz#TXM9-M;p914t^OGR+`gFOR&
zOCK+tdUXmHa!9znj63el5)|YRPrg2N>-c*kV2_LBRVSN0U;zQ>T~ObF)BXOIAASV#
z_YfxlHt-#R(bYG>1P)-B;CTx^=b$NC<;4Vi1DZFTbQoS}pMncscfp5{P_WT|OK>J%
zfz%<Gp@!z=XTWu(;IfM~n=!zHbtdYFVUI1MM*xh1AV*^Z5DbW9jt1(uA#hDnFhFLY
zgj6H}=4E-JmgRBT<&&)7MPmh4=7{EjOtxstEEd%$!H-y;S)P_Xa%i0aU@8(~V+l0i
z#g*d8IbMngs@bApiL`@L12;NqA&NU@=xLfP=4TfdhX$oZ1r8MG=Ybcd*s7~MhKeMc
z2E`x%AP|s=9;-XP3TdmHZfGZzWmw=Q3eY@2W`(f&>a4GzE|?y%fBwy|in5Ms*z2>;
zMvLFHid?`FB?;(Kp{LDqt0Jdda%cdxkI|4Uh4cZd?yJ3?D5;mE<#A9@5ny}nw)d*I
zZh{?Z7l<oE3}7yf<Q42Hc?RzLZl%IJeD1RbY)Wyvv&tsOza|WTEyU<<n**I?b{GM?
zOR!eN0Z{}uu)!CSS;@!uomW5sn+1|<74u!GWhM&@*zuOKrdNQ-fsl+WbecL_fCURI
z&>D+2BiUO7pN$+95eE#wCw&$!X}|&uFd*M^3jT&e0S|x{NCD#xQS`tB6VNsT4?Ms?
z1Ucwn!2_QKorjlfxM8!IDEit9;15V(IRuqUkhtP`5Z(t4`e;WiIp7j_wz+9AC$L8!
z2LQ0_&Gr(2z~!ggEr{oalpP-AkxOoYXSRp?MI)`h{wTq%KDW7{&q+=874;U}8s~8|
zkRAa!Zz4kL1BCbJy%A*62^>)5K*5DOXg@;n(LWphtF2*yo^XX1fG^%Ns{cXp-@p3)
zh2aZetN!=C|9J@j`P1M2Za@J}x$l1xLtg<9sK63%&l|mqAh5_|fB{gjf+lEP2Sryf
zPf^DQ2KXQdL&&`We5!;SLZJ#*h=SJLz<a&x6nVTffB?*phAB9J4S%qM^S$Z<9qe8T
gg$P7H2yuu+>>l0#fIucTu?kPjVivDBf)D@zJB&+(&;S4c

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
new file mode 100644
index 0000000000..c18217f17d
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
@@ -0,0 +1,14 @@
+<div id="bottombloc">
+<!-- TMPL_IF NAME="loggedinusername" -->
+	<p>
+		Connecté en tant que <b><!-- TMPL_VAR NAME="loggedinusername" --></b> <a href="/cgi-bin/koha/opac-user.pl">Accueil lecteur</a>
+		|| <a href=/cgi-bin/koha/opac-main.pl?logout.x=1>Déconnecter</a>
+	</p>
+<!-- TMPL_ELSE -->
+	<p>
+		<a href="/cgi-bin/koha/opac-user.pl">S'identifier</a> à Koha
+	</p>
+<!-- /TMPL_IF -->
+</div>
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
new file mode 100644
index 0000000000..d599e0ab5a
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
+	<title><!--TMPL_VAR name="LibraryName"--></title>
+</head>
+<body>
+	<!-- MENUS -->
+	<div id="menuline">
+		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" />
+		<span class="LibraryName"><!--TMPL_VAR name="LibraryName"--></span>
+		<span class="spacer">&nbsp;</span>
+		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Page d'accueil">Accueil</a>
+		<span class="spacer">&nbsp;</span>
+		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Recherche avancée">Recherche avancée</a>
+		<span class="spacer">&nbsp;</span>
+		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Accueil lecteur" >Lecteurs</a>
+	</div>
+	<!-- MAIN BODY OF PAGE -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac.css b/koha-tmpl/opac-tmpl/css/fr/includes/opac.css
new file mode 100644
index 0000000000..4d74cd5fe4
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac.css
@@ -0,0 +1,276 @@
+body {
+	background-color:#009999;
+	font-family:verdana,arial,helvetica;
+	font-size:12pt;
+	margin:0px;
+	padding:0px
+}
+
+/* base tags */
+a {
+	background-color: #ACE6E6;
+	text-decoration:none;
+	color:#000000;
+}
+
+a.transparent {
+	background-color: transparent;
+	text-decoration:none;
+	color:#000000;
+}
+
+a:hover {
+	background-color: #FF6600;
+	text-decoration:none;
+	color:#000000;
+}
+
+label {
+	float:left;
+	width: 10em;
+}
+
+img {
+	border-width:0px;
+	text-align:left;
+}
+
+
+h1 {
+	color:#FFD9BF;
+	background-color:#FF6600;
+	font-weight:bold;
+	font-size: 150%;
+	text-align:center;
+	padding: 2px;
+	border: 4px inset #FFD9BF;
+	width:60%;
+}
+
+/* style for library name, on top of menu (defined in LibraryName systempref) */
+.LibraryName {
+	color:#FFD9BF;
+	background-color:transparent;
+	font-weight:bold;
+	font-size: 150%;
+	text-align:center;
+	vertical-align:top;
+	padding: 2px;
+	border: 4px inset #FF6600;
+	width:75%;
+}
+
+h2 {
+	color:#FFD9BF;
+	background-color:#FF6600;
+	font-weight:bold;
+	font-size: 125%;
+}
+
+p {
+	padding-left:10pt;
+	padding-bottom:0pt;
+	margin:0pt;
+}
+p.center {
+	padding-left:10pt;
+	padding-bottom:0pt;
+	margin:0pt;
+	text-align:center;
+}
+p.copyright {
+	border-top: 1px solid #000000;
+	margin-top:10px;
+	text-align:center;
+}
+
+/* TABLES */
+table {
+	border:1px solid #000000;
+	border-collapse:collapse;
+	width:90%;
+}
+/* header */
+th {
+	background-color: #99cccc;
+	background-image: url(/opac-tmpl/css/en/images/background-opac.gif);
+	font-weight:bold;
+	text-align:center;
+	font-size:10pt;
+	border-left:1px solid #000000;
+	border-bottom:1px solid #000000;
+	border-top:1px solid #000000;
+	padding:5px;
+}
+/* standard cell */
+td {
+	font-size:10pt;
+	border-left:1px solid #000000;
+}
+
+/* hilighted cell */
+td.hilighted {
+	font-size:10pt;
+	border-left:1px solid #000000;
+	background-color:#ffffcc;
+}
+
+/* FORMS */
+/* class used in form buttons */
+.button {
+	text-align: center;
+	padding: 2px 2px;
+	border-style: solid;
+	border-width: 1px;
+	border-color: black;
+	text-decoration: none;
+	color: black;
+	line-height:175%;
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	background-color:#FFD9BF;
+}
+
+.button:hover {
+	text-align: center;
+	padding: 2px 2px;
+	border-style: solid;
+	border-width: 1px;
+	border-color: black;
+	text-decoration: none;
+	color: black;
+	line-height:175%;
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	background-color:#FF6600;
+}
+
+input {
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#009999;
+}
+
+input:hover {
+	border:0px;
+	border-bottom:1px solid #000000;
+	background-color:#FF6600;
+}
+
+select {
+	background-color: #ACE6E6;
+	text-decoration:none;
+	color:#000000;
+}
+
+/* span classes */
+/* used to show small 1,2,3, to reach other pages when too much results */
+.smallnumber {
+	background-color:#99cccc;
+	font-family:Times,serif;
+	font-size:small;
+	border:1px solid #000000;
+	padding:1pt;
+	vertical-align:top;
+}
+
+.smallnumberactive {
+	background-color:#FF6600;
+	font-family:Times,serif;
+	font-size:small;
+	border:1px solid #000000;
+	padding:1pt;
+	vertical-align:top;
+}
+
+/* BLOCS */
+
+/* the mainbloc : everything is in mainbloc, except menu */
+#mainbloc {
+	float:left;
+	width:90%;
+	background-color:#ACE6E6;
+	border:1px solid #000000;
+	margin-left:10px;
+	margin-right:10px;
+	padding-bottom:100px;
+	padding-left:10px;
+	padding-top:10px;
+	padding-right:10px;
+}
+
+#homebloc {
+	float:left;
+	width:60%;
+	border:0;
+}
+
+#leftbloc {
+	float:left;
+	width=30%;
+	border:1;
+}
+
+#bottombloc {
+	width:100%;
+	height:200%;
+	margin-top:10px;
+	vertical-align:top;
+	text-align:center;
+	float:left;
+}
+
+/* used in members */
+#bloc20 {
+	float:left;
+	width:30%;
+	border:0;
+	border:1px solid #000000;
+	margin-right:20px;
+	margin-bottom:20px;
+}
+#bloc60 {
+	float:left;
+	width:60%;
+	border:0;
+	border:1px solid #000000;
+	margin-right:20px;
+	margin-bottom:20px;
+}
+
+/* used in biblio detail */
+
+#bibliobloc {
+	float:left;
+	width:40%;
+	border:0;
+}
+
+#itembloc {
+	float:left;
+	width:50%;
+	border:0;
+}
+
+/* menu styles */
+.menu {
+	border:1px solid #000000;
+	padding-left:10pt;
+	padding-right:10pt;
+	float:left;
+	margin-bottom:10px;
+	-moz-border-radius: 6px;
+}
+#menuline {
+	width:100%;
+	height:200%;
+	vertical-align:top;
+	float:none;
+	position:relative;
+}
+
+/* a little spacer. should not be used */
+.spacer {
+	padding-left:20pt;
+	float:left;
+}
diff --git a/koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl b/koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl
new file mode 100644
index 0000000000..4050273894
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/kohaerror.tmpl
@@ -0,0 +1,17 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+
+<center>
+<table border=1 cellspacing=5 bgcolor=red>
+<tr><td>
+<table border=0 bgcolor=#dddddd>
+<tr><th>Une erreur s'est produite</th></tr>
+<tr><td><!-- TMPL_VAR NAME=errormessage --></td></tr>
+</table>
+</td></tr>
+</table>
+</center>
+
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl
new file mode 100644
index 0000000000..97e6259794
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-account.tmpl
@@ -0,0 +1,40 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+<div id="mainbloc">
+	<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+	<h2>Compte de <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
+	<!-- /TMPL_LOOP -->
+	<table cellspacing=0>
+		<tr>
+			<th colspan=2>Dettes & paiements</th>
+			<th>Quantité</th>
+			<th>Doit encore</th>
+		</tr>
+
+		<!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
+		<tr>
+			<td>
+				<!-- TMPL_VAR NAME="date" -->
+			</td>
+			<TD>
+				<!-- TMPL_VAR NAME="description" -->
+				<!-- TMPL_IF NAME="print_title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF -->
+			</td>
+
+			<td align="right">
+				<!-- TMPL_VAR NAME="amount" -->
+			</td>
+			<TD>
+				<!-- TMPL_VAR NAME="amountoutstanding" -->
+			</td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+
+		<tr>
+			<th colspan=2><b>Total dû</th>
+			<th align="right"><!-- TMPL_VAR NAME="total" --></th>
+			<th>&nbsp;</th>
+		</tr>
+	</table>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
new file mode 100644
index 0000000000..6477b09282
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
@@ -0,0 +1,38 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="nopermission" -->
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>Désolé, je pense que vous n'avez pas les permissions suffisantes.<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="timed_out" -->
+<!-- This is what is displayed if Connecter has timed out -->
+<h2>Déconnecté. Identifiez vous à nouveau.<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="different_ip" -->
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>Vous avez changé d'adresse IP. Identifiez vous à nouveau<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="invalid_username_or_password" -->
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>Identifiant ou mot de passe erroné. Essayez encore.<h2>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="loginprompt" -->
+<!-- Connecter prompt time-->
+
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
+	<h1>Identifiant Koha</h1>
+	<p><label>N° de carte</label><input name="userid" /></p>
+	<p><label>Mot de passe :</label><input type="password" name="password" /></p>
+	<!-- TMPL_LOOP NAME="INPUTS" -->
+		<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
+	<!-- /TMPL_LOOP -->
+	<input type="submit" value="Connecter" class="button" />
+</form>
+
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
new file mode 100644
index 0000000000..72e8829a40
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
@@ -0,0 +1,79 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
+
+	<div id="bibliobloc">
+	<table cellspacing="0">
+		<!-- BIBLIO RECORD TABLE -->
+		<tr>
+			<th>
+				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<!-- TMPL_IF name="subtitle" --><b>Sous-titre:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
+				<!-- TMPL_IF name="author" --><b>Auteur:</b> <a href="/cgi-bin/koha/opac-search.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br />
+				<!-- TMPL_IF name="additional" --><b>Autres auteurs:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="publishercode" --><b>Publié par :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+				<!-- TMPL_IF name="publicationyear" --><b>en </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
+				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
+				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
+				<!-- TMPL_IF name="sujet" --><b>Sujet:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="sujet" --><br />
+				<!-- TMPL_IF name="copyrightdate" --><b>Année :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
+				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
+				<!-- TMPL_IF name="unititle" --><b>Titre unifié:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
+				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
+				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
+				<b>Nombre total d'exemplaires:</b> <!-- TMPL_VAR NAME="count" -->
+			</td>
+		</tr>
+	</table>
+	</div>
+	<!-- /TMPL_LOOP -->
+
+	<div id="itembloc">
+	<table cellspacing="0">
+		<tr>
+			<th colspan="6">Exemplaire</th>
+		</tr>
+		<tr>
+			<th>type</th>
+			<th>classe</th>
+			<th>Localisation</th>
+			<th>date retour</th>
+			<th>vu en dernier</th>
+			<th>code barre</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+			<tr>
+				<td><!-- TMPL_VAR NAME="itemtype" --></td>
+				<td><!-- TMPL_VAR NAME="class" --></td>
+				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="bulk" -->(<!-- TMPL_VAR NAME="bulk" -->)<!-- /TMPL_IF --></td>
+				<td><!-- TMPL_VAR NAME="datedue" --></td>
+				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
+				<td><!-- TMPL_VAR NAME="barcode" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
+			<tr>
+				<td><!-- TMPL_VAR NAME="itemtype" --></td>
+				<td>Site web</td>
+				<td>En ligne</td>
+				<td>Disponible</td>
+				<td>&nbsp;</td>
+				<td><!-- TMPL_VAR NAME="url" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<!-- TMPL_UNLESS NAME="norequests" -->
+	<p>
+		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Reserver</a>
+	</p>
+	<!-- /TMPL_UNLESS -->
+	</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
new file mode 100644
index 0000000000..794d9218a1
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
+	<title><!--TMPL_VAR name="LibraryName"--></title>
+</head>
+
+<body>
+<div id="leftbloc">
+	<img src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
+</div>
+
+<div id="homebloc">
+	<h1 class="LibraryName"><!-- TMPL_VAR name="LibraryName" --></h1>
+	<h2>Chercher dans le catalogue</h2>
+	<form action="/cgi-bin/koha/opac-searchresults.pl">
+		<p>
+			<input type="hidden" name="type" value="opac" />
+			<input type="text" size="27" name="keyword" tabindex="1" /> <input type="submit" value="OK" class="button" /><br />
+		</p>
+		<p>
+			<a href="/cgi-bin/koha/opac-search.pl">Recherche avancée, plus d'options	</a>
+		</p>
+	</form>
+
+	<h2>Acquisitions récentes</h2>
+	<form action="/cgi-bin/koha/opac-new.pl">
+		<p>
+		<!-- TMPL_VAR name="CGIitemtype" --> acquis dans les derniers <b><input type="text" name="duration" value="30" size="3" /></b> jours
+		<input type="submit" value="OK" class="button" />
+		</p>
+	</form>
+	<!-- TMPL_IF NAME="loggedinusername" -->
+		<h2>Connecté en tant que <!-- TMPL_VAR NAME="loggedinusername" --></h2>
+		<p><a href="/cgi-bin/koha/opac-user.pl">Accueil lecteur</a> || <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Déconnecter</a></p>
+	<!-- TMPL_ELSE -->
+	<h2><a href="/cgi-bin/koha/opac-user.pl">S'identifier</a></h2>
+	<!-- /TMPL_IF -->
+	<p class="copyright">
+		Cette bibliothèque fonctionne avec <a href="http://www.koha.org">Koha</a> SIGB sous licence libre, respectant les standards de l'internet
+		<a href="http://validator.w3.org/check/referer">
+			<img src="http://www.w3.org/Icons/valid-xhtml10" alt="XHTML 1.0 valide" height="16" width="44" />
+		</a>
+	</p>
+</div>
+
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
new file mode 100644
index 0000000000..f55d3e3dd2
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
@@ -0,0 +1,106 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<center>
+
+<br>
+<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
+<a href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->
+<img src=/images/requests.gif
+width=120 height=42 border=0 align=right border=0></a>
+<FONT SIZE=6><em><a
+href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra><!-- TMPL_VAR NAME="title" -->
+(<!-- TMPL_VAR NAME="author" -->)</a></em></FONT><P>
+<p>
+<form action=/cgi-bin/koha/modbibitem.pl>
+<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
+<input type=hidden name=biblio value=<!-- TMPL_VAR NAME="biblionumber" -->>
+<!-------------------BIBLIO ITEM------------>
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
+<TR VALIGN=TOP>
+<td  bgcolor="99cc33" background="/images/background-mem.gif"
+><B><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUPE <!-- TMPL_VAR NAME="description" --> </b> </TD>
+</TR>
+<tr VALIGN=TOP  >
+<TD width=210 >
+<INPUT TYPE="image" name="submit"  VALUE="Modifier" height=42  WIDTH=93
+BORDER=0 src="/images/Modifier-mem.gif">
+<INPUT TYPE="image" name="Supprimer"  VALUE="Supprimer" height=42  WIDTH=93
+BORDER=0 src="/images/Supprimer-mem.gif">
+<br>
+<FONT SIZE=2  face="arial, helvetica">
+<b>Numéro notice ::</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
+<b>Type d'ouvrage ::</b> <!-- TMPL_VAR NAME="itemtype" --><br>
+<b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
+<b>Durée prêt:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
+<b>Coût du prêt:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
+<b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --><br>
+<b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
+<b>Editions:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
+<b>Placer:</b> <!-- TMPL_VAR NAME="place" --><br>
+<b>Date:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
+<b>Volume:</b> <!-- TMPL_VAR NAME="volumeddesc" --><br>
+<b>Pages:</b> <!-- TMPL_VAR NAME="pages" --><br>
+<b>Illus:</b> <!-- TMPL_VAR NAME="illus" --><br>
+<b>Taille:</b> <!-- TMPL_VAR NAME="size" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
+<b>N° ouvrage:</b> <!-- TMPL_VAR NAME="count" -->
+</font>
+</TD>
+</tr>
+</table>
+</form>
+<!-- /TMPL_LOOP -->
+<!-- TMPL_LOOP NAME="ITEM_DATA" -->
+<img src="/images/holder.gif" width=16 height=300 align=left>
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
+<TR VALIGN=TOP>
+<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>CODE BARRE
+<!-- TMPL_VAR NAME="barcode" --></b></TD>
+</TR>
+<tr VALIGN=TOP>
+<TD width=220>
+<form action=/cgi-bin/koha/moditem.pl method=post>
+<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblionumber" -->>
+<input type=hidden name=item value=<!-- TMPL_VAR NAME="itemnumber" -->>
+<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
+<INPUT TYPE="image" name="submit"  VALUE="Modifier" height=42  WIDTH=93
+BORDER=0 src="/images/Modifier-mem.gif">
+<INPUT TYPE="image" name="Supprimer"  VALUE="Supprimer" height=42  WIDTH=93
+BORDER=0 src="/images/Supprimer-mem.gif">
+<br>
+<FONT SIZE=2  face="arial, helvetica">
+<b>Annexe propriétaire:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+<b>Vu:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+<b>Dernier prêt:</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
+En prêt \? <!-- FIXME - What's this, then? -->
+<b>Dernier emprunteur 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+<b>Dernier emprunteur 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+<b>Annexe:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+<b>Coût de remplacement:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+<b>Ouvrage perdu:</b> <!-- TMPL_VAR NAME="itemlost" --><br>
+<b>Payé pour ::</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
+<b>Renouvellements:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">
+Accession</a>
+Date:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
+<b>Annul\?: <!-- TMPL_VAR NAME="wthdrawn" --><br>
+<b><a
+href=/cgi-bin/koha/bookcount.pl?&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&itm=<!-- TMPL_VAR NAME="itemnumber" -->>Total
+Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
+<b>Groupe numéro:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
+<b>Notice biblio ::</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
+
+
+
+</font>
+</TD>
+</tr>
+</table>
+</form>
+<!-- /TMPL_LOOP -->
+
+<p>
+</form>
+</center>
+
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
new file mode 100644
index 0000000000..d0325a5200
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
@@ -0,0 +1,85 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+<h2>Page de réservation pour <u><!-- TMPL_VAR NAME="title" --></u> (<!-- TMPL_VAR NAME="author" -->, N°<!-- TMPL_VAR name="biblionumber" -->)</h2>
+<!-- TMPL_IF NAME="message" -->
+	<h2>Impossible de réserver parce que </h2>
+	<ul>
+		<!-- TMPL_IF NAME="too_much_oweing" --><li>Vous devez <!-- TMPL_VAR NAME="too_much_oweing" --></li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="too_many_reserves" --><li>you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="already_reserved" --><li>Vous avez déjà placé une réservation sur cet exemplaire</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="no_items_selected" --><li>Vous devez sélectionner au moins 1 type</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="no_branch_selected" --><li>Vous devez sélectionner une annexe ou retirer l'ouvrage</li><!-- /TMPL_IF -->
+	</ul>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="select_item_types" -->
+	<!-- The first time round you select which bibitems you want -->
+	<p> Il y a <b><!-- TMPL_VAR NAME="reservecount" --></b> Réservations déjà faites sur cet ouvrage </p>
+	<p>Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous.</p>
+
+	<FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
+		<input type="hidden" name="item_types_selected" value="1">
+		<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->">
+		<TABLE cellspacing=0>
+			<tr>
+				<th>Reserver</th>
+				<th>Type d'ouvrage :</th>
+				<th>Copies</th>
+			</tr>
+			<!-- TMPL_LOOP NAME="TYPES" -->
+				<tr>
+					<!-- TMPL_UNLESS NAME="notforloan" -->
+						<td><input type="checkbox" name="itemtype" value="<!-- TMPL_VAR NAME='itemtype' -->" checked></td>
+					<!-- TMPL_ELSE -->
+						<td>Non réservable</td>
+					<!-- /TMPL_UNLESS -->
+					<td><!-- TMPL_VAR NAME="description" --></td>
+					<td><!-- TMPL_VAR NAME="copies" --></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<p>Sélectionnez l'annexe ou vous prendrez l'ouvrage: <!-- TMPL_VAR NAME="CGIbranch" --></p>
+		<p>Réserver à cette date ::
+			<select name=required-day><option value=0>Jour<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
+			<select name=required-month><option value=0>Mois<option value=1 >Jan<option value=2 >Fev<option value=3 >Mars<option value=4 >Avril<option value=5 >Mai<option value=6 >Juin<option value=7 >Juill<option value=8 >Aout<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
+			<select name=required-year><option value=0>Année<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+		</p>
+		<p>Annuler réservation à cette date:
+			<select name=expires-day><option value=0>Jour<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
+			<select name=expires-month><option value=0>Mois<option value=1 >Jan<option value=2 >Fev<option value=3 >Mars<option value=4 >Avril<option value=5 >Mai<option value=6 >Juin<option value=7 >Juill<option value=8 >Aout<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
+			<select name=expires-year><option value=0>Année<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+		</p>
+		<INPUT class="button" type="submit" value="OK">
+	</FORM>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="item_types_selected" -->
+<!-- if the bibitems have already been selected -->
+	<p>Confirmez que vous souhaitez réserver un ouvrage ::<p>
+
+	<FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
+		<input type="hidden" name="place_reserve" value="1">
+		<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME='biblionumber' -->">
+		<input type="hidden" name="required_date" value="<!-- TMPL_VAR NAME='required_date' -->">
+		<input type="hidden" name="expires_date" value="<!-- TMPL_VAR NAME='expires_date' -->">
+		<ul>
+			<!-- TMPL_LOOP NAME="TYPES" -->
+					<input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME='itemtype' -->"></td>
+					<li><!-- TMPL_VAR NAME="description" --></li>
+			<!-- /TMPL_LOOP -->
+		</ul>
+		Qui sera retiré à
+		<ul>
+			<li>
+				<!-- TMPL_VAR NAME="branchname" -->
+			</li>
+		</ul>
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME='branch' -->">
+		<!-- TMPL_IF NAME="fee" -->
+			<p>Il y aura des frais de réservation de <b>$<!-- TMPL_VAR NAME="fee" --></b></p>
+		<!-- /TMPL_IF -->
+		<INPUT class="button" type="submit" value="Réserver">
+	</FORM>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
new file mode 100644
index 0000000000..8a9425b9b9
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
@@ -0,0 +1,35 @@
+<!-- TMPL_INCLUDE name="opac-top.inc" -->
+
+<div id="mainbloc">
+	<h1>Recherche avancée</h1>
+	<form action="/cgi-bin/koha/opac-searchresults.pl" method="get">
+	<ul>
+		<li><label>mot-clef</label><input type="text"  size="25"   name="keyword" /></li>
+	</ul>
+	<p><b>OU :</b></p>
+	<ul>
+		<li><label>sujet</label><input type="text"  size="25"   name="sujet" /></li>
+	</ul>
+	<p><b>OU un ou plus de : :</b></p>
+	<ul>
+		<li><label>Titre</label><input type="text"  size="25"   name="title" /></li>
+		<li><label>Auteur</label><input type="text"  size="25"   name="author" /></li>
+		<li><label>Illustrateur</label><input type="text"  size="25"   name="illustrator" /></li>
+		<li><label>Type d'exemplaire</label>
+			<select size="1"  name="class">
+				<option value="">Tout</option>
+				<!-- TMPL_VAR name="classlist" -->
+			</select>
+		</li>
+		<li><label>Code barre</label><input type="text"  size="25"   name="itemnumber" /></li>
+	</ul>
+		<p>qui utilise <input type="radio" name="ttype" value="normal" />Normal ou <input type="radio" name="ttype" value="exact" />Recherche exacte</p>
+
+	<p>
+		<input type="submit" value="Lancer recherche" class="button" />
+		<input type="reset"  value="Effacer" class="button" />
+	</p>
+	<p>Notez que le mot clef est prioritaire</p>
+	</form>
+</div>
+<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
new file mode 100644
index 0000000000..e47911eda4
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
@@ -0,0 +1,150 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="searchdesc" -->
+    <p class="center">Recherche effectuée sur <b><!-- TMPL_VAR NAME="searchdesc" --></b></p>
+<!-- TMPL_ELSE -->
+	<!-- TMPL_IF name="searchnew" -->
+		<p><!-- TMPL_VAR name=itemtype --> acquis dans les derniers <i><!-- TMPL_VAR name="duration" --></i> jours</p>
+	<!-- TMPL_ELSE -->
+		<p>Vous n'avez pas spécifié de critère</p>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<p class="center"><!-- TMPL_VAR NAME="numrecords" --> Réponses trouvées</p>
+<p class="center">
+    <!-- Row de numbers corresponding to search result pages -->
+    <!-- TMPL_IF NAME="displayprev" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME='prevstartfrom' --><!-- TMPL_LOOP NAME='FORMINPUTS' -->&amp;<!-- TMPL_VAR NAME='field' -->=<!-- TMPL_VAR NAME='value' ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="numbers" -->
+	<!-- TMPL_IF NAME="highlight" -->
+		<span class="smallnumberactive"><!--TMPL_VAR name="number" --></span>&nbsp;
+	<!-- TMPL_ELSE -->
+		<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->" class="smallnumber">
+			<!--TMPL_VAR name="number" -->
+		</a>&nbsp;
+	<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_IF NAME="displaynext" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+</p>
+<p>&nbsp;</p>
+<!-- Search Résultats Table -->
+<!-- TMPL_IF NAME="numrecords" -->
+	<!-- If we have a sujet table -->
+		<!-- TMPL_IF NAME="subjectsearch" -->
+		<table border="0" cellspacing="0" cellpadding="2">
+			<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+				<th>Sujet</th>
+			</tr>
+			<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+				<tr>
+					<td><a href="/cgi-bin/koha/opac-searchresults.pl?&subjectitems=<!-- TMPL_VAR NAME=sujet ESCAPE=URL -->"><!-- TMPL_VAR NAME=sujet --></a></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
+			<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+				<td colspan="4">
+					&nbsp;
+				</td>
+			</tr>
+		</table>
+
+<!-- Else we have a list de items -->
+<!-- TMPL_ELSE -->
+	<table cellspacing="0">
+	<tr>
+		<th>Titre</th>
+		<th>Auteur</th>
+		<th>&copy;</th>
+		<th>Nombre d'ouvrages</th>
+		<th>Localisation</th>
+		<th>&nbsp;</th>
+	</tr>
+<!-- Actual Search Résultats -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
+	<tr>
+		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
+			<a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->"><!-- TMPL_VAR NAME="title" --></a>
+		</td>
+		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
+			<a class="transparent" href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->"><!-- TMPL_VAR NAME="author" --></a>
+		</td>
+		<td align="center"<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_VAR NAME="copyrightdate" -->
+		</td>
+		<td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_VAR NAME="itemcount" -->
+		</td>
+		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_VAR NAME="location" -->
+		</td>
+		<td <!-- TMPL_IF name="even" -->classe="hilighted"<!-- /TMPL_IF -->>
+			<!-- TMPL_UNLESS NAME="norequests" -->
+				<a class="transparent" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Reserver</a>
+			<!-- TMPL_ELSE -->
+				Non réservable
+			<!-- /TMPL_UNLESS -->
+		</td>
+	</tr>
+<!-- /TMPL_LOOP -->
+	<tr>
+		<th align="left">
+			<!-- TMPL_IF NAME="displayprev" -->
+				<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME=FORMINPUTS -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;&lt; Previous</a>
+			<!-- TMPL_ELSE -->
+				&nbsp;
+			<!-- /TMPL_IF -->
+		</th>
+		<th colspan="3">&nbsp;</th>
+		<th colspan="2" align="right">
+			<!-- TMPL_IF NAME="displaynext" -->
+				<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME=FORMINPUTS -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">Next &gt;&gt;&gt;</a>
+			<!-- TMPL_ELSE -->
+				&nbsp;
+			<!-- /TMPL_IF -->
+		</th>
+	</tr>
+</table>
+<!-- /TMPL_IF -->
+
+<p class="center">
+	Résultats <i><!-- TMPL_VAR NAME="startfrom" --></i> à <i><!-- TMPL_VAR NAME="endat" --></i> de <i><!-- TMPL_VAR NAME="numrecords" --></i> réponses
+</p>
+
+<p class="center">
+    <!-- Row de numbers corresponding to search result pages -->
+    <!-- TMPL_IF NAME="displayprev" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME='prevstartfrom' --><!-- TMPL_LOOP NAME='FORMINPUTS' -->&amp;<!-- TMPL_VAR NAME='field' -->=<!-- TMPL_VAR NAME='value' ESCAPE=URL --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="numbers" -->
+	<!-- TMPL_IF NAME="highlight" -->
+		<span class="smallnumberactive"><!--TMPL_VAR name="number" --></span>&nbsp;
+	<!-- TMPL_ELSE -->
+		<a class="smallnumber" href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">
+			<!--TMPL_VAR name="number" -->
+		</a>&nbsp;
+	<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_IF NAME="displaynext" -->
+	<a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
+    <!-- TMPL_ELSE -->
+	&nbsp;
+    <!-- /TMPL_IF -->
+</p>
+
+<!-- TMPL_ELSE -->
+<p class="center">	Désolé, aucun résultat ! </p>
+<!-- /TMPL_IF -->
+
+<p class="center">
+	Essayez une autre <a href="/cgi-bin/koha/opac-search.pl">chercher</a>
+</p>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
new file mode 100644
index 0000000000..ba972de3ae
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
@@ -0,0 +1,99 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac-user.css">
+<div id="mainbloc">
+<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+	<div id="bloc20">
+		<h2>Nos informations sont-elles correctes \?</h2>
+		<p>Carte lecteur: <!-- TMPL_VAR NAME="cardnumber" --> </p>
+		<p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="title" -->) </p>
+		<p><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></p
+		<p><!-- TMPL_VAR NAME="phone" --> (hm)</p>
+		<p><!-- TMPL_VAR NAME="faxnumber" --> (wk)</p>
+		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
+		<p>Quelque chose de changé : <a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Mettre à jour</a></p>
+	</div>
+	<!-- TMPL_IF NAME="amountoverfive" -->
+	<div id="bloc20">
+		<h2>Vous avez des dettes de <!-- TMPL_VAR NAME="amountoutstanding" --></b>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir compte</a>
+	</div>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF NAME="amountoverzero" -->
+	<div id="bloc20">
+		<h2>Vous avez des dettes de <!-- TMPL_VAR NAME="amountoutstanding" --></h2>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir compte</a>
+	</div>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF NAME"amountlessthanzero" -->
+	<div id="bloc20">
+		<p>Vous avez un crédit de <!-- TMPL_VAR NAME="amountoutstanding" --></p>
+		<a href="/cgi-bin/koha/opac-account.pl" class="button">Voir compte</a>
+	</div>
+	<!-- /TMPL_IF -->
+
+<!-- /TMPL_LOOP -->
+
+<!-- TMPL_IF NAME="waiting_count" -->
+<div id="bloc60">
+	<h2>Vous avez des réservations en attente:</h2>
+	<ul>
+		<!-- TMPL_LOOP NAME="WAITING" -->
+			<li><!-- TMPL_VAR NAME="btitle" -->, pick up at: <b><!-- TMPL_VAR NAME="branch" --></b></li>
+		<!-- /TMPL_LOOP -->
+	</ul>
+</div>
+<!-- /TMPL_IF -->
+
+<div id="bloc60">
+	<!-- TMPL_IF NAME="issues_count" -->
+		Vous avez <b><!-- TMPL_VAR NAME="issues_count" --></b> ouvrages en cours de prêt<br>
+		<table cellspacing=0 >
+			<tr>
+				<th>Titre</th>
+				<th>Auteur</th>
+				<th>Date retour</th>
+				<th>Type d'ouvrage</th>
+				<th>Charges</th>
+				<th>Prêt</th>
+			</TR>
+			<!-- TMPL_LOOP NAME="ISSUES" -->
+				<TR>
+					<TD><!-- TMPL_VAR NAME="title" --></TD>
+					<TD><!-- TMPL_VAR NAME="author" --></TD>
+					<TD><!-- TMPL_VAR NAME="date_due" --></TD>
+					<TD><!-- TMPL_VAR NAME="itemtype" --></TD>
+					<TD><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
+					<TD><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
+				</TR>
+			<!-- /TMPL_LOOP -->
+		</table>
+	<!-- TMPL_ELSE -->
+		<h2>Vous n'avez pas d'ouvrage en prêt</h2>
+	<!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_IF NAME="reserves_count" -->
+<div id="bloc60">
+	<h2>Vous avez <b><!-- TMPL_VAR NAME="reserves_count" --></b> ouvrages réservés</h2>
+	<table cellspacing=0 align="center">
+		<Tr>
+			<th>Titre</th>
+			<th>Auteur</th>
+			<th>Date réservation</th>
+		</TR>
+		<!-- TMPL_LOOP NAME="RESERVES" -->
+			<TR VALIGN=TOP>
+			<TD><!-- TMPL_VAR NAME="btitle" --></TD>
+			<TD><!-- TMPL_VAR NAME="author" --></TD>
+			<TD><!-- TMPL_VAR NAME="reservedate" --></TD>
+			</TR>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<br/>
+</div>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
new file mode 100644
index 0000000000..4bd9eda064
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
@@ -0,0 +1,22 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+<div id="mainbloc">
+<h2>Modification informations lecteur</h2>
+<p><i> Changer le nécessaire<br />
+Vos changement n'apparaitront que lorsque la bibliothèque les aura validé</i></p>
+
+<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+<form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
+	<p>Nom: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='surname' -->"  NAME="surname"></p>
+	<p>Titre: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='title' -->"  NAME="title"></p>
+	<p>Prénom: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='firstname' -->"  NAME="firstname"></p>
+	<p>Adresse postale: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='streetaddress' -->"  NAME="streetaddress"></p>
+	<p>Ville: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='city' -->"  NAME="city"></p>
+	<p>Téléphone maison: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='phone' -->"  NAME="phone"></p>
+	<p>Tel bureau: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='faxnumber' -->"  NAME="faxnumber"></p>
+	<p>Mail: <input type="text"  size="25" value="<!-- TMPL_VAR NAME='emailaddress' -->"  NAME="emailaddress"></p>
+	<p><input type="submit" value="OK" class="button" /></p>
+</form>
+</div>
+<!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/subject.tmpl b/koha-tmpl/opac-tmpl/css/fr/subject.tmpl
new file mode 100644
index 0000000000..aeab408292
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/fr/subject.tmpl
@@ -0,0 +1,42 @@
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+
+<center>
+
+<table border=0 cellspacing=0 cellpadding=2>
+<tr bgcolor=#99cccc background=<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif>
+<th>Sujet</th></tr>
+<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+  <tr>
+  <td><a href=./dosearch.pl?&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=URL -->><!-- TMPL_VAR NAME=sujet --></a></td>
+  </tr>
+<!-- /TMPL_LOOP -->
+<tr bgcolor=#99cccc background=<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif><td colspan=4>
+&nbsp;</td></tr>
+</table>
+<br>
+Résultats <!-- TMPL_VAR NAME="startfrom" --> à <!-- TMPL_VAR NAME="endat" --> de <!-- TMPL_VAR NAME="numrecords" --> réponses
+<br>
+    <!-- TMPL_IF NAME="displayprev" -->
+	<a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif border=0></a>
+    <!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="numbers" -->
+	<!-- TMPL_IF NAME="highlight" -->
+	    <img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif> 
+	<!-- TMPL_ELSE -->
+	    <a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0></a> 
+	<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_IF NAME="displaynext" -->
+	<a href=./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL --><!-- /TMPL_LOOP -->><img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif border=0></a>
+    <!-- TMPL_ELSE -->
+	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+    <!-- /TMPL_IF -->
+
+
+<hr>
+
+
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
index 5605213cc6..14250f5a56 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
@@ -7,42 +7,44 @@
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 <p><font size="6"><em><!-- TMPL_VAR NAME="title" -->
 <!-- TMPL_VAR NAME="class" --></em></font></p>
-
-<table cellspacing="0" cellpadding="5" border="1" align="left" width="40%">
+<p>
+<table cellspacing="0" cellpadding="5" border="1" align="left" width="30%">
 	<!-- BIBLIO RECORD TABLE -->
 	<tr valign="top">
 		<td bgcolor="#99cccc">
-			<b><!-- TMPL_VAR NAME="title" --></b>  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+			<b><!-- TMPL_VAR NAME="title" --></b>  ( record <!-- TMPL_VAR NAME="biblionumber" --> )
 		</td>
 	</tr>
 	<tr valign="top">
 		<td>
 			<font size="2" face="arial,helvetica,sans-serif">
-			<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br><!-- /TMPL_IF --> 
-			<!-- TMPL_IF name="author" --><b>Author:</b> <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><br><!-- /TMPL_IF -->
-		<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
-		<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --> 
-		<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
-		<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-		<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
-		<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br><!-- /TMPL_IF --> 
-				<!-- TMPL_IF name="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><br><!-- /TMPL_IF --> 
-				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --> <br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br><!-- /TMPL_IF --> 
-				<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <!-- TMPL_VAR name="dewey" --><br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br><!-- /TMPL_IF -->
-				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
+			<!-- TMPL_IF name="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="author" --><b>Author:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
+			<!-- TMPL_IF name="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF name="serial" --><b>Serial:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="classification" --><b>Classification:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
 			</font>
 		</td>
 	</tr>
 </table>
 <!-- /TMPL_LOOP -->
-<table border="0" cellspacing="2" cellpadding="2" align="center" width="55%">
+<table border="0" cellspacing="0" cellpadding="2" width="60%">
 	<tr bgcolor="#99cccc">
 		<th>Item Type</th>
-		<th>Class</th>
 		<th>Location</th>
 		<th>Date Due</th>
 		<th>Last Seen</th>
@@ -50,9 +52,8 @@
 	</tr>
 	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
-			<td><!-- TMPL_VAR NAME="itemtype" --></td>
-			<td><!-- TMPL_VAR NAME="class" --></td>
-			<td><!-- TMPL_VAR NAME="branchname" --></td>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="bulk" --> <!-- TMPL_VAR NAME="bulk" --><!-- /TMPL_IF --></td>
 			<td><!-- TMPL_VAR NAME="datedue" --></td>
 			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 			<td><!-- TMPL_VAR NAME="barcode" --></td>
@@ -69,6 +70,6 @@
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
-<p>
+</p>
 <p><br clear="all"></p>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
index 9c6e270e86..b1506fa190 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>WELCOME TO THE  KOHA OPAC </title>
+<title>WELCOME TO THE KOHA OPAC</title>
 
 <style type="text/css">
 <!--
@@ -102,9 +102,7 @@ input {
 						Recent acquisitions
 				</font><br>
 					<form action="/cgi-bin/koha/opac-new.pl" name="new">
-						<!-- TMPL_VAR name="CGIitemtype" --> <b>acquired <br>
-						in the last <input type="text" name="duration" value="30" size=3> days</b>
-						<br>
+						<!-- TMPL_VAR name="CGIitemtype" --> <b>acquired in the last <input type="text" name="duration" value="30" size=3> days</b>
 						<input type="submit" value="OK">
 					</form>
 			</td>
diff --git a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
index f5a67e183d..2be95694be 100644
--- a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
@@ -1,10 +1,6 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/opac-user.pl">Members Home</a>][<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a>]</p>
-<!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
-<!-- /TMPL_IF -->
+
 
 <div align="center"><!-- TMPL_IF NAME="searchdesc" -->
     You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
-- 
2.20.1